3558 files changed, 61065 insertions, 61664 deletions

diff --git a/data/battle_tent.s b/data/battle_tent.s
deleted file mode 100644
index 06cfac50e..000000000
--- a/data/battle_tent.s
+++ /dev/null
@@ -1,51 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-    .align 2
-gUnknown_086160B4:: @ 86160B4
-	.4byte sub_81B99D4
-	.4byte sub_81B9A28
-	.4byte sub_81B9A44
-	.4byte sub_81B9A60
-	.4byte sub_81B9A90
-	.4byte sub_81B9ABC
-	.4byte sub_81B9B00
-	.4byte sub_81B9B28
-
-    .align 2
-gUnknown_086160D4:: @ 86160D4
-	.4byte 0x00000008
-
-    .align 2
-gUnknown_086160D8:: @ 86160D8
-	.4byte sub_81B9BA0
-	.4byte sub_81B9BF4
-	.4byte sub_81B9C10
-	.4byte sub_81B9C2C
-	.4byte sub_81B9C70
-	.4byte sub_81B9C98
-	.4byte sub_81B9CF0
-
-    .align 2
-gUnknown_086160F4:: @ 86160F4
-	.4byte 0x00000015
-
-    .align 2
-gUnknown_086160F8:: @ 86160F8
-	.4byte sub_81B9D28
-	.4byte sub_81B9D7C
-	.4byte sub_81B9D98
-	.4byte sub_81B9DB4
-	.4byte sub_81B9DF8
-	.4byte sub_81B9E20
-	.4byte sub_81B9E78
-	.4byte sub_81B9E88
-	.4byte sub_81BA040
-	.4byte sub_81B9EC0
-
-    .align 2
-gUnknown_08616120:: @ 8616120
-	.4byte 0x00000017
-
diff --git a/data/event_scripts.s b/data/event_scripts.s
index ec9ddb86a..0336c0c97 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,5 +1,6 @@
 #include "constants/flags.h"
 #include "constants/items.h"
+#include "constants/maps.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
 #include "constants/species.h"
@@ -58,376 +59,376 @@ gStdScripts_End:: @ 81DC2CC
 	map_script 2, PetalburgCity_MapScript2_1DC31C
 	.byte 0
 
-	.include "data/scripts/maps/PetalburgCity.inc"
-	.include "data/scripts/maps/SlateportCity.inc"
-	.include "data/scripts/maps/MauvilleCity.inc"
-	.include "data/scripts/maps/RustboroCity.inc"
-	.include "data/scripts/maps/FortreeCity.inc"
-	.include "data/scripts/maps/LilycoveCity.inc"
-	.include "data/scripts/maps/MossdeepCity.inc"
-	.include "data/scripts/maps/SootopolisCity.inc"
-	.include "data/scripts/maps/EverGrandeCity.inc"
-	.include "data/scripts/maps/LittlerootTown.inc"
-	.include "data/scripts/maps/OldaleTown.inc"
-	.include "data/scripts/maps/DewfordTown.inc"
-	.include "data/scripts/maps/LavaridgeTown.inc"
-	.include "data/scripts/maps/FallarborTown.inc"
-	.include "data/scripts/maps/VerdanturfTown.inc"
-	.include "data/scripts/maps/PacifidlogTown.inc"
-	.include "data/scripts/maps/Route101.inc"
-	.include "data/scripts/maps/Route102.inc"
-	.include "data/scripts/maps/Route103.inc"
-	.include "data/scripts/maps/Route104.inc"
-	.include "data/scripts/maps/Route105.inc"
-	.include "data/scripts/maps/Route106.inc"
-	.include "data/scripts/maps/Route107.inc"
-	.include "data/scripts/maps/Route108.inc"
-	.include "data/scripts/maps/Route109.inc"
-	.include "data/scripts/maps/Route110.inc"
-	.include "data/scripts/maps/Route111.inc"
-	.include "data/scripts/maps/Route112.inc"
-	.include "data/scripts/maps/Route113.inc"
-	.include "data/scripts/maps/Route114.inc"
-	.include "data/scripts/maps/Route115.inc"
-	.include "data/scripts/maps/Route116.inc"
-	.include "data/scripts/maps/Route117.inc"
-	.include "data/scripts/maps/Route118.inc"
-	.include "data/scripts/maps/Route119.inc"
-	.include "data/scripts/maps/Route120.inc"
-	.include "data/scripts/maps/Route121.inc"
-	.include "data/scripts/maps/Route122.inc"
-	.include "data/scripts/maps/Route123.inc"
-	.include "data/scripts/maps/Route124.inc"
-	.include "data/scripts/maps/Route125.inc"
-	.include "data/scripts/maps/Route126.inc"
-	.include "data/scripts/maps/Route127.inc"
-	.include "data/scripts/maps/Route128.inc"
-	.include "data/scripts/maps/Route129.inc"
-	.include "data/scripts/maps/Route130.inc"
-	.include "data/scripts/maps/Route131.inc"
-	.include "data/scripts/maps/Route132.inc"
-	.include "data/scripts/maps/Route133.inc"
-	.include "data/scripts/maps/Route134.inc"
-	.include "data/scripts/maps/Underwater1.inc"
-	.include "data/scripts/maps/Underwater2.inc"
-	.include "data/scripts/maps/Underwater3.inc"
-	.include "data/scripts/maps/Underwater4.inc"
-	.include "data/scripts/maps/Underwater5.inc"
-	.include "data/scripts/maps/Underwater6.inc"
-	.include "data/scripts/maps/Underwater7.inc"
-	.include "data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc"
-	.include "data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc"
-	.include "data/scripts/maps/LittlerootTown_MaysHouse_1F.inc"
-	.include "data/scripts/maps/LittlerootTown_MaysHouse_2F.inc"
-	.include "data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc"
-	.include "data/scripts/maps/OldaleTown_House1.inc"
-	.include "data/scripts/maps/OldaleTown_House2.inc"
-	.include "data/scripts/maps/OldaleTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/OldaleTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/OldaleTown_Mart.inc"
-	.include "data/scripts/maps/DewfordTown_House1.inc"
-	.include "data/scripts/maps/DewfordTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/DewfordTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/DewfordTown_Gym.inc"
-	.include "data/scripts/maps/DewfordTown_Hall.inc"
-	.include "data/scripts/maps/DewfordTown_House2.inc"
-	.include "data/scripts/maps/LavaridgeTown_HerbShop.inc"
-	.include "data/scripts/maps/LavaridgeTown_Gym_1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_Gym_B1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_House.inc"
-	.include "data/scripts/maps/LavaridgeTown_Mart.inc"
-	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FallarborTown_Mart.inc"
-	.include "data/scripts/maps/FallarborTown_BattleTentLobby.inc"
-	.include "data/scripts/maps/FallarborTown_BattleTentCorridor.inc"
-	.include "data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc"
-	.include "data/scripts/maps/FallarborTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/FallarborTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FallarborTown_House1.inc"
-	.include "data/scripts/maps/FallarborTown_House2.inc"
-	.include "data/scripts/maps/VerdanturfTown_BattleTentLobby.inc"
-	.include "data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc"
-	.include "data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc"
-	.include "data/scripts/maps/VerdanturfTown_Mart.inc"
-	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/VerdanturfTown_WandasHouse.inc"
-	.include "data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc"
-	.include "data/scripts/maps/VerdanturfTown_House.inc"
-	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/PacifidlogTown_House1.inc"
-	.include "data/scripts/maps/PacifidlogTown_House2.inc"
-	.include "data/scripts/maps/PacifidlogTown_House3.inc"
-	.include "data/scripts/maps/PacifidlogTown_House4.inc"
-	.include "data/scripts/maps/PacifidlogTown_House5.inc"
-	.include "data/scripts/maps/PetalburgCity_WallysHouse.inc"
-	.include "data/scripts/maps/PetalburgCity_Gym.inc"
-	.include "data/scripts/maps/PetalburgCity_House1.inc"
-	.include "data/scripts/maps/PetalburgCity_House2.inc"
-	.include "data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/PetalburgCity_Mart.inc"
-	.include "data/scripts/maps/SlateportCity_SternsShipyard_1F.inc"
-	.include "data/scripts/maps/SlateportCity_SternsShipyard_2F.inc"
-	.include "data/scripts/maps/SlateportCity_BattleTentLobby.inc"
-	.include "data/scripts/maps/SlateportCity_BattleTentCorridor.inc"
-	.include "data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc"
-	.include "data/scripts/maps/SlateportCity_House1.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonFanClub.inc"
-	.include "data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc"
-	.include "data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc"
-	.include "data/scripts/maps/SlateportCity_Harbor.inc"
-	.include "data/scripts/maps/SlateportCity_House2.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/SlateportCity_Mart.inc"
-	.include "data/scripts/maps/MauvilleCity_Gym.inc"
-	.include "data/scripts/maps/MauvilleCity_BikeShop.inc"
-	.include "data/scripts/maps/MauvilleCity_House1.inc"
-	.include "data/scripts/maps/MauvilleCity_GameCorner.inc"
-	.include "data/scripts/maps/MauvilleCity_House2.inc"
-	.include "data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/MauvilleCity_Mart.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_1F.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_2F.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_3F.inc"
-	.include "data/scripts/maps/RustboroCity_Gym.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonSchool.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/RustboroCity_Mart.inc"
-	.include "data/scripts/maps/RustboroCity_Flat1_1F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat1_2F.inc"
-	.include "data/scripts/maps/RustboroCity_House1.inc"
-	.include "data/scripts/maps/RustboroCity_CuttersHouse.inc"
-	.include "data/scripts/maps/RustboroCity_House2.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_1F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_2F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_3F.inc"
-	.include "data/scripts/maps/RustboroCity_House3.inc"
-	.include "data/scripts/maps/FortreeCity_House1.inc"
-	.include "data/scripts/maps/FortreeCity_Gym.inc"
-	.include "data/scripts/maps/FortreeCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/FortreeCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FortreeCity_Mart.inc"
-	.include "data/scripts/maps/FortreeCity_House2.inc"
-	.include "data/scripts/maps/FortreeCity_House3.inc"
-	.include "data/scripts/maps/FortreeCity_House4.inc"
-	.include "data/scripts/maps/FortreeCity_House5.inc"
-	.include "data/scripts/maps/FortreeCity_DecorationShop.inc"
-	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_ContestLobby.inc"
-	.include "data/scripts/maps/LilycoveCity_ContestHall.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_UnusedMart.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc"
-	.include "data/scripts/maps/LilycoveCity_Harbor.inc"
-	.include "data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc"
-	.include "data/scripts/maps/LilycoveCity_House1.inc"
-	.include "data/scripts/maps/LilycoveCity_House2.inc"
-	.include "data/scripts/maps/LilycoveCity_House3.inc"
-	.include "data/scripts/maps/LilycoveCity_House4.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc"
-	.include "data/scripts/maps/MossdeepCity_Gym.inc"
-	.include "data/scripts/maps/MossdeepCity_House1.inc"
-	.include "data/scripts/maps/MossdeepCity_House2.inc"
-	.include "data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/MossdeepCity_Mart.inc"
-	.include "data/scripts/maps/MossdeepCity_House3.inc"
-	.include "data/scripts/maps/MossdeepCity_StevensHouse.inc"
-	.include "data/scripts/maps/MossdeepCity_House4.inc"
-	.include "data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc"
-	.include "data/scripts/maps/MossdeepCity_GameCorner_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_GameCorner_B1F.inc"
-	.include "data/scripts/maps/SootopolisCity_Gym_1F.inc"
-	.include "data/scripts/maps/SootopolisCity_Gym_B1F.inc"
-	.include "data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/SootopolisCity_Mart.inc"
-	.include "data/scripts/maps/SootopolisCity_House1.inc"
-	.include "data/scripts/maps/SootopolisCity_House2.inc"
-	.include "data/scripts/maps/SootopolisCity_House3.inc"
-	.include "data/scripts/maps/SootopolisCity_House4.inc"
-	.include "data/scripts/maps/SootopolisCity_House5.inc"
-	.include "data/scripts/maps/SootopolisCity_House6.inc"
-	.include "data/scripts/maps/SootopolisCity_House7.inc"
-	.include "data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc"
-	.include "data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc"
-	.include "data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc"
-	.include "data/scripts/maps/EverGrandeCity_SidneysRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_PhoebesRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_GlaciasRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_DrakesRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_ChampionsRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_Hall1.inc"
-	.include "data/scripts/maps/EverGrandeCity_Hall2.inc"
-	.include "data/scripts/maps/EverGrandeCity_Hall3.inc"
-	.include "data/scripts/maps/EverGrandeCity_Hall4.inc"
-	.include "data/scripts/maps/EverGrandeCity_Hall5.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc"
-	.include "data/scripts/maps/EverGrandeCity_HallOfFame.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc"
-	.include "data/scripts/maps/Route104_MrBrineysHouse.inc"
-	.include "data/scripts/maps/Route104_PrettyPetalFlowerShop.inc"
-	.include "data/scripts/maps/Route111_WinstrateFamilysHouse.inc"
-	.include "data/scripts/maps/Route111_OldLadysRestStop.inc"
-	.include "data/scripts/maps/Route112_CableCarStation.inc"
-	.include "data/scripts/maps/MtChimney_CableCarStation.inc"
-	.include "data/scripts/maps/Route114_FossilManiacsHouse.inc"
-	.include "data/scripts/maps/Route114_FossilManiacsTunnel.inc"
-	.include "data/scripts/maps/Route114_LanettesHouse.inc"
-	.include "data/scripts/maps/Route116_TunnelersRestHouse.inc"
-	.include "data/scripts/maps/Route117_PokemonDayCare.inc"
-	.include "data/scripts/maps/Route121_SafariZoneEntrance.inc"
-	.include "data/scripts/maps/MeteorFalls_1F_1R.inc"
-	.include "data/scripts/maps/MeteorFalls_1F_2R.inc"
-	.include "data/scripts/maps/MeteorFalls_B1F_1R.inc"
-	.include "data/scripts/maps/MeteorFalls_B1F_2R.inc"
-	.include "data/scripts/maps/RusturfTunnel.inc"
-	.include "data/scripts/maps/Underwater_SootopolisCity.inc"
-	.include "data/scripts/maps/DesertRuins.inc"
-	.include "data/scripts/maps/GraniteCave_1F.inc"
-	.include "data/scripts/maps/GraniteCave_B1F.inc"
-	.include "data/scripts/maps/GraniteCave_B2F.inc"
-	.include "data/scripts/maps/GraniteCave_StevensRoom.inc"
-	.include "data/scripts/maps/PetalburgWoods.inc"
-	.include "data/scripts/maps/MtChimney.inc"
-	.include "data/scripts/maps/JaggedPass.inc"
-	.include "data/scripts/maps/FieryPath.inc"
-	.include "data/scripts/maps/MtPyre_1F.inc"
-	.include "data/scripts/maps/MtPyre_2F.inc"
-	.include "data/scripts/maps/MtPyre_3F.inc"
-	.include "data/scripts/maps/MtPyre_4F.inc"
-	.include "data/scripts/maps/MtPyre_5F.inc"
-	.include "data/scripts/maps/MtPyre_6F.inc"
-	.include "data/scripts/maps/MtPyre_Exterior.inc"
-	.include "data/scripts/maps/MtPyre_Summit.inc"
-	.include "data/scripts/maps/AquaHideout_1F.inc"
-	.include "data/scripts/maps/AquaHideout_B1F.inc"
-	.include "data/scripts/maps/AquaHideout_B2F.inc"
-	.include "data/scripts/maps/Underwater_SeafloorCavern.inc"
-	.include "data/scripts/maps/SeafloorCavern_Entrance.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room1.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room2.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room3.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room4.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room5.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room6.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room7.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room8.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room9.inc"
-	.include "data/scripts/maps/CaveOfOrigin_Entrance.inc"
-	.include "data/scripts/maps/CaveOfOrigin_1F.inc"
-	.include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc"
-	.include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc"
-	.include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc"
-	.include "data/scripts/maps/CaveOfOrigin_B1F.inc"
-	.include "data/scripts/maps/VictoryRoad_1F.inc"
-	.include "data/scripts/maps/VictoryRoad_B1F.inc"
-	.include "data/scripts/maps/VictoryRoad_B2F.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideInnerRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideStairsRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideLowerRoom.inc"
-	.include "data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc"
-	.include "data/scripts/maps/ShoalCave_HighTideInnerRoom.inc"
-	.include "data/scripts/maps/NewMauville_Entrance.inc"
-	.include "data/scripts/maps/NewMauville_Inside.inc"
-	.include "data/scripts/maps/AbandonedShip_Deck.inc"
-	.include "data/scripts/maps/AbandonedShip_Corridors_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Corridors_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms2_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Underwater1.inc"
-	.include "data/scripts/maps/AbandonedShip_Room_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms2_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_CaptainsOffice.inc"
-	.include "data/scripts/maps/AbandonedShip_Underwater2.inc"
-	.include "data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc"
-	.include "data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc"
-	.include "data/scripts/maps/IslandCave.inc"
-	.include "data/scripts/maps/AncientTomb.inc"
-	.include "data/scripts/maps/Underwater_Route134.inc"
-	.include "data/scripts/maps/Underwater_SealedChamber.inc"
-	.include "data/scripts/maps/SealedChamber_OuterRoom.inc"
-	.include "data/scripts/maps/SealedChamber_InnerRoom.inc"
-	.include "data/scripts/maps/ScorchedSlab.inc"
-	.include "data/scripts/maps/AquaHideout_UnusedRubyMap1.inc"
-	.include "data/scripts/maps/AquaHideout_UnusedRubyMap2.inc"
-	.include "data/scripts/maps/AquaHideout_UnusedRubyMap3.inc"
-	.include "data/scripts/maps/SkyPillar_Entrance.inc"
-	.include "data/scripts/maps/SkyPillar_Outside.inc"
-	.include "data/scripts/maps/SkyPillar_1F.inc"
-	.include "data/scripts/maps/SkyPillar_2F.inc"
-	.include "data/scripts/maps/SkyPillar_3F.inc"
-	.include "data/scripts/maps/SkyPillar_4F.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideIceRoom.inc"
-	.include "data/scripts/maps/SkyPillar_5F.inc"
-	.include "data/scripts/maps/SkyPillar_Top.inc"
-	.include "data/scripts/maps/MagmaHideout_1F.inc"
-	.include "data/scripts/maps/MagmaHideout_2F_1R.inc"
-	.include "data/scripts/maps/MagmaHideout_2F_2R.inc"
-	.include "data/scripts/maps/MagmaHideout_3F_1R.inc"
-	.include "data/scripts/maps/MagmaHideout_3F_2R.inc"
-	.include "data/scripts/maps/MagmaHideout_4F.inc"
-	.include "data/scripts/maps/MagmaHideout_3F_3R.inc"
-	.include "data/scripts/maps/MagmaHideout_2F_3R.inc"
-	.include "data/scripts/maps/MirageTower_1F.inc"
-	.include "data/scripts/maps/MirageTower_2F.inc"
-	.include "data/scripts/maps/MirageTower_3F.inc"
-	.include "data/scripts/maps/MirageTower_4F.inc"
-	.include "data/scripts/maps/DesertUnderpass.inc"
-	.include "data/scripts/maps/ArtisanCave_B1F.inc"
-	.include "data/scripts/maps/ArtisanCave_1F.inc"
-	.include "data/scripts/maps/Underwater_MarineCave.inc"
-	.include "data/scripts/maps/MarineCave_Entrance.inc"
-	.include "data/scripts/maps/MarineCave_End.inc"
-	.include "data/scripts/maps/TerraCave_Entrance.inc"
-	.include "data/scripts/maps/TerraCave_End.inc"
-	.include "data/scripts/maps/AlteringCave.inc"
-	.include "data/scripts/maps/MeteorFalls_StevensCave.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave1.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave2.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave3.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave4.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave1.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave2.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave3.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave4.inc"
-	.include "data/scripts/maps/SecretBase_RedCave1.inc"
-	.include "data/scripts/maps/SecretBase_RedCave2.inc"
-	.include "data/scripts/maps/SecretBase_RedCave3.inc"
-	.include "data/scripts/maps/SecretBase_RedCave4.inc"
-	.include "data/scripts/maps/SecretBase_Shrub1.inc"
-	.include "data/scripts/maps/SecretBase_Shrub2.inc"
-	.include "data/scripts/maps/SecretBase_Shrub3.inc"
-	.include "data/scripts/maps/SecretBase_Shrub4.inc"
-	.include "data/scripts/maps/SecretBase_Tree1.inc"
-	.include "data/scripts/maps/SecretBase_Tree2.inc"
-	.include "data/scripts/maps/SecretBase_Tree3.inc"
-	.include "data/scripts/maps/SecretBase_Tree4.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave1.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave2.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave3.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave4.inc"
+	.include "data/maps/PetalburgCity/scripts.inc"
+	.include "data/maps/SlateportCity/scripts.inc"
+	.include "data/maps/MauvilleCity/scripts.inc"
+	.include "data/maps/RustboroCity/scripts.inc"
+	.include "data/maps/FortreeCity/scripts.inc"
+	.include "data/maps/LilycoveCity/scripts.inc"
+	.include "data/maps/MossdeepCity/scripts.inc"
+	.include "data/maps/SootopolisCity/scripts.inc"
+	.include "data/maps/EverGrandeCity/scripts.inc"
+	.include "data/maps/LittlerootTown/scripts.inc"
+	.include "data/maps/OldaleTown/scripts.inc"
+	.include "data/maps/DewfordTown/scripts.inc"
+	.include "data/maps/LavaridgeTown/scripts.inc"
+	.include "data/maps/FallarborTown/scripts.inc"
+	.include "data/maps/VerdanturfTown/scripts.inc"
+	.include "data/maps/PacifidlogTown/scripts.inc"
+	.include "data/maps/Route101/scripts.inc"
+	.include "data/maps/Route102/scripts.inc"
+	.include "data/maps/Route103/scripts.inc"
+	.include "data/maps/Route104/scripts.inc"
+	.include "data/maps/Route105/scripts.inc"
+	.include "data/maps/Route106/scripts.inc"
+	.include "data/maps/Route107/scripts.inc"
+	.include "data/maps/Route108/scripts.inc"
+	.include "data/maps/Route109/scripts.inc"
+	.include "data/maps/Route110/scripts.inc"
+	.include "data/maps/Route111/scripts.inc"
+	.include "data/maps/Route112/scripts.inc"
+	.include "data/maps/Route113/scripts.inc"
+	.include "data/maps/Route114/scripts.inc"
+	.include "data/maps/Route115/scripts.inc"
+	.include "data/maps/Route116/scripts.inc"
+	.include "data/maps/Route117/scripts.inc"
+	.include "data/maps/Route118/scripts.inc"
+	.include "data/maps/Route119/scripts.inc"
+	.include "data/maps/Route120/scripts.inc"
+	.include "data/maps/Route121/scripts.inc"
+	.include "data/maps/Route122/scripts.inc"
+	.include "data/maps/Route123/scripts.inc"
+	.include "data/maps/Route124/scripts.inc"
+	.include "data/maps/Route125/scripts.inc"
+	.include "data/maps/Route126/scripts.inc"
+	.include "data/maps/Route127/scripts.inc"
+	.include "data/maps/Route128/scripts.inc"
+	.include "data/maps/Route129/scripts.inc"
+	.include "data/maps/Route130/scripts.inc"
+	.include "data/maps/Route131/scripts.inc"
+	.include "data/maps/Route132/scripts.inc"
+	.include "data/maps/Route133/scripts.inc"
+	.include "data/maps/Route134/scripts.inc"
+	.include "data/maps/Underwater1/scripts.inc"
+	.include "data/maps/Underwater2/scripts.inc"
+	.include "data/maps/Underwater3/scripts.inc"
+	.include "data/maps/Underwater4/scripts.inc"
+	.include "data/maps/Underwater5/scripts.inc"
+	.include "data/maps/Underwater6/scripts.inc"
+	.include "data/maps/Underwater7/scripts.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_1F/scripts.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_2F/scripts.inc"
+	.include "data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc"
+	.include "data/maps/OldaleTown_House1/scripts.inc"
+	.include "data/maps/OldaleTown_House2/scripts.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/OldaleTown_Mart/scripts.inc"
+	.include "data/maps/DewfordTown_House1/scripts.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/DewfordTown_Gym/scripts.inc"
+	.include "data/maps/DewfordTown_Hall/scripts.inc"
+	.include "data/maps/DewfordTown_House2/scripts.inc"
+	.include "data/maps/LavaridgeTown_HerbShop/scripts.inc"
+	.include "data/maps/LavaridgeTown_Gym_1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_Gym_B1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_House/scripts.inc"
+	.include "data/maps/LavaridgeTown_Mart/scripts.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FallarborTown_Mart/scripts.inc"
+	.include "data/maps/FallarborTown_BattleTentLobby/scripts.inc"
+	.include "data/maps/FallarborTown_BattleTentCorridor/scripts.inc"
+	.include "data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FallarborTown_House1/scripts.inc"
+	.include "data/maps/FallarborTown_House2/scripts.inc"
+	.include "data/maps/VerdanturfTown_BattleTentLobby/scripts.inc"
+	.include "data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc"
+	.include "data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc"
+	.include "data/maps/VerdanturfTown_Mart/scripts.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/VerdanturfTown_WandasHouse/scripts.inc"
+	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc"
+	.include "data/maps/VerdanturfTown_House/scripts.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/PacifidlogTown_House1/scripts.inc"
+	.include "data/maps/PacifidlogTown_House2/scripts.inc"
+	.include "data/maps/PacifidlogTown_House3/scripts.inc"
+	.include "data/maps/PacifidlogTown_House4/scripts.inc"
+	.include "data/maps/PacifidlogTown_House5/scripts.inc"
+	.include "data/maps/PetalburgCity_WallysHouse/scripts.inc"
+	.include "data/maps/PetalburgCity_Gym/scripts.inc"
+	.include "data/maps/PetalburgCity_House1/scripts.inc"
+	.include "data/maps/PetalburgCity_House2/scripts.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/PetalburgCity_Mart/scripts.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_1F/scripts.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_2F/scripts.inc"
+	.include "data/maps/SlateportCity_BattleTentLobby/scripts.inc"
+	.include "data/maps/SlateportCity_BattleTentCorridor/scripts.inc"
+	.include "data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc"
+	.include "data/maps/SlateportCity_House1/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonFanClub/scripts.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc"
+	.include "data/maps/SlateportCity_Harbor/scripts.inc"
+	.include "data/maps/SlateportCity_House2/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/SlateportCity_Mart/scripts.inc"
+	.include "data/maps/MauvilleCity_Gym/scripts.inc"
+	.include "data/maps/MauvilleCity_BikeShop/scripts.inc"
+	.include "data/maps/MauvilleCity_House1/scripts.inc"
+	.include "data/maps/MauvilleCity_GameCorner/scripts.inc"
+	.include "data/maps/MauvilleCity_House2/scripts.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/MauvilleCity_Mart/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_1F/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_2F/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_3F/scripts.inc"
+	.include "data/maps/RustboroCity_Gym/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonSchool/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/RustboroCity_Mart/scripts.inc"
+	.include "data/maps/RustboroCity_Flat1_1F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat1_2F/scripts.inc"
+	.include "data/maps/RustboroCity_House1/scripts.inc"
+	.include "data/maps/RustboroCity_CuttersHouse/scripts.inc"
+	.include "data/maps/RustboroCity_House2/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_1F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_2F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_3F/scripts.inc"
+	.include "data/maps/RustboroCity_House3/scripts.inc"
+	.include "data/maps/FortreeCity_House1/scripts.inc"
+	.include "data/maps/FortreeCity_Gym/scripts.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FortreeCity_Mart/scripts.inc"
+	.include "data/maps/FortreeCity_House2/scripts.inc"
+	.include "data/maps/FortreeCity_House3/scripts.inc"
+	.include "data/maps/FortreeCity_House4/scripts.inc"
+	.include "data/maps/FortreeCity_House5/scripts.inc"
+	.include "data/maps/FortreeCity_DecorationShop/scripts.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_ContestLobby/scripts.inc"
+	.include "data/maps/LilycoveCity_ContestHall/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_UnusedMart/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc"
+	.include "data/maps/LilycoveCity_Harbor/scripts.inc"
+	.include "data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc"
+	.include "data/maps/LilycoveCity_House1/scripts.inc"
+	.include "data/maps/LilycoveCity_House2/scripts.inc"
+	.include "data/maps/LilycoveCity_House3/scripts.inc"
+	.include "data/maps/LilycoveCity_House4/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc"
+	.include "data/maps/MossdeepCity_Gym/scripts.inc"
+	.include "data/maps/MossdeepCity_House1/scripts.inc"
+	.include "data/maps/MossdeepCity_House2/scripts.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/MossdeepCity_Mart/scripts.inc"
+	.include "data/maps/MossdeepCity_House3/scripts.inc"
+	.include "data/maps/MossdeepCity_StevensHouse/scripts.inc"
+	.include "data/maps/MossdeepCity_House4/scripts.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc"
+	.include "data/maps/MossdeepCity_GameCorner_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_GameCorner_B1F/scripts.inc"
+	.include "data/maps/SootopolisCity_Gym_1F/scripts.inc"
+	.include "data/maps/SootopolisCity_Gym_B1F/scripts.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/SootopolisCity_Mart/scripts.inc"
+	.include "data/maps/SootopolisCity_House1/scripts.inc"
+	.include "data/maps/SootopolisCity_House2/scripts.inc"
+	.include "data/maps/SootopolisCity_House3/scripts.inc"
+	.include "data/maps/SootopolisCity_House4/scripts.inc"
+	.include "data/maps/SootopolisCity_House5/scripts.inc"
+	.include "data/maps/SootopolisCity_House6/scripts.inc"
+	.include "data/maps/SootopolisCity_House7/scripts.inc"
+	.include "data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc"
+	.include "data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc"
+	.include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc"
+	.include "data/maps/EverGrandeCity_SidneysRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_PhoebesRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_GlaciasRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_DrakesRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_ChampionsRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_Hall1/scripts.inc"
+	.include "data/maps/EverGrandeCity_Hall2/scripts.inc"
+	.include "data/maps/EverGrandeCity_Hall3/scripts.inc"
+	.include "data/maps/EverGrandeCity_Hall4/scripts.inc"
+	.include "data/maps/EverGrandeCity_Hall5/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc"
+	.include "data/maps/EverGrandeCity_HallOfFame/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc"
+	.include "data/maps/Route104_MrBrineysHouse/scripts.inc"
+	.include "data/maps/Route104_PrettyPetalFlowerShop/scripts.inc"
+	.include "data/maps/Route111_WinstrateFamilysHouse/scripts.inc"
+	.include "data/maps/Route111_OldLadysRestStop/scripts.inc"
+	.include "data/maps/Route112_CableCarStation/scripts.inc"
+	.include "data/maps/MtChimney_CableCarStation/scripts.inc"
+	.include "data/maps/Route114_FossilManiacsHouse/scripts.inc"
+	.include "data/maps/Route114_FossilManiacsTunnel/scripts.inc"
+	.include "data/maps/Route114_LanettesHouse/scripts.inc"
+	.include "data/maps/Route116_TunnelersRestHouse/scripts.inc"
+	.include "data/maps/Route117_PokemonDayCare/scripts.inc"
+	.include "data/maps/Route121_SafariZoneEntrance/scripts.inc"
+	.include "data/maps/MeteorFalls_1F_1R/scripts.inc"
+	.include "data/maps/MeteorFalls_1F_2R/scripts.inc"
+	.include "data/maps/MeteorFalls_B1F_1R/scripts.inc"
+	.include "data/maps/MeteorFalls_B1F_2R/scripts.inc"
+	.include "data/maps/RusturfTunnel/scripts.inc"
+	.include "data/maps/Underwater_SootopolisCity/scripts.inc"
+	.include "data/maps/DesertRuins/scripts.inc"
+	.include "data/maps/GraniteCave_1F/scripts.inc"
+	.include "data/maps/GraniteCave_B1F/scripts.inc"
+	.include "data/maps/GraniteCave_B2F/scripts.inc"
+	.include "data/maps/GraniteCave_StevensRoom/scripts.inc"
+	.include "data/maps/PetalburgWoods/scripts.inc"
+	.include "data/maps/MtChimney/scripts.inc"
+	.include "data/maps/JaggedPass/scripts.inc"
+	.include "data/maps/FieryPath/scripts.inc"
+	.include "data/maps/MtPyre_1F/scripts.inc"
+	.include "data/maps/MtPyre_2F/scripts.inc"
+	.include "data/maps/MtPyre_3F/scripts.inc"
+	.include "data/maps/MtPyre_4F/scripts.inc"
+	.include "data/maps/MtPyre_5F/scripts.inc"
+	.include "data/maps/MtPyre_6F/scripts.inc"
+	.include "data/maps/MtPyre_Exterior/scripts.inc"
+	.include "data/maps/MtPyre_Summit/scripts.inc"
+	.include "data/maps/AquaHideout_1F/scripts.inc"
+	.include "data/maps/AquaHideout_B1F/scripts.inc"
+	.include "data/maps/AquaHideout_B2F/scripts.inc"
+	.include "data/maps/Underwater_SeafloorCavern/scripts.inc"
+	.include "data/maps/SeafloorCavern_Entrance/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room1/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room2/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room3/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room4/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room5/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room6/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room7/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room8/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room9/scripts.inc"
+	.include "data/maps/CaveOfOrigin_Entrance/scripts.inc"
+	.include "data/maps/CaveOfOrigin_1F/scripts.inc"
+	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc"
+	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc"
+	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc"
+	.include "data/maps/CaveOfOrigin_B1F/scripts.inc"
+	.include "data/maps/VictoryRoad_1F/scripts.inc"
+	.include "data/maps/VictoryRoad_B1F/scripts.inc"
+	.include "data/maps/VictoryRoad_B2F/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideInnerRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideStairsRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideLowerRoom/scripts.inc"
+	.include "data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc"
+	.include "data/maps/ShoalCave_HighTideInnerRoom/scripts.inc"
+	.include "data/maps/NewMauville_Entrance/scripts.inc"
+	.include "data/maps/NewMauville_Inside/scripts.inc"
+	.include "data/maps/AbandonedShip_Deck/scripts.inc"
+	.include "data/maps/AbandonedShip_Corridors_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Corridors_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms2_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Underwater1/scripts.inc"
+	.include "data/maps/AbandonedShip_Room_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms2_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_CaptainsOffice/scripts.inc"
+	.include "data/maps/AbandonedShip_Underwater2/scripts.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc"
+	.include "data/maps/IslandCave/scripts.inc"
+	.include "data/maps/AncientTomb/scripts.inc"
+	.include "data/maps/Underwater_Route134/scripts.inc"
+	.include "data/maps/Underwater_SealedChamber/scripts.inc"
+	.include "data/maps/SealedChamber_OuterRoom/scripts.inc"
+	.include "data/maps/SealedChamber_InnerRoom/scripts.inc"
+	.include "data/maps/ScorchedSlab/scripts.inc"
+	.include "data/maps/AquaHideout_UnusedRubyMap1/scripts.inc"
+	.include "data/maps/AquaHideout_UnusedRubyMap2/scripts.inc"
+	.include "data/maps/AquaHideout_UnusedRubyMap3/scripts.inc"
+	.include "data/maps/SkyPillar_Entrance/scripts.inc"
+	.include "data/maps/SkyPillar_Outside/scripts.inc"
+	.include "data/maps/SkyPillar_1F/scripts.inc"
+	.include "data/maps/SkyPillar_2F/scripts.inc"
+	.include "data/maps/SkyPillar_3F/scripts.inc"
+	.include "data/maps/SkyPillar_4F/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideIceRoom/scripts.inc"
+	.include "data/maps/SkyPillar_5F/scripts.inc"
+	.include "data/maps/SkyPillar_Top/scripts.inc"
+	.include "data/maps/MagmaHideout_1F/scripts.inc"
+	.include "data/maps/MagmaHideout_2F_1R/scripts.inc"
+	.include "data/maps/MagmaHideout_2F_2R/scripts.inc"
+	.include "data/maps/MagmaHideout_3F_1R/scripts.inc"
+	.include "data/maps/MagmaHideout_3F_2R/scripts.inc"
+	.include "data/maps/MagmaHideout_4F/scripts.inc"
+	.include "data/maps/MagmaHideout_3F_3R/scripts.inc"
+	.include "data/maps/MagmaHideout_2F_3R/scripts.inc"
+	.include "data/maps/MirageTower_1F/scripts.inc"
+	.include "data/maps/MirageTower_2F/scripts.inc"
+	.include "data/maps/MirageTower_3F/scripts.inc"
+	.include "data/maps/MirageTower_4F/scripts.inc"
+	.include "data/maps/DesertUnderpass/scripts.inc"
+	.include "data/maps/ArtisanCave_B1F/scripts.inc"
+	.include "data/maps/ArtisanCave_1F/scripts.inc"
+	.include "data/maps/Underwater_MarineCave/scripts.inc"
+	.include "data/maps/MarineCave_Entrance/scripts.inc"
+	.include "data/maps/MarineCave_End/scripts.inc"
+	.include "data/maps/TerraCave_Entrance/scripts.inc"
+	.include "data/maps/TerraCave_End/scripts.inc"
+	.include "data/maps/AlteringCave/scripts.inc"
+	.include "data/maps/MeteorFalls_StevensCave/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave1/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave2/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave3/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave4/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave1/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave2/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave3/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave4/scripts.inc"
+	.include "data/maps/SecretBase_RedCave1/scripts.inc"
+	.include "data/maps/SecretBase_RedCave2/scripts.inc"
+	.include "data/maps/SecretBase_RedCave3/scripts.inc"
+	.include "data/maps/SecretBase_RedCave4/scripts.inc"
+	.include "data/maps/SecretBase_Shrub1/scripts.inc"
+	.include "data/maps/SecretBase_Shrub2/scripts.inc"
+	.include "data/maps/SecretBase_Shrub3/scripts.inc"
+	.include "data/maps/SecretBase_Shrub4/scripts.inc"
+	.include "data/maps/SecretBase_Tree1/scripts.inc"
+	.include "data/maps/SecretBase_Tree2/scripts.inc"
+	.include "data/maps/SecretBase_Tree3/scripts.inc"
+	.include "data/maps/SecretBase_Tree4/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave1/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave2/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave3/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave4/scripts.inc"
 
 gUnknown_0823B4BB:: @ 823B4BB
 	lockall
@@ -626,154 +627,154 @@ gText_23B73E:: @ 823B73E
 SecretBase_RedCave1_Text_23B759: @ 823B759
 	.string "Want to make your SECRET BASE here?$"
 
-	.include "data/scripts/maps/SingleBattleColosseum.inc"
-	.include "data/scripts/maps/TradeCenter.inc"
-	.include "data/scripts/maps/RecordCorner.inc"
-	.include "data/scripts/maps/DoubleBattleColosseum.inc"
-	.include "data/scripts/maps/LinkContestRoom1.inc"
-	.include "data/scripts/maps/LinkContestRoom2.inc"
-	.include "data/scripts/maps/LinkContestRoom3.inc"
-	.include "data/scripts/maps/LinkContestRoom4.inc"
-	.include "data/scripts/maps/LinkContestRoom5.inc"
-	.include "data/scripts/maps/LinkContestRoom6.inc"
-	.include "data/scripts/maps/UnknownMap_25_29.inc"
-	.include "data/scripts/maps/UnknownMap_25_30.inc"
-	.include "data/scripts/maps/UnknownMap_25_31.inc"
-	.include "data/scripts/maps/UnknownMap_25_32.inc"
-	.include "data/scripts/maps/UnknownMap_25_33.inc"
-	.include "data/scripts/maps/UnknownMap_25_34.inc"
-	.include "data/scripts/maps/InsideOfTruck.inc"
-	.include "data/scripts/maps/SSTidalCorridor.inc"
-	.include "data/scripts/maps/SSTidalLowerDeck.inc"
-	.include "data/scripts/maps/SSTidalRooms.inc"
-	.include "data/scripts/maps/BattlePyramidSquare01.inc"
-	.include "data/scripts/maps/BattlePyramidSquare02.inc"
-	.include "data/scripts/maps/BattlePyramidSquare03.inc"
-	.include "data/scripts/maps/BattlePyramidSquare04.inc"
-	.include "data/scripts/maps/BattlePyramidSquare05.inc"
-	.include "data/scripts/maps/BattlePyramidSquare06.inc"
-	.include "data/scripts/maps/BattlePyramidSquare07.inc"
-	.include "data/scripts/maps/BattlePyramidSquare08.inc"
-	.include "data/scripts/maps/BattlePyramidSquare09.inc"
-	.include "data/scripts/maps/BattlePyramidSquare10.inc"
-	.include "data/scripts/maps/BattlePyramidSquare11.inc"
-	.include "data/scripts/maps/BattlePyramidSquare12.inc"
-	.include "data/scripts/maps/BattlePyramidSquare13.inc"
-	.include "data/scripts/maps/BattlePyramidSquare14.inc"
-	.include "data/scripts/maps/BattlePyramidSquare15.inc"
-	.include "data/scripts/maps/BattlePyramidSquare16.inc"
-	.include "data/scripts/maps/UnionRoom.inc"
-	.include "data/scripts/maps/SafariZone_Northwest.inc"
-	.include "data/scripts/maps/SafariZone_North.inc"
-	.include "data/scripts/maps/SafariZone_Southwest.inc"
-	.include "data/scripts/maps/SafariZone_South.inc"
-	.include "data/scripts/maps/BattleFrontier_OutsideWest.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleTowerLobby.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleTowerElevator.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc"
-	.include "data/scripts/maps/SouthernIsland_Exterior.inc"
-	.include "data/scripts/maps/SouthernIsland_Interior.inc"
-	.include "data/scripts/maps/SafariZone_RestHouse.inc"
-	.include "data/scripts/maps/SafariZone_Northeast.inc"
-	.include "data/scripts/maps/SafariZone_Southeast.inc"
-	.include "data/scripts/maps/BattleFrontier_OutsideEast.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleDomeLobby.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePyramidTop.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleArenaLobby.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePikeLobby.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc"
-	.include "data/scripts/maps/BattleFrontier_RankingHall.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge1.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge2.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge3.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge4.inc"
-	.include "data/scripts/maps/BattleFrontier_ScottsHouse.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge5.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge6.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge7.inc"
-	.include "data/scripts/maps/BattleFrontier_ReceptionGate.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge8.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge9.inc"
-	.include "data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/BattleFrontier_Mart.inc"
-	.include "data/scripts/maps/FarawayIsland_Entrance.inc"
-	.include "data/scripts/maps/FarawayIsland_Interior.inc"
-	.include "data/scripts/maps/BirthIsland_Exterior.inc"
-	.include "data/scripts/maps/BirthIsland_Harbor.inc"
-	.include "data/scripts/maps/TrainerHill_Entrance.inc"
-	.include "data/scripts/maps/TrainerHill_1F.inc"
-	.include "data/scripts/maps/TrainerHill_2F.inc"
-	.include "data/scripts/maps/TrainerHill_3F.inc"
-	.include "data/scripts/maps/TrainerHill_4F.inc"
-	.include "data/scripts/maps/TrainerHill_Roof.inc"
-	.include "data/scripts/maps/NavelRock_Exterior.inc"
-	.include "data/scripts/maps/NavelRock_Harbor.inc"
-	.include "data/scripts/maps/NavelRock_Entrance.inc"
-	.include "data/scripts/maps/NavelRock_B1F.inc"
-	.include "data/scripts/maps/NavelRock_Fork.inc"
-	.include "data/scripts/maps/NavelRock_Up1.inc"
-	.include "data/scripts/maps/NavelRock_Up2.inc"
-	.include "data/scripts/maps/NavelRock_Up3.inc"
-	.include "data/scripts/maps/NavelRock_Up4.inc"
-	.include "data/scripts/maps/NavelRock_Top.inc"
-	.include "data/scripts/maps/NavelRock_Down01.inc"
-	.include "data/scripts/maps/NavelRock_Down02.inc"
-	.include "data/scripts/maps/NavelRock_Down03.inc"
-	.include "data/scripts/maps/NavelRock_Down04.inc"
-	.include "data/scripts/maps/NavelRock_Down05.inc"
-	.include "data/scripts/maps/NavelRock_Down06.inc"
-	.include "data/scripts/maps/NavelRock_Down07.inc"
-	.include "data/scripts/maps/NavelRock_Down08.inc"
-	.include "data/scripts/maps/NavelRock_Down09.inc"
-	.include "data/scripts/maps/NavelRock_Down10.inc"
-	.include "data/scripts/maps/NavelRock_Down11.inc"
-	.include "data/scripts/maps/NavelRock_Bottom.inc"
-	.include "data/scripts/maps/TrainerHill_Elevator.inc"
-	.include "data/scripts/maps/Route104_Prototype.inc"
-	.include "data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc"
-	.include "data/scripts/maps/Route109_SeashoreHouse.inc"
-	.include "data/scripts/maps/Route110_TrickHouseEntrance.inc"
-	.include "data/scripts/maps/Route110_TrickHouseEnd.inc"
-	.include "data/scripts/maps/Route110_TrickHouseCorridor.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle1.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle2.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle3.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle4.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle5.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle6.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle7.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle8.inc"
-	.include "data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc"
-	.include "data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc"
-	.include "data/scripts/maps/Route113_GlassWorkshop.inc"
-	.include "data/scripts/maps/Route123_BerryMastersHouse.inc"
-	.include "data/scripts/maps/Route119_WeatherInstitute_1F.inc"
-	.include "data/scripts/maps/Route119_WeatherInstitute_2F.inc"
-	.include "data/scripts/maps/Route119_House.inc"
-	.include "data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc"
+	.include "data/maps/SingleBattleColosseum/scripts.inc"
+	.include "data/maps/TradeCenter/scripts.inc"
+	.include "data/maps/RecordCorner/scripts.inc"
+	.include "data/maps/DoubleBattleColosseum/scripts.inc"
+	.include "data/maps/LinkContestRoom1/scripts.inc"
+	.include "data/maps/LinkContestRoom2/scripts.inc"
+	.include "data/maps/LinkContestRoom3/scripts.inc"
+	.include "data/maps/LinkContestRoom4/scripts.inc"
+	.include "data/maps/LinkContestRoom5/scripts.inc"
+	.include "data/maps/LinkContestRoom6/scripts.inc"
+	.include "data/maps/UnknownMap_25_29/scripts.inc"
+	.include "data/maps/UnknownMap_25_30/scripts.inc"
+	.include "data/maps/UnknownMap_25_31/scripts.inc"
+	.include "data/maps/UnknownMap_25_32/scripts.inc"
+	.include "data/maps/UnknownMap_25_33/scripts.inc"
+	.include "data/maps/UnknownMap_25_34/scripts.inc"
+	.include "data/maps/InsideOfTruck/scripts.inc"
+	.include "data/maps/SSTidalCorridor/scripts.inc"
+	.include "data/maps/SSTidalLowerDeck/scripts.inc"
+	.include "data/maps/SSTidalRooms/scripts.inc"
+	.include "data/maps/BattlePyramidSquare01/scripts.inc"
+	.include "data/maps/BattlePyramidSquare02/scripts.inc"
+	.include "data/maps/BattlePyramidSquare03/scripts.inc"
+	.include "data/maps/BattlePyramidSquare04/scripts.inc"
+	.include "data/maps/BattlePyramidSquare05/scripts.inc"
+	.include "data/maps/BattlePyramidSquare06/scripts.inc"
+	.include "data/maps/BattlePyramidSquare07/scripts.inc"
+	.include "data/maps/BattlePyramidSquare08/scripts.inc"
+	.include "data/maps/BattlePyramidSquare09/scripts.inc"
+	.include "data/maps/BattlePyramidSquare10/scripts.inc"
+	.include "data/maps/BattlePyramidSquare11/scripts.inc"
+	.include "data/maps/BattlePyramidSquare12/scripts.inc"
+	.include "data/maps/BattlePyramidSquare13/scripts.inc"
+	.include "data/maps/BattlePyramidSquare14/scripts.inc"
+	.include "data/maps/BattlePyramidSquare15/scripts.inc"
+	.include "data/maps/BattlePyramidSquare16/scripts.inc"
+	.include "data/maps/UnionRoom/scripts.inc"
+	.include "data/maps/SafariZone_Northwest/scripts.inc"
+	.include "data/maps/SafariZone_North/scripts.inc"
+	.include "data/maps/SafariZone_Southwest/scripts.inc"
+	.include "data/maps/SafariZone_South/scripts.inc"
+	.include "data/maps/BattleFrontier_OutsideWest/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerLobby/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerElevator/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc"
+	.include "data/maps/SouthernIsland_Exterior/scripts.inc"
+	.include "data/maps/SouthernIsland_Interior/scripts.inc"
+	.include "data/maps/SafariZone_RestHouse/scripts.inc"
+	.include "data/maps/SafariZone_Northeast/scripts.inc"
+	.include "data/maps/SafariZone_Southeast/scripts.inc"
+	.include "data/maps/BattleFrontier_OutsideEast/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleDomeLobby/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePyramidTop/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleArenaLobby/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePikeLobby/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc"
+	.include "data/maps/BattleFrontier_RankingHall/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge1/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge2/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge3/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge4/scripts.inc"
+	.include "data/maps/BattleFrontier_ScottsHouse/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge5/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge6/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge7/scripts.inc"
+	.include "data/maps/BattleFrontier_ReceptionGate/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge8/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge9/scripts.inc"
+	.include "data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/BattleFrontier_Mart/scripts.inc"
+	.include "data/maps/FarawayIsland_Entrance/scripts.inc"
+	.include "data/maps/FarawayIsland_Interior/scripts.inc"
+	.include "data/maps/BirthIsland_Exterior/scripts.inc"
+	.include "data/maps/BirthIsland_Harbor/scripts.inc"
+	.include "data/maps/TrainerHill_Entrance/scripts.inc"
+	.include "data/maps/TrainerHill_1F/scripts.inc"
+	.include "data/maps/TrainerHill_2F/scripts.inc"
+	.include "data/maps/TrainerHill_3F/scripts.inc"
+	.include "data/maps/TrainerHill_4F/scripts.inc"
+	.include "data/maps/TrainerHill_Roof/scripts.inc"
+	.include "data/maps/NavelRock_Exterior/scripts.inc"
+	.include "data/maps/NavelRock_Harbor/scripts.inc"
+	.include "data/maps/NavelRock_Entrance/scripts.inc"
+	.include "data/maps/NavelRock_B1F/scripts.inc"
+	.include "data/maps/NavelRock_Fork/scripts.inc"
+	.include "data/maps/NavelRock_Up1/scripts.inc"
+	.include "data/maps/NavelRock_Up2/scripts.inc"
+	.include "data/maps/NavelRock_Up3/scripts.inc"
+	.include "data/maps/NavelRock_Up4/scripts.inc"
+	.include "data/maps/NavelRock_Top/scripts.inc"
+	.include "data/maps/NavelRock_Down01/scripts.inc"
+	.include "data/maps/NavelRock_Down02/scripts.inc"
+	.include "data/maps/NavelRock_Down03/scripts.inc"
+	.include "data/maps/NavelRock_Down04/scripts.inc"
+	.include "data/maps/NavelRock_Down05/scripts.inc"
+	.include "data/maps/NavelRock_Down06/scripts.inc"
+	.include "data/maps/NavelRock_Down07/scripts.inc"
+	.include "data/maps/NavelRock_Down08/scripts.inc"
+	.include "data/maps/NavelRock_Down09/scripts.inc"
+	.include "data/maps/NavelRock_Down10/scripts.inc"
+	.include "data/maps/NavelRock_Down11/scripts.inc"
+	.include "data/maps/NavelRock_Bottom/scripts.inc"
+	.include "data/maps/TrainerHill_Elevator/scripts.inc"
+	.include "data/maps/Route104_Prototype/scripts.inc"
+	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc"
+	.include "data/maps/Route109_SeashoreHouse/scripts.inc"
+	.include "data/maps/Route110_TrickHouseEntrance/scripts.inc"
+	.include "data/maps/Route110_TrickHouseEnd/scripts.inc"
+	.include "data/maps/Route110_TrickHouseCorridor/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle1/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle2/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle3/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle4/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle5/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle6/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle7/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle8/scripts.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc"
+	.include "data/maps/Route113_GlassWorkshop/scripts.inc"
+	.include "data/maps/Route123_BerryMastersHouse/scripts.inc"
+	.include "data/maps/Route119_WeatherInstitute_1F/scripts.inc"
+	.include "data/maps/Route119_WeatherInstitute_2F/scripts.inc"
+	.include "data/maps/Route119_House/scripts.inc"
+	.include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc"
 
 Std_2: @ 8271315
 	lock
@@ -2363,7 +2364,7 @@ EventScript_27222B:: @ 827222B
 	delay 30
 	applymovement 255, PetalburgCity_Movement_2725A6
 	waitmovement 0
-	showobjectat 255, PETALBURG_CITY
+	showobjectat 255, MAP_PETALBURG_CITY
 	delay 30
 	applymovement 255, Movement_27224E
 	waitmovement 0
@@ -2384,7 +2385,7 @@ SouthernIsland_Exterior_EventScript_272250:: @ 8272250
 	compare VAR_FACING, 3
 	call_if 1, BattleFrontier_OutsideWest_EventScript_242A2C
 	delay 30
-	hideobjectat 255, PETALBURG_CITY
+	hideobjectat 255, MAP_PETALBURG_CITY
 	call BattleFrontier_OutsideWest_EventScript_2721E2
 	return
 
@@ -4044,35 +4045,35 @@ Underwater7_EventScript_274223:: @ 8274223
 	return
 
 Underwater3_EventScript_274281:: @ 8274281
-	setescapewarp ROUTE_105, 255, 11, 29
+	setescapewarp MAP_ROUTE105, 255, 11, 29
 	return
 
 Underwater3_EventScript_27428A:: @ 827428A
-	setescapewarp ROUTE_105, 255, 21, 54
+	setescapewarp MAP_ROUTE105, 255, 21, 54
 	return
 
 Underwater3_EventScript_274293:: @ 8274293
-	setescapewarp ROUTE_125, 255, 9, 17
+	setescapewarp MAP_ROUTE125, 255, 9, 17
 	return
 
 Underwater3_EventScript_27429C:: @ 827429C
-	setescapewarp ROUTE_125, 255, 54, 19
+	setescapewarp MAP_ROUTE125, 255, 54, 19
 	return
 
 Underwater3_EventScript_2742A5:: @ 82742A5
-	setescapewarp ROUTE_127, 255, 58, 10
+	setescapewarp MAP_ROUTE127, 255, 58, 10
 	return
 
 Underwater3_EventScript_2742AE:: @ 82742AE
-	setescapewarp ROUTE_127, 255, 62, 31
+	setescapewarp MAP_ROUTE127, 255, 62, 31
 	return
 
 Underwater3_EventScript_2742B7:: @ 82742B7
-	setescapewarp ROUTE_129, 255, 17, 15
+	setescapewarp MAP_ROUTE129, 255, 17, 15
 	return
 
 Underwater3_EventScript_2742C0:: @ 82742C0
-	setescapewarp ROUTE_129, 255, 43, 20
+	setescapewarp MAP_ROUTE129, 255, 43, 20
 	return
 
 Std_RegisteredInMatchCall:: @ 82742C9
@@ -6025,7 +6026,7 @@ gUnknown_082A8337:: @ 82A8337
 	waitmovement 0
 	playse SE_RU_HYUU
 	delay 60
-	warphole UNDEFINED
+	warphole MAP_UNDEFINED
 	waitstate
 	end
 
@@ -13232,7 +13233,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8
 	goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35
 	compare VAR_RESULT, 8
 	goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F
-	hideobjectat 2, BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1
+	hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
 	setvar VAR_TEMP_4, 1
 	turnobject 255, 2
 	end
@@ -13245,7 +13246,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35
 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F
 	setvar VAR_TEMP_4, 1
 	turnobject 255, 2
-	hideobjectat 1, BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1
+	hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E:: @ 82C3F4E
@@ -13300,7 +13301,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030
 	applymovement 255, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A
 	waitmovement 0
 	call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49
-	warpsilent BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1, 255, 4, 7
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1, 255, 4, 7
 	waitstate
 	end
 
@@ -13308,7 +13309,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049:: @ 82C4049
 	applymovement 255, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A
 	waitmovement 0
 	call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49
-	warpsilent BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_3, 255, 4, 19
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3, 255, 4, 19
 	waitstate
 	end
 
@@ -13389,7 +13390,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144
 	applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A
 	waitmovement 0
 	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49
-	warpsilent BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_2, 255, 2, 7
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2, 255, 2, 7
 	return
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C:: @ 82C415C
@@ -13397,7 +13398,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C
 	applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A
 	waitmovement 0
 	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49
-	warpsilent BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10
 	return
 
 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174
@@ -13452,7 +13453,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222:: @ 82C4222
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special sub_81A1780
-	warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
+	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
 	waitstate
 	end
 
@@ -14681,7 +14682,7 @@ TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6
 	end
 
 TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF
-	warpsilent TRAINER_HILL_ENTRANCE, 255, 9, 6
+	warpsilent MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6
 	waitstate
 	end
 
@@ -14696,7 +14697,7 @@ TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9
 TrainerHill_1F_EventScript_2C83DF:: @ 82C83DF
 TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF
 	setvar VAR_TEMP_1, 0
-	warp TRAINER_HILL_ENTRANCE, 255, 9, 6
+	warp MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6
 	waitstate
 	end
 
diff --git a/data/layouts.inc b/data/layouts.inc
new file mode 100755
index 000000000..e69d50f3e
--- /dev/null
+++ b/data/layouts.inc
@@ -0,0 +1,441 @@
+	.include "data/layouts/PetalburgCity/layout.inc"
+	.include "data/layouts/SlateportCity/layout.inc"
+	.include "data/layouts/MauvilleCity/layout.inc"
+	.include "data/layouts/RustboroCity/layout.inc"
+	.include "data/layouts/FortreeCity/layout.inc"
+	.include "data/layouts/LilycoveCity/layout.inc"
+	.include "data/layouts/MossdeepCity/layout.inc"
+	.include "data/layouts/SootopolisCity/layout.inc"
+	.include "data/layouts/EverGrandeCity/layout.inc"
+	.include "data/layouts/LittlerootTown/layout.inc"
+	.include "data/layouts/OldaleTown/layout.inc"
+	.include "data/layouts/DewfordTown/layout.inc"
+	.include "data/layouts/LavaridgeTown/layout.inc"
+	.include "data/layouts/FallarborTown/layout.inc"
+	.include "data/layouts/VerdanturfTown/layout.inc"
+	.include "data/layouts/PacifidlogTown/layout.inc"
+	.include "data/layouts/Route101/layout.inc"
+	.include "data/layouts/Route102/layout.inc"
+	.include "data/layouts/Route103/layout.inc"
+	.include "data/layouts/Route104/layout.inc"
+	.include "data/layouts/Route105/layout.inc"
+	.include "data/layouts/Route106/layout.inc"
+	.include "data/layouts/Route107/layout.inc"
+	.include "data/layouts/Route108/layout.inc"
+	.include "data/layouts/Route109/layout.inc"
+	.include "data/layouts/Route110/layout.inc"
+	.include "data/layouts/Route111/layout.inc"
+	.include "data/layouts/Route112/layout.inc"
+	.include "data/layouts/Route113/layout.inc"
+	.include "data/layouts/Route114/layout.inc"
+	.include "data/layouts/Route115/layout.inc"
+	.include "data/layouts/Route116/layout.inc"
+	.include "data/layouts/Route117/layout.inc"
+	.include "data/layouts/Route118/layout.inc"
+	.include "data/layouts/Route119/layout.inc"
+	.include "data/layouts/Route120/layout.inc"
+	.include "data/layouts/Route121/layout.inc"
+	.include "data/layouts/Route122/layout.inc"
+	.include "data/layouts/Route123/layout.inc"
+	.include "data/layouts/Route124/layout.inc"
+	.include "data/layouts/Route125/layout.inc"
+	.include "data/layouts/Route126/layout.inc"
+	.include "data/layouts/Route127/layout.inc"
+	.include "data/layouts/Route128/layout.inc"
+	.include "data/layouts/Route129/layout.inc"
+	.include "data/layouts/UnknownMap_08417FC4/layout.inc"
+	.include "data/layouts/Route131/layout.inc"
+	.include "data/layouts/Route132/layout.inc"
+	.include "data/layouts/Route133/layout.inc"
+	.include "data/layouts/Route134/layout.inc"
+	.include "data/layouts/Underwater2/layout.inc"
+	.include "data/layouts/Underwater3/layout.inc"
+	.include "data/layouts/Underwater4/layout.inc"
+	.include "data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc"
+	.include "data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc"
+	.include "data/layouts/LittlerootTown_MaysHouse_1F/layout.inc"
+	.include "data/layouts/LittlerootTown_MaysHouse_2F/layout.inc"
+	.include "data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc"
+	.include "data/layouts/House1/layout.inc"
+	.include "data/layouts/House2/layout.inc"
+	.include "data/layouts/PokemonCenter_1F/layout.inc"
+	.include "data/layouts/PokemonCenter_2F/layout.inc"
+	.include "data/layouts/Mart/layout.inc"
+	.include "data/layouts/House3/layout.inc"
+	.include "data/layouts/DewfordTown_Gym/layout.inc"
+	.include "data/layouts/DewfordTown_Hall/layout.inc"
+	.include "data/layouts/House4/layout.inc"
+	.include "data/layouts/LavaridgeTown_HerbShop/layout.inc"
+	.include "data/layouts/LavaridgeTown_Gym_1F/layout.inc"
+	.include "data/layouts/LavaridgeTown_Gym_B1F/layout.inc"
+	.include "data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc"
+	.include "data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc"
+	.include "data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc"
+	.include "data/layouts/LilycoveCity_House2/layout.inc"
+	.include "data/layouts/UnknownMap_08428450/layout.inc"
+	.include "data/layouts/VerdanturfTown_WandasHouse/layout.inc"
+	.include "data/layouts/PacifidlogTown_House1/layout.inc"
+	.include "data/layouts/PacifidlogTown_House2/layout.inc"
+	.include "data/layouts/PetalburgCity_Gym/layout.inc"
+	.include "data/layouts/HouseWithBed/layout.inc"
+	.include "data/layouts/SlateportCity_SternsShipyard_1F/layout.inc"
+	.include "data/layouts/SlateportCity_SternsShipyard_2F/layout.inc"
+	.include "data/layouts/UnknownMap_084294C4/layout.inc"
+	.include "data/layouts/UnknownMap_084294E8/layout.inc"
+	.include "data/layouts/SlateportCity_PokemonFanClub/layout.inc"
+	.include "data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc"
+	.include "data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc"
+	.include "data/layouts/Harbor/layout.inc"
+	.include "data/layouts/MauvilleCity_Gym/layout.inc"
+	.include "data/layouts/MauvilleCity_BikeShop/layout.inc"
+	.include "data/layouts/MauvilleCity_GameCorner/layout.inc"
+	.include "data/layouts/RustboroCity_DevonCorp_1F/layout.inc"
+	.include "data/layouts/RustboroCity_DevonCorp_2F/layout.inc"
+	.include "data/layouts/RustboroCity_Gym/layout.inc"
+	.include "data/layouts/RustboroCity_PokemonSchool/layout.inc"
+	.include "data/layouts/RustboroCity_House/layout.inc"
+	.include "data/layouts/RustboroCity_House1/layout.inc"
+	.include "data/layouts/RustboroCity_CuttersHouse/layout.inc"
+	.include "data/layouts/FortreeCity_House1/layout.inc"
+	.include "data/layouts/FortreeCity_Gym/layout.inc"
+	.include "data/layouts/FortreeCity_House2/layout.inc"
+	.include "data/layouts/Route104_MrBrineysHouse/layout.inc"
+	.include "data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc"
+	.include "data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc"
+	.include "data/layouts/LilycoveCity_ContestLobby/layout.inc"
+	.include "data/layouts/LilycoveCity_ContestHall/layout.inc"
+	.include "data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc"
+	.include "data/layouts/MossdeepCity_Gym/layout.inc"
+	.include "data/layouts/SootopolisCity_Gym_1F/layout.inc"
+	.include "data/layouts/SootopolisCity_Gym_B1F/layout.inc"
+	.include "data/layouts/EverGrandeCity_SidneysRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_PhoebesRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_GlaciasRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_DrakesRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_ChampionsRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_ShortHall/layout.inc"
+	.include "data/layouts/Route104_PrettyPetalFlowerShop/layout.inc"
+	.include "data/layouts/CableCarStation/layout.inc"
+	.include "data/layouts/Route114_FossilManiacsHouse/layout.inc"
+	.include "data/layouts/Route114_FossilManiacsTunnel/layout.inc"
+	.include "data/layouts/Route114_LanettesHouse/layout.inc"
+	.include "data/layouts/Route116_TunnelersRestHouse/layout.inc"
+	.include "data/layouts/Route117_PokemonDayCare/layout.inc"
+	.include "data/layouts/Route121_SafariZoneEntrance/layout.inc"
+	.include "data/layouts/MeteorFalls_1F_1R/layout.inc"
+	.include "data/layouts/MeteorFalls_1F_2R/layout.inc"
+	.include "data/layouts/MeteorFalls_B1F_1R/layout.inc"
+	.include "data/layouts/MeteorFalls_B1F_2R/layout.inc"
+	.include "data/layouts/RusturfTunnel/layout.inc"
+	.include "data/layouts/Underwater_SootopolisCity/layout.inc"
+	.include "data/layouts/DesertRuins/layout.inc"
+	.include "data/layouts/GraniteCave_1F/layout.inc"
+	.include "data/layouts/GraniteCave_B1F/layout.inc"
+	.include "data/layouts/GraniteCave_B2F/layout.inc"
+	.include "data/layouts/PetalburgWoods/layout.inc"
+	.include "data/layouts/MtChimney/layout.inc"
+	.include "data/layouts/MtPyre_1F/layout.inc"
+	.include "data/layouts/MtPyre_2F/layout.inc"
+	.include "data/layouts/MtPyre_3F/layout.inc"
+	.include "data/layouts/MtPyre_4F/layout.inc"
+	.include "data/layouts/MtPyre_5F/layout.inc"
+	.include "data/layouts/MtPyre_6F/layout.inc"
+	.include "data/layouts/AquaHideout_1F/layout.inc"
+	.include "data/layouts/AquaHideout_B1F/layout.inc"
+	.include "data/layouts/AquaHideout_B2F/layout.inc"
+	.include "data/layouts/Underwater_SeafloorCavern/layout.inc"
+	.include "data/layouts/SeafloorCavern_Entrance/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room1/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room2/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room3/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room4/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room5/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room6/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room7/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room8/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room9/layout.inc"
+	.include "data/layouts/CaveOfOrigin_Entrance/layout.inc"
+	.include "data/layouts/CaveOfOrigin_1F/layout.inc"
+	.include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc"
+	.include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc"
+	.include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc"
+	.include "data/layouts/CaveOfOrigin_B1F/layout.inc"
+	.include "data/layouts/VictoryRoad_1F/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideInnerRoom/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideStairsRoom/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideLowerRoom/layout.inc"
+	.include "data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc"
+	.include "data/layouts/ShoalCave_HighTideInnerRoom/layout.inc"
+	.include "data/layouts/UnknownMap_0843E6C0/layout.inc"
+	.include "data/layouts/UnknownMap_0843E6E4/layout.inc"
+	.include "data/layouts/UnknownMap_0843E708/layout.inc"
+	.include "data/layouts/UnknownMap_0843E72C/layout.inc"
+	.include "data/layouts/UnknownMap_0843E750/layout.inc"
+	.include "data/layouts/UnknownMap_0843E774/layout.inc"
+	.include "data/layouts/UnknownMap_0843E798/layout.inc"
+	.include "data/layouts/UnknownMap_0843E7BC/layout.inc"
+	.include "data/layouts/UnknownMap_0843E7E0/layout.inc"
+	.include "data/layouts/UnknownMap_0843E804/layout.inc"
+	.include "data/layouts/UnknownMap_0843E828/layout.inc"
+	.include "data/layouts/UnknownMap_0843E84C/layout.inc"
+	.include "data/layouts/UnknownMap_0843E870/layout.inc"
+	.include "data/layouts/UnknownMap_0843E894/layout.inc"
+	.include "data/layouts/NewMauville_Entrance/layout.inc"
+	.include "data/layouts/NewMauville_Inside/layout.inc"
+	.include "data/layouts/AbandonedShip_Deck/layout.inc"
+	.include "data/layouts/AbandonedShip_Corridors_1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms_1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Corridors_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms2_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Underwater1/layout.inc"
+	.include "data/layouts/AbandonedShip_Room_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms2_1F/layout.inc"
+	.include "data/layouts/AbandonedShip_CaptainsOffice/layout.inc"
+	.include "data/layouts/AbandonedShip_Underwater2/layout.inc"
+	.include "data/layouts/SecretBase_RedCave1/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave1/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave1/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave1/layout.inc"
+	.include "data/layouts/SecretBase_Tree1/layout.inc"
+	.include "data/layouts/SecretBase_Shrub1/layout.inc"
+	.include "data/layouts/SecretBase_RedCave2/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave2/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave2/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave2/layout.inc"
+	.include "data/layouts/SecretBase_Tree2/layout.inc"
+	.include "data/layouts/SecretBase_Shrub2/layout.inc"
+	.include "data/layouts/SecretBase_RedCave3/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave3/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave3/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave3/layout.inc"
+	.include "data/layouts/SecretBase_Tree3/layout.inc"
+	.include "data/layouts/SecretBase_Shrub3/layout.inc"
+	.include "data/layouts/SecretBase_RedCave4/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave4/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave4/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave4/layout.inc"
+	.include "data/layouts/SecretBase_Tree4/layout.inc"
+	.include "data/layouts/SecretBase_Shrub4/layout.inc"
+	.include "data/layouts/SingleBattleColosseum/layout.inc"
+	.include "data/layouts/TradeCenter/layout.inc"
+	.include "data/layouts/RecordCorner/layout.inc"
+	.include "data/layouts/DoubleBattleColosseum/layout.inc"
+	.include "data/layouts/LinkContestRoom1/layout.inc"
+	.include "data/layouts/UnknownMap_25_29/layout.inc"
+	.include "data/layouts/UnknownMap_25_30/layout.inc"
+	.include "data/layouts/UnknownMap_25_31/layout.inc"
+	.include "data/layouts/UnknownMap_25_32/layout.inc"
+	.include "data/layouts/UnknownMap_25_33/layout.inc"
+	.include "data/layouts/UnknownMap_25_34/layout.inc"
+	.include "data/layouts/LinkContestRoom2/layout.inc"
+	.include "data/layouts/LinkContestRoom3/layout.inc"
+	.include "data/layouts/LinkContestRoom4/layout.inc"
+	.include "data/layouts/LinkContestRoom5/layout.inc"
+	.include "data/layouts/LinkContestRoom6/layout.inc"
+	.include "data/layouts/InsideOfTruck/layout.inc"
+	.include "data/layouts/SafariZone_Northwest/layout.inc"
+	.include "data/layouts/SafariZone_North/layout.inc"
+	.include "data/layouts/SafariZone_Southwest/layout.inc"
+	.include "data/layouts/SafariZone_South/layout.inc"
+	.include "data/layouts/UnknownMap_08447028/layout.inc"
+	.include "data/layouts/Route109_SeashoreHouse/layout.inc"
+	.include "data/layouts/Route110_TrickHouseEntrance/layout.inc"
+	.include "data/layouts/Route110_TrickHouseEnd/layout.inc"
+	.include "data/layouts/Route110_TrickHouseCorridor/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle1/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle2/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle3/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle4/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle5/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle6/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle7/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle8/layout.inc"
+	.include "data/layouts/FortreeCity_DecorationShop/layout.inc"
+	.include "data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc"
+	.include "data/layouts/Route130/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleTowerLobby/layout.inc"
+	.include "data/layouts/BattleFrontier_OutsideWest/layout.inc"
+	.include "data/layouts/BattleElevator/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc"
+	.include "data/layouts/RustboroCity_DevonCorp_3F/layout.inc"
+	.include "data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc"
+	.include "data/layouts/Route119_WeatherInstitute_1F/layout.inc"
+	.include "data/layouts/Route119_WeatherInstitute_2F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc"
+	.include "data/layouts/Underwater1/layout.inc"
+	.include "data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc"
+	.include "data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc"
+	.include "data/layouts/SSTidalCorridor/layout.inc"
+	.include "data/layouts/SSTidalLowerDeck/layout.inc"
+	.include "data/layouts/SSTidalRooms/layout.inc"
+	.include "data/layouts/IslandCave/layout.inc"
+	.include "data/layouts/AncientTomb/layout.inc"
+	.include "data/layouts/Underwater_Route134/layout.inc"
+	.include "data/layouts/Underwater_SealedChamber/layout.inc"
+	.include "data/layouts/SealedChamber_OuterRoom/layout.inc"
+	.include "data/layouts/VictoryRoad_B1F/layout.inc"
+	.include "data/layouts/VictoryRoad_B2F/layout.inc"
+	.include "data/layouts/Route104_Prototype/layout.inc"
+	.include "data/layouts/GraniteCave_StevensRoom/layout.inc"
+	.include "data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc"
+	.include "data/layouts/SouthernIsland_Exterior/layout.inc"
+	.include "data/layouts/SouthernIsland_Interior/layout.inc"
+	.include "data/layouts/JaggedPass/layout.inc"
+	.include "data/layouts/FieryPath/layout.inc"
+	.include "data/layouts/RustboroCity_Flat2_1F/layout.inc"
+	.include "data/layouts/RustboroCity_Flat2_2F/layout.inc"
+	.include "data/layouts/RustboroCity_Flat2_3F/layout.inc"
+	.include "data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc"
+	.include "data/layouts/EverGrandeCity_HallOfFame/layout.inc"
+	.include "data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc"
+	.include "data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc"
+	.include "data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc"
+	.include "data/layouts/MtPyre_Exterior/layout.inc"
+	.include "data/layouts/MtPyre_Summit/layout.inc"
+	.include "data/layouts/SealedChamber_InnerRoom/layout.inc"
+	.include "data/layouts/MossdeepCity_GameCorner_1F/layout.inc"
+	.include "data/layouts/MossdeepCity_GameCorner_B1F/layout.inc"
+	.include "data/layouts/SootopolisCity_House1/layout.inc"
+	.include "data/layouts/SootopolisCity_House2/layout.inc"
+	.include "data/layouts/SootopolisCity_House3/layout.inc"
+	.include "data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc"
+	.include "data/layouts/ScorchedSlab/layout.inc"
+	.include "data/layouts/UnknownMap_0845A394/layout.inc"
+	.include "data/layouts/RustboroCity_Flat1_1F/layout.inc"
+	.include "data/layouts/RustboroCity_Flat1_2F/layout.inc"
+	.include "data/layouts/EverGrandeCity_Hall4/layout.inc"
+	.include "data/layouts/AquaHideout_UnusedRubyMap1/layout.inc"
+	.include "data/layouts/AquaHideout_UnusedRubyMap2/layout.inc"
+	.include "data/layouts/AquaHideout_UnusedRubyMap3/layout.inc"
+	.include "data/layouts/UnknownMap_0845D470/layout.inc"
+	.include "data/layouts/SkyPillar_Entrance/layout.inc"
+	.include "data/layouts/SkyPillar_Outside/layout.inc"
+	.include "data/layouts/SkyPillar_1F/layout.inc"
+	.include "data/layouts/SkyPillar_2F/layout.inc"
+	.include "data/layouts/SkyPillar_3F/layout.inc"
+	.include "data/layouts/SkyPillar_4F/layout.inc"
+	.include "data/layouts/UnknownMap_0845ECB4/layout.inc"
+	.include "data/layouts/MossdeepCity_StevensHouse/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideIceRoom/layout.inc"
+	.include "data/layouts/SafariZone_RestHouse/layout.inc"
+	.include "data/layouts/SkyPillar_5F/layout.inc"
+	.include "data/layouts/SkyPillar_Top/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleDomeLobby/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc"
+	.include "data/layouts/MagmaHideout_1F/layout.inc"
+	.include "data/layouts/MagmaHideout_2F_1R/layout.inc"
+	.include "data/layouts/MagmaHideout_2F_2R/layout.inc"
+	.include "data/layouts/MagmaHideout_3F_1R/layout.inc"
+	.include "data/layouts/MagmaHideout_3F_2R/layout.inc"
+	.include "data/layouts/MagmaHideout_4F/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc"
+	.include "data/layouts/BattleFrontier_OutsideEast/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePikeLobby/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleArenaLobby/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc"
+	.include "data/layouts/UnknownMap_08469200/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc"
+	.include "data/layouts/UnknownMap_084693AC/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc"
+	.include "data/layouts/BattlePyramidSquare01/layout.inc"
+	.include "data/layouts/BattlePyramidSquare02/layout.inc"
+	.include "data/layouts/BattlePyramidSquare03/layout.inc"
+	.include "data/layouts/BattlePyramidSquare04/layout.inc"
+	.include "data/layouts/BattlePyramidSquare05/layout.inc"
+	.include "data/layouts/BattlePyramidSquare06/layout.inc"
+	.include "data/layouts/BattlePyramidSquare07/layout.inc"
+	.include "data/layouts/BattlePyramidSquare08/layout.inc"
+	.include "data/layouts/BattlePyramidSquare09/layout.inc"
+	.include "data/layouts/BattlePyramidSquare10/layout.inc"
+	.include "data/layouts/BattlePyramidSquare11/layout.inc"
+	.include "data/layouts/BattlePyramidSquare12/layout.inc"
+	.include "data/layouts/BattlePyramidSquare13/layout.inc"
+	.include "data/layouts/BattlePyramidSquare14/layout.inc"
+	.include "data/layouts/BattlePyramidSquare15/layout.inc"
+	.include "data/layouts/BattlePyramidSquare16/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePyramidTop/layout.inc"
+	.include "data/layouts/MagmaHideout_3F_3R/layout.inc"
+	.include "data/layouts/MagmaHideout_2F_3R/layout.inc"
+	.include "data/layouts/MirageTower_1F/layout.inc"
+	.include "data/layouts/MirageTower_2F/layout.inc"
+	.include "data/layouts/MirageTower_3F/layout.inc"
+	.include "data/layouts/BattleTentLobby/layout.inc"
+	.include "data/layouts/BattleTentCorridor/layout.inc"
+	.include "data/layouts/BattleTentBattleRoom/layout.inc"
+	.include "data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc"
+	.include "data/layouts/MirageTower_4F/layout.inc"
+	.include "data/layouts/DesertUnderpass/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc"
+	.include "data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc"
+	.include "data/layouts/UnknownMap_08470BD8/layout.inc"
+	.include "data/layouts/UnionRoom/layout.inc"
+	.include "data/layouts/SafariZone_Northeast/layout.inc"
+	.include "data/layouts/SafariZone_Southeast/layout.inc"
+	.include "data/layouts/BattleFrontier_RankingHall/layout.inc"
+	.include "data/layouts/BattleFrontier_Lounge1/layout.inc"
+	.include "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc"
+	.include "data/layouts/BattleFrontier_ReceptionGate/layout.inc"
+	.include "data/layouts/ArtisanCave_B1F/layout.inc"
+	.include "data/layouts/ArtisanCave_1F/layout.inc"
+	.include "data/layouts/FarawayIsland_Entrance/layout.inc"
+	.include "data/layouts/FarawayIsland_Interior/layout.inc"
+	.include "data/layouts/BirthIsland_Exterior/layout.inc"
+	.include "data/layouts/IslandHarbor/layout.inc"
+	.include "data/layouts/Underwater_MarineCave/layout.inc"
+	.include "data/layouts/MarineCave_Entrance/layout.inc"
+	.include "data/layouts/TerraCave_Entrance/layout.inc"
+	.include "data/layouts/TerraCave_End/layout.inc"
+	.include "data/layouts/Underwater6/layout.inc"
+	.include "data/layouts/Underwater7/layout.inc"
+	.include "data/layouts/Underwater5/layout.inc"
+	.include "data/layouts/MarineCave_End/layout.inc"
+	.include "data/layouts/TrainerHill_Entrance/layout.inc"
+	.include "data/layouts/TrainerHill_1F/layout.inc"
+	.include "data/layouts/TrainerHill_2F/layout.inc"
+	.include "data/layouts/TrainerHill_3F/layout.inc"
+	.include "data/layouts/TrainerHill_4F/layout.inc"
+	.include "data/layouts/TrainerHill_Roof/layout.inc"
+	.include "data/layouts/AlteringCave/layout.inc"
+	.include "data/layouts/NavelRock_Exterior/layout.inc"
+	.include "data/layouts/NavelRock_Entrance/layout.inc"
+	.include "data/layouts/NavelRock_Top/layout.inc"
+	.include "data/layouts/NavelRock_Bottom/layout.inc"
+	.include "data/layouts/NavelRock_LadderRoom1/layout.inc"
+	.include "data/layouts/NavelRock_LadderRoom2/layout.inc"
+	.include "data/layouts/NavelRock_B1F/layout.inc"
+	.include "data/layouts/NavelRock_Fork/layout.inc"
+	.include "data/layouts/BattleFrontier_Lounge2/layout.inc"
+	.include "data/layouts/BattleFrontier_ScottsHouse/layout.inc"
+	.include "data/layouts/MeteorFalls_StevensCave/layout.inc"
+	.include "data/layouts/UnknownMap_08480DAC/layout.inc"
+	.include "data/layouts/UnknownMap_08480F54/layout.inc"
+	.include "data/layouts/UnknownMap_084810FC/layout.inc"
+	.include "data/layouts/UnknownMap_084812A4/layout.inc"
+	.include "data/layouts/UnknownMap_0848144C/layout.inc"
+	.include "data/layouts/UnknownMap_084815F4/layout.inc"
+	.include "data/layouts/UnknownMap_08481B24/layout.inc"
+	.include "data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc"
+	.include "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc"
+	.include "data/layouts/UnknownMap_08481DBC/layout.inc"
diff --git a/data/maps/AbandonedShip_CaptainsOffice/border.bin b/data/layouts/AbandonedShip_CaptainsOffice/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/border.bin
+++ b/data/layouts/AbandonedShip_CaptainsOffice/border.bin
diff --git a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc
new file mode 100644
index 000000000..d9e122ef2
--- /dev/null
+++ b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_CaptainsOffice_MapBorder::
+	.incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin"
+
+AbandonedShip_CaptainsOffice_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin"
+
+	.align 2
+AbandonedShip_CaptainsOffice_Layout::
+	.4byte 0x9
+	.4byte 0x7
+	.4byte AbandonedShip_CaptainsOffice_MapBorder
+	.4byte AbandonedShip_CaptainsOffice_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.bin b/data/layouts/AbandonedShip_CaptainsOffice/map.bin
index c9097fa63..c9097fa63 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/map.bin
+++ b/data/layouts/AbandonedShip_CaptainsOffice/map.bin
diff --git a/data/maps/AbandonedShip_Corridors_1F/border.bin b/data/layouts/AbandonedShip_Corridors_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Corridors_1F/border.bin
+++ b/data/layouts/AbandonedShip_Corridors_1F/border.bin
diff --git a/data/layouts/AbandonedShip_Corridors_1F/layout.inc b/data/layouts/AbandonedShip_Corridors_1F/layout.inc
new file mode 100644
index 000000000..d5fd22578
--- /dev/null
+++ b/data/layouts/AbandonedShip_Corridors_1F/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Corridors_1F_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin"
+
+AbandonedShip_Corridors_1F_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin"
+
+	.align 2
+AbandonedShip_Corridors_1F_Layout::
+	.4byte 0x12
+	.4byte 0xc
+	.4byte AbandonedShip_Corridors_1F_MapBorder
+	.4byte AbandonedShip_Corridors_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+
diff --git a/data/maps/AbandonedShip_Corridors_1F/map.bin b/data/layouts/AbandonedShip_Corridors_1F/map.bin
index 5ef5ca949..5ef5ca949 100644
--- a/data/maps/AbandonedShip_Corridors_1F/map.bin
+++ b/data/layouts/AbandonedShip_Corridors_1F/map.bin
diff --git a/data/maps/AbandonedShip_Corridors_B1F/border.bin b/data/layouts/AbandonedShip_Corridors_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/border.bin
+++ b/data/layouts/AbandonedShip_Corridors_B1F/border.bin
diff --git a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc
new file mode 100644
index 000000000..7299aa6f8
--- /dev/null
+++ b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Corridors_B1F_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin"
+
+AbandonedShip_Corridors_B1F_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Corridors_B1F_Layout::
+	.4byte 0xd
+	.4byte 0xa
+	.4byte AbandonedShip_Corridors_B1F_MapBorder
+	.4byte AbandonedShip_Corridors_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+
diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.bin b/data/layouts/AbandonedShip_Corridors_B1F/map.bin
index 24b1a7b61..24b1a7b61 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/map.bin
+++ b/data/layouts/AbandonedShip_Corridors_B1F/map.bin
diff --git a/data/maps/AbandonedShip_Deck/border.bin b/data/layouts/AbandonedShip_Deck/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/AbandonedShip_Deck/border.bin
+++ b/data/layouts/AbandonedShip_Deck/border.bin
diff --git a/data/layouts/AbandonedShip_Deck/layout.inc b/data/layouts/AbandonedShip_Deck/layout.inc
new file mode 100644
index 000000000..7f0baaaec
--- /dev/null
+++ b/data/layouts/AbandonedShip_Deck/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Deck_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Deck/border.bin"
+
+AbandonedShip_Deck_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Deck/map.bin"
+
+	.align 2
+AbandonedShip_Deck_Layout::
+	.4byte 0x17
+	.4byte 0x15
+	.4byte AbandonedShip_Deck_MapBorder
+	.4byte AbandonedShip_Deck_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/AbandonedShip_Deck/map.bin b/data/layouts/AbandonedShip_Deck/map.bin
index 67cdde3d7..67cdde3d7 100644
--- a/data/maps/AbandonedShip_Deck/map.bin
+++ b/data/layouts/AbandonedShip_Deck/map.bin
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin b/data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin
+++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin
diff --git a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc
new file mode 100644
index 000000000..0ee7aa755
--- /dev/null
+++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_HiddenFloorCorridors_MapBorder::
+	.incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin"
+
+AbandonedShip_HiddenFloorCorridors_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin"
+
+	.align 2
+AbandonedShip_HiddenFloorCorridors_Layout::
+	.4byte 0xd
+	.4byte 0xb
+	.4byte AbandonedShip_HiddenFloorCorridors_MapBorder
+	.4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin b/data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin
index a4637ccbe..a4637ccbe 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin
+++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin b/data/layouts/AbandonedShip_HiddenFloorRooms/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin
+++ b/data/layouts/AbandonedShip_HiddenFloorRooms/border.bin
diff --git a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc
new file mode 100644
index 000000000..bf2f758d7
--- /dev/null
+++ b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_HiddenFloorRooms_MapBorder::
+	.incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin"
+
+AbandonedShip_HiddenFloorRooms_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin"
+
+	.align 2
+AbandonedShip_HiddenFloorRooms_Layout::
+	.4byte 0x2c
+	.4byte 0xf
+	.4byte AbandonedShip_HiddenFloorRooms_MapBorder
+	.4byte AbandonedShip_HiddenFloorRooms_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin b/data/layouts/AbandonedShip_HiddenFloorRooms/map.bin
index b63eeabe6..b63eeabe6 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin
+++ b/data/layouts/AbandonedShip_HiddenFloorRooms/map.bin
diff --git a/data/maps/AbandonedShip_Room_B1F/border.bin b/data/layouts/AbandonedShip_Room_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Room_B1F/border.bin
+++ b/data/layouts/AbandonedShip_Room_B1F/border.bin
diff --git a/data/layouts/AbandonedShip_Room_B1F/layout.inc b/data/layouts/AbandonedShip_Room_B1F/layout.inc
new file mode 100644
index 000000000..fdd5b395d
--- /dev/null
+++ b/data/layouts/AbandonedShip_Room_B1F/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Room_B1F_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Room_B1F/border.bin"
+
+AbandonedShip_Room_B1F_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Room_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Room_B1F_Layout::
+	.4byte 0x9
+	.4byte 0x8
+	.4byte AbandonedShip_Room_B1F_MapBorder
+	.4byte AbandonedShip_Room_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+
diff --git a/data/maps/AbandonedShip_Room_B1F/map.bin b/data/layouts/AbandonedShip_Room_B1F/map.bin
index cb8393eb2..cb8393eb2 100644
--- a/data/maps/AbandonedShip_Room_B1F/map.bin
+++ b/data/layouts/AbandonedShip_Room_B1F/map.bin
diff --git a/data/maps/AbandonedShip_Rooms2_1F/border.bin b/data/layouts/AbandonedShip_Rooms2_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/border.bin
+++ b/data/layouts/AbandonedShip_Rooms2_1F/border.bin
diff --git a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc
new file mode 100644
index 000000000..d15652cc0
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Rooms2_1F_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin"
+
+AbandonedShip_Rooms2_1F_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms2_1F_Layout::
+	.4byte 0x9
+	.4byte 0x11
+	.4byte AbandonedShip_Rooms2_1F_MapBorder
+	.4byte AbandonedShip_Rooms2_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+
diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.bin b/data/layouts/AbandonedShip_Rooms2_1F/map.bin
index c897ce8a0..c897ce8a0 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/map.bin
+++ b/data/layouts/AbandonedShip_Rooms2_1F/map.bin
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/border.bin b/data/layouts/AbandonedShip_Rooms2_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/border.bin
+++ b/data/layouts/AbandonedShip_Rooms2_B1F/border.bin
diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc
new file mode 100644
index 000000000..d99e43f47
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Rooms2_B1F_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin"
+
+AbandonedShip_Rooms2_B1F_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms2_B1F_Layout::
+	.4byte 0x12
+	.4byte 0x8
+	.4byte AbandonedShip_Rooms2_B1F_MapBorder
+	.4byte AbandonedShip_Rooms2_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.bin b/data/layouts/AbandonedShip_Rooms2_B1F/map.bin
index 7865bb69d..7865bb69d 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/map.bin
+++ b/data/layouts/AbandonedShip_Rooms2_B1F/map.bin
diff --git a/data/maps/AbandonedShip_Rooms_1F/border.bin b/data/layouts/AbandonedShip_Rooms_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Rooms_1F/border.bin
+++ b/data/layouts/AbandonedShip_Rooms_1F/border.bin
diff --git a/data/layouts/AbandonedShip_Rooms_1F/layout.inc b/data/layouts/AbandonedShip_Rooms_1F/layout.inc
new file mode 100644
index 000000000..63e4a716a
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms_1F/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Rooms_1F_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin"
+
+AbandonedShip_Rooms_1F_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms_1F_Layout::
+	.4byte 0x12
+	.4byte 0x11
+	.4byte AbandonedShip_Rooms_1F_MapBorder
+	.4byte AbandonedShip_Rooms_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+
diff --git a/data/maps/AbandonedShip_Rooms_1F/map.bin b/data/layouts/AbandonedShip_Rooms_1F/map.bin
index 20529b3df..20529b3df 100644
--- a/data/maps/AbandonedShip_Rooms_1F/map.bin
+++ b/data/layouts/AbandonedShip_Rooms_1F/map.bin
diff --git a/data/maps/AbandonedShip_Rooms_B1F/border.bin b/data/layouts/AbandonedShip_Rooms_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/border.bin
+++ b/data/layouts/AbandonedShip_Rooms_B1F/border.bin
diff --git a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc
new file mode 100644
index 000000000..ab688d668
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Rooms_B1F_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin"
+
+AbandonedShip_Rooms_B1F_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms_B1F_Layout::
+	.4byte 0x1b
+	.4byte 0x8
+	.4byte AbandonedShip_Rooms_B1F_MapBorder
+	.4byte AbandonedShip_Rooms_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+
diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.bin b/data/layouts/AbandonedShip_Rooms_B1F/map.bin
index b18509507..b18509507 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/map.bin
+++ b/data/layouts/AbandonedShip_Rooms_B1F/map.bin
diff --git a/data/maps/AbandonedShip_Underwater1/border.bin b/data/layouts/AbandonedShip_Underwater1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Underwater1/border.bin
+++ b/data/layouts/AbandonedShip_Underwater1/border.bin
diff --git a/data/layouts/AbandonedShip_Underwater1/layout.inc b/data/layouts/AbandonedShip_Underwater1/layout.inc
new file mode 100644
index 000000000..8fa1b1485
--- /dev/null
+++ b/data/layouts/AbandonedShip_Underwater1/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Underwater1_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Underwater1/border.bin"
+
+AbandonedShip_Underwater1_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Underwater1/map.bin"
+
+	.align 2
+AbandonedShip_Underwater1_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte AbandonedShip_Underwater1_MapBorder
+	.4byte AbandonedShip_Underwater1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+
diff --git a/data/maps/AbandonedShip_Underwater1/map.bin b/data/layouts/AbandonedShip_Underwater1/map.bin
index 2c73cfe86..2c73cfe86 100644
--- a/data/maps/AbandonedShip_Underwater1/map.bin
+++ b/data/layouts/AbandonedShip_Underwater1/map.bin
diff --git a/data/maps/AbandonedShip_Underwater2/border.bin b/data/layouts/AbandonedShip_Underwater2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Underwater2/border.bin
+++ b/data/layouts/AbandonedShip_Underwater2/border.bin
diff --git a/data/layouts/AbandonedShip_Underwater2/layout.inc b/data/layouts/AbandonedShip_Underwater2/layout.inc
new file mode 100644
index 000000000..feea82d16
--- /dev/null
+++ b/data/layouts/AbandonedShip_Underwater2/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Underwater2_MapBorder::
+	.incbin "data/layouts/AbandonedShip_Underwater2/border.bin"
+
+AbandonedShip_Underwater2_MapBlockdata::
+	.incbin "data/layouts/AbandonedShip_Underwater2/map.bin"
+
+	.align 2
+AbandonedShip_Underwater2_Layout::
+	.4byte 0x15
+	.4byte 0x7
+	.4byte AbandonedShip_Underwater2_MapBorder
+	.4byte AbandonedShip_Underwater2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+
diff --git a/data/maps/AbandonedShip_Underwater2/map.bin b/data/layouts/AbandonedShip_Underwater2/map.bin
index 9dbd5c71a..9dbd5c71a 100644
--- a/data/maps/AbandonedShip_Underwater2/map.bin
+++ b/data/layouts/AbandonedShip_Underwater2/map.bin
diff --git a/data/maps/AlteringCave/border.bin b/data/layouts/AlteringCave/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/AlteringCave/border.bin
+++ b/data/layouts/AlteringCave/border.bin
diff --git a/data/layouts/AlteringCave/layout.inc b/data/layouts/AlteringCave/layout.inc
new file mode 100644
index 000000000..9f03e7d87
--- /dev/null
+++ b/data/layouts/AlteringCave/layout.inc
@@ -0,0 +1,15 @@
+AlteringCave_MapBorder::
+	.incbin "data/layouts/AlteringCave/border.bin"
+
+AlteringCave_MapBlockdata::
+	.incbin "data/layouts/AlteringCave/map.bin"
+
+	.align 2
+AlteringCave_Layout::
+	.4byte 0x20
+	.4byte 0x18
+	.4byte AlteringCave_MapBorder
+	.4byte AlteringCave_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/AlteringCave/map.bin b/data/layouts/AlteringCave/map.bin
index 38bec91fa..38bec91fa 100644
--- a/data/maps/AlteringCave/map.bin
+++ b/data/layouts/AlteringCave/map.bin
diff --git a/data/maps/AncientTomb/border.bin b/data/layouts/AncientTomb/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/maps/AncientTomb/border.bin
+++ b/data/layouts/AncientTomb/border.bin
diff --git a/data/layouts/AncientTomb/layout.inc b/data/layouts/AncientTomb/layout.inc
new file mode 100644
index 000000000..ad173f936
--- /dev/null
+++ b/data/layouts/AncientTomb/layout.inc
@@ -0,0 +1,15 @@
+AncientTomb_MapBorder::
+	.incbin "data/layouts/AncientTomb/border.bin"
+
+AncientTomb_MapBlockdata::
+	.incbin "data/layouts/AncientTomb/map.bin"
+
+	.align 2
+AncientTomb_Layout::
+	.4byte 0x11
+	.4byte 0x21
+	.4byte AncientTomb_MapBorder
+	.4byte AncientTomb_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/AncientTomb/map.bin b/data/layouts/AncientTomb/map.bin
index 406cf7279..406cf7279 100644
--- a/data/maps/AncientTomb/map.bin
+++ b/data/layouts/AncientTomb/map.bin
diff --git a/data/maps/AquaHideout_1F/border.bin b/data/layouts/AquaHideout_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AquaHideout_1F/border.bin
+++ b/data/layouts/AquaHideout_1F/border.bin
diff --git a/data/layouts/AquaHideout_1F/layout.inc b/data/layouts/AquaHideout_1F/layout.inc
new file mode 100644
index 000000000..5508a668b
--- /dev/null
+++ b/data/layouts/AquaHideout_1F/layout.inc
@@ -0,0 +1,15 @@
+AquaHideout_1F_MapBorder::
+	.incbin "data/layouts/AquaHideout_1F/border.bin"
+
+AquaHideout_1F_MapBlockdata::
+	.incbin "data/layouts/AquaHideout_1F/map.bin"
+
+	.align 2
+AquaHideout_1F_Layout::
+	.4byte 0x1c
+	.4byte 0x1e
+	.4byte AquaHideout_1F_MapBorder
+	.4byte AquaHideout_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/AquaHideout_1F/map.bin b/data/layouts/AquaHideout_1F/map.bin
index 2330fe015..2330fe015 100644
--- a/data/maps/AquaHideout_1F/map.bin
+++ b/data/layouts/AquaHideout_1F/map.bin
diff --git a/data/maps/AquaHideout_B1F/border.bin b/data/layouts/AquaHideout_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AquaHideout_B1F/border.bin
+++ b/data/layouts/AquaHideout_B1F/border.bin
diff --git a/data/layouts/AquaHideout_B1F/layout.inc b/data/layouts/AquaHideout_B1F/layout.inc
new file mode 100644
index 000000000..0889e548a
--- /dev/null
+++ b/data/layouts/AquaHideout_B1F/layout.inc
@@ -0,0 +1,15 @@
+AquaHideout_B1F_MapBorder::
+	.incbin "data/layouts/AquaHideout_B1F/border.bin"
+
+AquaHideout_B1F_MapBlockdata::
+	.incbin "data/layouts/AquaHideout_B1F/map.bin"
+
+	.align 2
+AquaHideout_B1F_Layout::
+	.4byte 0x33
+	.4byte 0x18
+	.4byte AquaHideout_B1F_MapBorder
+	.4byte AquaHideout_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/AquaHideout_B1F/map.bin b/data/layouts/AquaHideout_B1F/map.bin
index 97efacec8..97efacec8 100644
--- a/data/maps/AquaHideout_B1F/map.bin
+++ b/data/layouts/AquaHideout_B1F/map.bin
diff --git a/data/maps/AquaHideout_B2F/border.bin b/data/layouts/AquaHideout_B2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AquaHideout_B2F/border.bin
+++ b/data/layouts/AquaHideout_B2F/border.bin
diff --git a/data/layouts/AquaHideout_B2F/layout.inc b/data/layouts/AquaHideout_B2F/layout.inc
new file mode 100644
index 000000000..9e335e5d9
--- /dev/null
+++ b/data/layouts/AquaHideout_B2F/layout.inc
@@ -0,0 +1,15 @@
+AquaHideout_B2F_MapBorder::
+	.incbin "data/layouts/AquaHideout_B2F/border.bin"
+
+AquaHideout_B2F_MapBlockdata::
+	.incbin "data/layouts/AquaHideout_B2F/map.bin"
+
+	.align 2
+AquaHideout_B2F_Layout::
+	.4byte 0x22
+	.4byte 0x18
+	.4byte AquaHideout_B2F_MapBorder
+	.4byte AquaHideout_B2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/AquaHideout_B2F/map.bin b/data/layouts/AquaHideout_B2F/map.bin
index 2e843a8e4..2e843a8e4 100644
--- a/data/maps/AquaHideout_B2F/map.bin
+++ b/data/layouts/AquaHideout_B2F/map.bin
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/border.bin b/data/layouts/AquaHideout_UnusedRubyMap1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AquaHideout_UnusedRubyMap1/border.bin
+++ b/data/layouts/AquaHideout_UnusedRubyMap1/border.bin
diff --git a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc
new file mode 100644
index 000000000..05862b275
--- /dev/null
+++ b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc
@@ -0,0 +1,15 @@
+AquaHideout_UnusedRubyMap1_MapBorder::
+	.incbin "data/layouts/AquaHideout_UnusedRubyMap1/border.bin"
+
+AquaHideout_UnusedRubyMap1_MapBlockdata::
+	.incbin "data/layouts/AquaHideout_UnusedRubyMap1/map.bin"
+
+	.align 2
+AquaHideout_UnusedRubyMap1_Layout::
+	.4byte 0x1c
+	.4byte 0x1e
+	.4byte AquaHideout_UnusedRubyMap1_MapBorder
+	.4byte AquaHideout_UnusedRubyMap1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.bin b/data/layouts/AquaHideout_UnusedRubyMap1/map.bin
index 52c2d57eb..52c2d57eb 100644
--- a/data/maps/AquaHideout_UnusedRubyMap1/map.bin
+++ b/data/layouts/AquaHideout_UnusedRubyMap1/map.bin
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/border.bin b/data/layouts/AquaHideout_UnusedRubyMap2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AquaHideout_UnusedRubyMap2/border.bin
+++ b/data/layouts/AquaHideout_UnusedRubyMap2/border.bin
diff --git a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc
new file mode 100644
index 000000000..e9e08ab97
--- /dev/null
+++ b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc
@@ -0,0 +1,15 @@
+AquaHideout_UnusedRubyMap2_MapBorder::
+	.incbin "data/layouts/AquaHideout_UnusedRubyMap2/border.bin"
+
+AquaHideout_UnusedRubyMap2_MapBlockdata::
+	.incbin "data/layouts/AquaHideout_UnusedRubyMap2/map.bin"
+
+	.align 2
+AquaHideout_UnusedRubyMap2_Layout::
+	.4byte 0x3e
+	.4byte 0x18
+	.4byte AquaHideout_UnusedRubyMap2_MapBorder
+	.4byte AquaHideout_UnusedRubyMap2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.bin b/data/layouts/AquaHideout_UnusedRubyMap2/map.bin
index 1406dde5d..1406dde5d 100644
--- a/data/maps/AquaHideout_UnusedRubyMap2/map.bin
+++ b/data/layouts/AquaHideout_UnusedRubyMap2/map.bin
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/border.bin b/data/layouts/AquaHideout_UnusedRubyMap3/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AquaHideout_UnusedRubyMap3/border.bin
+++ b/data/layouts/AquaHideout_UnusedRubyMap3/border.bin
diff --git a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc
new file mode 100644
index 000000000..44b35666f
--- /dev/null
+++ b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc
@@ -0,0 +1,15 @@
+AquaHideout_UnusedRubyMap3_MapBorder::
+	.incbin "data/layouts/AquaHideout_UnusedRubyMap3/border.bin"
+
+AquaHideout_UnusedRubyMap3_MapBlockdata::
+	.incbin "data/layouts/AquaHideout_UnusedRubyMap3/map.bin"
+
+	.align 2
+AquaHideout_UnusedRubyMap3_Layout::
+	.4byte 0x22
+	.4byte 0x18
+	.4byte AquaHideout_UnusedRubyMap3_MapBorder
+	.4byte AquaHideout_UnusedRubyMap3_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.bin b/data/layouts/AquaHideout_UnusedRubyMap3/map.bin
index 68afb0063..68afb0063 100644
--- a/data/maps/AquaHideout_UnusedRubyMap3/map.bin
+++ b/data/layouts/AquaHideout_UnusedRubyMap3/map.bin
diff --git a/data/maps/ArtisanCave_1F/border.bin b/data/layouts/ArtisanCave_1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ArtisanCave_1F/border.bin
+++ b/data/layouts/ArtisanCave_1F/border.bin
diff --git a/data/layouts/ArtisanCave_1F/layout.inc b/data/layouts/ArtisanCave_1F/layout.inc
new file mode 100644
index 000000000..b32eef422
--- /dev/null
+++ b/data/layouts/ArtisanCave_1F/layout.inc
@@ -0,0 +1,15 @@
+ArtisanCave_1F_MapBorder::
+	.incbin "data/layouts/ArtisanCave_1F/border.bin"
+
+ArtisanCave_1F_MapBlockdata::
+	.incbin "data/layouts/ArtisanCave_1F/map.bin"
+
+	.align 2
+ArtisanCave_1F_Layout::
+	.4byte 0x15
+	.4byte 0x16
+	.4byte ArtisanCave_1F_MapBorder
+	.4byte ArtisanCave_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/ArtisanCave_1F/map.bin b/data/layouts/ArtisanCave_1F/map.bin
index 2009f24f4..2009f24f4 100644
--- a/data/maps/ArtisanCave_1F/map.bin
+++ b/data/layouts/ArtisanCave_1F/map.bin
diff --git a/data/maps/ArtisanCave_B1F/border.bin b/data/layouts/ArtisanCave_B1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ArtisanCave_B1F/border.bin
+++ b/data/layouts/ArtisanCave_B1F/border.bin
diff --git a/data/layouts/ArtisanCave_B1F/layout.inc b/data/layouts/ArtisanCave_B1F/layout.inc
new file mode 100644
index 000000000..2640303e3
--- /dev/null
+++ b/data/layouts/ArtisanCave_B1F/layout.inc
@@ -0,0 +1,15 @@
+ArtisanCave_B1F_MapBorder::
+	.incbin "data/layouts/ArtisanCave_B1F/border.bin"
+
+ArtisanCave_B1F_MapBlockdata::
+	.incbin "data/layouts/ArtisanCave_B1F/map.bin"
+
+	.align 2
+ArtisanCave_B1F_Layout::
+	.4byte 0x2e
+	.4byte 0x36
+	.4byte ArtisanCave_B1F_MapBorder
+	.4byte ArtisanCave_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/ArtisanCave_B1F/map.bin b/data/layouts/ArtisanCave_B1F/map.bin
index c5ce45c52..c5ce45c52 100644
--- a/data/maps/ArtisanCave_B1F/map.bin
+++ b/data/layouts/ArtisanCave_B1F/map.bin
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin b/data/layouts/BattleElevator/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin
+++ b/data/layouts/BattleElevator/border.bin
diff --git a/data/layouts/BattleElevator/layout.inc b/data/layouts/BattleElevator/layout.inc
new file mode 100644
index 000000000..374af9ffa
--- /dev/null
+++ b/data/layouts/BattleElevator/layout.inc
@@ -0,0 +1,15 @@
+BattleElevator_MapBorder::
+	.incbin "data/layouts/BattleElevator/border.bin"
+
+BattleElevator_MapBlockdata::
+	.incbin "data/layouts/BattleElevator/map.bin"
+
+	.align 2
+BattleElevator_Layout::
+	.4byte 0x5
+	.4byte 0x7
+	.4byte BattleElevator_MapBorder
+	.4byte BattleElevator_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFrontier
+
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.bin b/data/layouts/BattleElevator/map.bin
index 16dfe34ab..16dfe34ab 100644
--- a/data/maps/BattleFrontier_BattleTowerElevator/map.bin
+++ b/data/layouts/BattleElevator/map.bin
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/border.bin b/data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleArenaCorridor/border.bin
+++ b/data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin
diff --git a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc
new file mode 100644
index 000000000..89f799d84
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleArenaBattleRoom_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin"
+
+BattleFrontier_BattleArenaBattleRoom_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin"
+
+	.align 2
+BattleFrontier_BattleArenaBattleRoom_Layout::
+	.4byte 0x10
+	.4byte 0xb
+	.4byte BattleFrontier_BattleArenaBattleRoom_MapBorder
+	.4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleArena
+
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin
index 526de2248..526de2248 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin
+++ b/data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/border.bin b/data/layouts/BattleFrontier_BattleArenaCorridor/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/border.bin
+++ b/data/layouts/BattleFrontier_BattleArenaCorridor/border.bin
diff --git a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc
new file mode 100644
index 000000000..8961ed778
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleArenaCorridor_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin"
+
+BattleFrontier_BattleArenaCorridor_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin"
+
+	.align 2
+BattleFrontier_BattleArenaCorridor_Layout::
+	.4byte 0x12
+	.4byte 0xe
+	.4byte BattleFrontier_BattleArenaCorridor_MapBorder
+	.4byte BattleFrontier_BattleArenaCorridor_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleArena
+
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.bin b/data/layouts/BattleFrontier_BattleArenaCorridor/map.bin
index 1b124b610..1b124b610 100644
--- a/data/maps/BattleFrontier_BattleArenaCorridor/map.bin
+++ b/data/layouts/BattleFrontier_BattleArenaCorridor/map.bin
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleArenaLobby/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin
+++ b/data/layouts/BattleFrontier_BattleArenaLobby/border.bin
diff --git a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc
new file mode 100644
index 000000000..305fcc0d9
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleArenaLobby_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleArenaLobby/border.bin"
+
+BattleFrontier_BattleArenaLobby_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleArenaLobby/map.bin"
+
+	.align 2
+BattleFrontier_BattleArenaLobby_Layout::
+	.4byte 0x10
+	.4byte 0xd
+	.4byte BattleFrontier_BattleArenaLobby_MapBorder
+	.4byte BattleFrontier_BattleArenaLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleArena
+
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.bin b/data/layouts/BattleFrontier_BattleArenaLobby/map.bin
index 2792d7979..2792d7979 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/map.bin
+++ b/data/layouts/BattleFrontier_BattleArenaLobby/map.bin
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/border.bin b/data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleDomeCorridor/border.bin
+++ b/data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin
diff --git a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc
new file mode 100644
index 000000000..a4991ae0c
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomeBattleRoom_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin"
+
+BattleFrontier_BattleDomeBattleRoom_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin"
+
+	.align 2
+BattleFrontier_BattleDomeBattleRoom_Layout::
+	.4byte 0x14
+	.4byte 0xa
+	.4byte BattleFrontier_BattleDomeBattleRoom_MapBorder
+	.4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleDome
+
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin
index ffb450f3c..ffb450f3c 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin
+++ b/data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/border.bin b/data/layouts/BattleFrontier_BattleDomeCorridor/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/border.bin
+++ b/data/layouts/BattleFrontier_BattleDomeCorridor/border.bin
diff --git a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc
new file mode 100644
index 000000000..7f3c93b82
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomeCorridor_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin"
+
+BattleFrontier_BattleDomeCorridor_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin"
+
+	.align 2
+BattleFrontier_BattleDomeCorridor_Layout::
+	.4byte 0x30
+	.4byte 0x7
+	.4byte BattleFrontier_BattleDomeCorridor_MapBorder
+	.4byte BattleFrontier_BattleDomeCorridor_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleDome
+
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.bin b/data/layouts/BattleFrontier_BattleDomeCorridor/map.bin
index 2a9c49675..2a9c49675 100644
--- a/data/maps/BattleFrontier_BattleDomeCorridor/map.bin
+++ b/data/layouts/BattleFrontier_BattleDomeCorridor/map.bin
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleDomeLobby/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin
+++ b/data/layouts/BattleFrontier_BattleDomeLobby/border.bin
diff --git a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc
new file mode 100644
index 000000000..2553e7098
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomeLobby_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleDomeLobby/border.bin"
+
+BattleFrontier_BattleDomeLobby_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleDomeLobby/map.bin"
+
+	.align 2
+BattleFrontier_BattleDomeLobby_Layout::
+	.4byte 0x17
+	.4byte 0x11
+	.4byte BattleFrontier_BattleDomeLobby_MapBorder
+	.4byte BattleFrontier_BattleDomeLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleDome
+
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.bin b/data/layouts/BattleFrontier_BattleDomeLobby/map.bin
index 655c6a39c..655c6a39c 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/map.bin
+++ b/data/layouts/BattleFrontier_BattleDomeLobby/map.bin
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin
+++ b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin
diff --git a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc
new file mode 100644
index 000000000..8c0fe2ce5
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomePreBattleRoom_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin"
+
+BattleFrontier_BattleDomePreBattleRoom_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin"
+
+	.align 2
+BattleFrontier_BattleDomePreBattleRoom_Layout::
+	.4byte 0x9
+	.4byte 0x8
+	.4byte BattleFrontier_BattleDomePreBattleRoom_MapBorder
+	.4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleDome
+
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin
index 49f40213a..49f40213a 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin
+++ b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/border.bin b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleFactoryLobby/border.bin
+++ b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin
diff --git a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc
new file mode 100644
index 000000000..21ba6a015
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleFactoryBattleRoom_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin"
+
+BattleFrontier_BattleFactoryBattleRoom_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin"
+
+	.align 2
+BattleFrontier_BattleFactoryBattleRoom_Layout::
+	.4byte 0xd
+	.4byte 0xc
+	.4byte BattleFrontier_BattleFactoryBattleRoom_MapBorder
+	.4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFactory
+
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin
index feffbf038..feffbf038 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin
+++ b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleFactoryLobby/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin
+++ b/data/layouts/BattleFrontier_BattleFactoryLobby/border.bin
diff --git a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc
new file mode 100644
index 000000000..cc0a33611
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleFactoryLobby_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin"
+
+BattleFrontier_BattleFactoryLobby_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin"
+
+	.align 2
+BattleFrontier_BattleFactoryLobby_Layout::
+	.4byte 0x13
+	.4byte 0xc
+	.4byte BattleFrontier_BattleFactoryLobby_MapBorder
+	.4byte BattleFrontier_BattleFactoryLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFactory
+
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.bin b/data/layouts/BattleFrontier_BattleFactoryLobby/map.bin
index 66037e302..66037e302 100644
--- a/data/maps/BattleFrontier_BattleFactoryLobby/map.bin
+++ b/data/layouts/BattleFrontier_BattleFactoryLobby/map.bin
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/border.bin b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/border.bin
+++ b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin
diff --git a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc
new file mode 100644
index 000000000..fc4fc49bc
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleFactoryPreBattleRoom_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin"
+
+BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin"
+
+	.align 2
+BattleFrontier_BattleFactoryPreBattleRoom_Layout::
+	.4byte 0x11
+	.4byte 0xe
+	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBorder
+	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFactory
+
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin
index 15e97cb30..15e97cb30 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin
+++ b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin
index 9afd13cdc..9afd13cdc 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin
+++ b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc
new file mode 100644
index 000000000..3d9acc3c4
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePalaceBattleRoom_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin"
+
+BattleFrontier_BattlePalaceBattleRoom_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin"
+
+	.align 2
+BattleFrontier_BattlePalaceBattleRoom_Layout::
+	.4byte 0xf
+	.4byte 0xa
+	.4byte BattleFrontier_BattlePalaceBattleRoom_MapBorder
+	.4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_BattlePalace
+
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin
index 58d0a581f..58d0a581f 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin
+++ b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/border.bin b/data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin
index 9afd13cdc..9afd13cdc 100644
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/border.bin
+++ b/data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc
new file mode 100644
index 000000000..2d16216c5
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePalaceCorridor_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin"
+
+BattleFrontier_BattlePalaceCorridor_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin"
+
+	.align 2
+BattleFrontier_BattlePalaceCorridor_Layout::
+	.4byte 0x11
+	.4byte 0xe
+	.4byte BattleFrontier_BattlePalaceCorridor_MapBorder
+	.4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_BattlePalace
+
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.bin b/data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin
index f2bc6aca4..f2bc6aca4 100644
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/map.bin
+++ b/data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/border.bin b/data/layouts/BattleFrontier_BattlePalaceLobby/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/border.bin
+++ b/data/layouts/BattleFrontier_BattlePalaceLobby/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc
new file mode 100644
index 000000000..f9a1dad7b
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePalaceLobby_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin"
+
+BattleFrontier_BattlePalaceLobby_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin"
+
+	.align 2
+BattleFrontier_BattlePalaceLobby_Layout::
+	.4byte 0x19
+	.4byte 0xc
+	.4byte BattleFrontier_BattlePalaceLobby_MapBorder
+	.4byte BattleFrontier_BattlePalaceLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePalace
+
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.bin b/data/layouts/BattleFrontier_BattlePalaceLobby/map.bin
index cda8ff10e..cda8ff10e 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/map.bin
+++ b/data/layouts/BattleFrontier_BattlePalaceLobby/map.bin
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/border.bin b/data/layouts/BattleFrontier_BattlePikeCorridor/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/border.bin
+++ b/data/layouts/BattleFrontier_BattlePikeCorridor/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc
new file mode 100644
index 000000000..1d6d21778
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeCorridor_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin"
+
+BattleFrontier_BattlePikeCorridor_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin"
+
+	.align 2
+BattleFrontier_BattlePikeCorridor_Layout::
+	.4byte 0xe
+	.4byte 0x8
+	.4byte BattleFrontier_BattlePikeCorridor_MapBorder
+	.4byte BattleFrontier_BattlePikeCorridor_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePike
+
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.bin b/data/layouts/BattleFrontier_BattlePikeCorridor/map.bin
index 5e02c145b..5e02c145b 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/map.bin
+++ b/data/layouts/BattleFrontier_BattlePikeCorridor/map.bin
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin b/data/layouts/BattleFrontier_BattlePikeLobby/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin
+++ b/data/layouts/BattleFrontier_BattlePikeLobby/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc
new file mode 100644
index 000000000..3a5cd3538
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeLobby_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattlePikeLobby/border.bin"
+
+BattleFrontier_BattlePikeLobby_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattlePikeLobby/map.bin"
+
+	.align 2
+BattleFrontier_BattlePikeLobby_Layout::
+	.4byte 0xb
+	.4byte 0xd
+	.4byte BattleFrontier_BattlePikeLobby_MapBorder
+	.4byte BattleFrontier_BattlePikeLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePike
+
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.bin b/data/layouts/BattleFrontier_BattlePikeLobby/map.bin
index 4cbdfb405..4cbdfb405 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/map.bin
+++ b/data/layouts/BattleFrontier_BattlePikeLobby/map.bin
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc
new file mode 100644
index 000000000..466ad0ff4
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeRandomRoom1_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin"
+
+BattleFrontier_BattlePikeRandomRoom1_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin"
+
+	.align 2
+BattleFrontier_BattlePikeRandomRoom1_Layout::
+	.4byte 0x9
+	.4byte 0x8
+	.4byte BattleFrontier_BattlePikeRandomRoom1_MapBorder
+	.4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePike
+
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin
index 142150cbe..142150cbe 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc
new file mode 100644
index 000000000..1c7fb35d4
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeRandomRoom2_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin"
+
+BattleFrontier_BattlePikeRandomRoom2_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin"
+
+	.align 2
+BattleFrontier_BattlePikeRandomRoom2_Layout::
+	.4byte 0x5
+	.4byte 0x8
+	.4byte BattleFrontier_BattlePikeRandomRoom2_MapBorder
+	.4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePike
+
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin
index 27a6e52aa..27a6e52aa 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc
new file mode 100644
index 000000000..ce17a0bf6
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeRandomRoom3_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin"
+
+BattleFrontier_BattlePikeRandomRoom3_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin"
+
+	.align 2
+BattleFrontier_BattlePikeRandomRoom3_Layout::
+	.4byte 0x9
+	.4byte 0x14
+	.4byte BattleFrontier_BattlePikeRandomRoom3_MapBorder
+	.4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePike
+
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin
index 8ce7f1c37..8ce7f1c37 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin
+++ b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc
new file mode 100644
index 000000000..d7a082d13
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeThreePathRoom_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin"
+
+BattleFrontier_BattlePikeThreePathRoom_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin"
+
+	.align 2
+BattleFrontier_BattlePikeThreePathRoom_Layout::
+	.4byte 0xd
+	.4byte 0xb
+	.4byte BattleFrontier_BattlePikeThreePathRoom_MapBorder
+	.4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePike
+
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin
index 9618fe22a..9618fe22a 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin
+++ b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin
+++ b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc
new file mode 100644
index 000000000..a65e7928b
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePointExchangeServiceCorner_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin"
+
+BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin"
+
+	.align 2
+BattleFrontier_BattlePointExchangeServiceCorner_Layout::
+	.4byte 0xf
+	.4byte 0xb
+	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBorder
+	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFrontier
+
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin
index 62d5761e0..62d5761e0 100644
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin
+++ b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/border.bin b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/border.bin
+++ b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc
new file mode 100644
index 000000000..a9e779ddb
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePyramidEmptySquare_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin"
+
+BattleFrontier_BattlePyramidEmptySquare_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin"
+
+	.align 2
+BattleFrontier_BattlePyramidEmptySquare_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattleFrontier_BattlePyramidEmptySquare_MapBorder
+	.4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin
index 7c224d524..7c224d524 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin
+++ b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/border.bin b/data/layouts/BattleFrontier_BattlePyramidLobby/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/border.bin
+++ b/data/layouts/BattleFrontier_BattlePyramidLobby/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc
new file mode 100644
index 000000000..28575776a
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePyramidLobby_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin"
+
+BattleFrontier_BattlePyramidLobby_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin"
+
+	.align 2
+BattleFrontier_BattlePyramidLobby_Layout::
+	.4byte 0xf
+	.4byte 0x12
+	.4byte BattleFrontier_BattlePyramidLobby_MapBorder
+	.4byte BattleFrontier_BattlePyramidLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.bin b/data/layouts/BattleFrontier_BattlePyramidLobby/map.bin
index 32f23d3de..32f23d3de 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/map.bin
+++ b/data/layouts/BattleFrontier_BattlePyramidLobby/map.bin
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin b/data/layouts/BattleFrontier_BattlePyramidTop/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin
+++ b/data/layouts/BattleFrontier_BattlePyramidTop/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc
new file mode 100644
index 000000000..4657c37a3
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePyramidTop_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattlePyramidTop/border.bin"
+
+BattleFrontier_BattlePyramidTop_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattlePyramidTop/map.bin"
+
+	.align 2
+BattleFrontier_BattlePyramidTop_Layout::
+	.4byte 0x22
+	.4byte 0x17
+	.4byte BattleFrontier_BattlePyramidTop_MapBorder
+	.4byte BattleFrontier_BattlePyramidTop_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.bin b/data/layouts/BattleFrontier_BattlePyramidTop/map.bin
index dba9cf1b0..dba9cf1b0 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/map.bin
+++ b/data/layouts/BattleFrontier_BattlePyramidTop/map.bin
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/border.bin b/data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor/border.bin
+++ b/data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin
diff --git a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc
new file mode 100644
index 000000000..3d498239a
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerBattleRoom_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin"
+
+BattleFrontier_BattleTowerBattleRoom_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin"
+
+	.align 2
+BattleFrontier_BattleTowerBattleRoom_Layout::
+	.4byte 0xa
+	.4byte 0x9
+	.4byte BattleFrontier_BattleTowerBattleRoom_MapBorder
+	.4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFrontier
+
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin
index 42d99b5a6..42d99b5a6 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin
+++ b/data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/border.bin b/data/layouts/BattleFrontier_BattleTowerCorridor/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/border.bin
+++ b/data/layouts/BattleFrontier_BattleTowerCorridor/border.bin
diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc
new file mode 100644
index 000000000..56335aa23
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerCorridor_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin"
+
+BattleFrontier_BattleTowerCorridor_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin"
+
+	.align 2
+BattleFrontier_BattleTowerCorridor_Layout::
+	.4byte 0x11
+	.4byte 0x5
+	.4byte BattleFrontier_BattleTowerCorridor_MapBorder
+	.4byte BattleFrontier_BattleTowerCorridor_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFrontier
+
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.bin b/data/layouts/BattleFrontier_BattleTowerCorridor/map.bin
index 0b0803f91..0b0803f91 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor/map.bin
+++ b/data/layouts/BattleFrontier_BattleTowerCorridor/map.bin
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/border.bin b/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleTowerElevator/border.bin
+++ b/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin
diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc
new file mode 100644
index 000000000..7dba3777c
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerCorridor2_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin"
+
+BattleFrontier_BattleTowerCorridor2_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin"
+
+	.align 2
+BattleFrontier_BattleTowerCorridor2_Layout::
+	.4byte 0x11
+	.4byte 0x5
+	.4byte BattleFrontier_BattleTowerCorridor2_MapBorder
+	.4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFrontier
+
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.bin b/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin
index 87e93b640..87e93b640 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/map.bin
+++ b/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/border.bin b/data/layouts/BattleFrontier_BattleTowerLobby/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/border.bin
+++ b/data/layouts/BattleFrontier_BattleTowerLobby/border.bin
diff --git a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc
new file mode 100644
index 000000000..790ff3bcd
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerLobby_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleTowerLobby/border.bin"
+
+BattleFrontier_BattleTowerLobby_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleTowerLobby/map.bin"
+
+	.align 2
+BattleFrontier_BattleTowerLobby_Layout::
+	.4byte 0x19
+	.4byte 0xa
+	.4byte BattleFrontier_BattleTowerLobby_MapBorder
+	.4byte BattleFrontier_BattleTowerLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFrontier
+
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.bin b/data/layouts/BattleFrontier_BattleTowerLobby/map.bin
index 77926803a..77926803a 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/map.bin
+++ b/data/layouts/BattleFrontier_BattleTowerLobby/map.bin
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin
+++ b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin
diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc
new file mode 100644
index 000000000..df5615873
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerMultiBattleRoom_MapBorder::
+	.incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin"
+
+BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin"
+
+	.align 2
+BattleFrontier_BattleTowerMultiBattleRoom_Layout::
+	.4byte 0x15
+	.4byte 0xf
+	.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBorder
+	.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFrontier
+
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin
index b0a58e016..b0a58e016 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin
+++ b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin
diff --git a/data/maps/BattleFrontier_Lounge1/border.bin b/data/layouts/BattleFrontier_Lounge1/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_Lounge1/border.bin
+++ b/data/layouts/BattleFrontier_Lounge1/border.bin
diff --git a/data/layouts/BattleFrontier_Lounge1/layout.inc b/data/layouts/BattleFrontier_Lounge1/layout.inc
new file mode 100644
index 000000000..c25b3b2a0
--- /dev/null
+++ b/data/layouts/BattleFrontier_Lounge1/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_Lounge1_MapBorder::
+	.incbin "data/layouts/BattleFrontier_Lounge1/border.bin"
+
+BattleFrontier_Lounge1_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_Lounge1/map.bin"
+
+	.align 2
+BattleFrontier_Lounge1_Layout::
+	.4byte 0xd
+	.4byte 0x8
+	.4byte BattleFrontier_Lounge1_MapBorder
+	.4byte BattleFrontier_Lounge1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFrontier
+
diff --git a/data/maps/BattleFrontier_Lounge2/map.bin b/data/layouts/BattleFrontier_Lounge1/map.bin
index 11ae8d6ee..11ae8d6ee 100644
--- a/data/maps/BattleFrontier_Lounge2/map.bin
+++ b/data/layouts/BattleFrontier_Lounge1/map.bin
diff --git a/data/maps/BattleFrontier_Lounge2/border.bin b/data/layouts/BattleFrontier_Lounge2/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_Lounge2/border.bin
+++ b/data/layouts/BattleFrontier_Lounge2/border.bin
diff --git a/data/layouts/BattleFrontier_Lounge2/layout.inc b/data/layouts/BattleFrontier_Lounge2/layout.inc
new file mode 100644
index 000000000..b735b4994
--- /dev/null
+++ b/data/layouts/BattleFrontier_Lounge2/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_Lounge2_MapBorder::
+	.incbin "data/layouts/BattleFrontier_Lounge2/border.bin"
+
+BattleFrontier_Lounge2_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_Lounge2/map.bin"
+
+	.align 2
+BattleFrontier_Lounge2_Layout::
+	.4byte 0x9
+	.4byte 0xa
+	.4byte BattleFrontier_Lounge2_MapBorder
+	.4byte BattleFrontier_Lounge2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFrontier
+
diff --git a/data/maps/BattleFrontier_Lounge1/map.bin b/data/layouts/BattleFrontier_Lounge2/map.bin
index f5f1745b1..f5f1745b1 100644
--- a/data/maps/BattleFrontier_Lounge1/map.bin
+++ b/data/layouts/BattleFrontier_Lounge2/map.bin
diff --git a/data/maps/BattleFrontier_OutsideEast/border.bin b/data/layouts/BattleFrontier_OutsideEast/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/BattleFrontier_OutsideEast/border.bin
+++ b/data/layouts/BattleFrontier_OutsideEast/border.bin
diff --git a/data/layouts/BattleFrontier_OutsideEast/layout.inc b/data/layouts/BattleFrontier_OutsideEast/layout.inc
new file mode 100644
index 000000000..ddaf20446
--- /dev/null
+++ b/data/layouts/BattleFrontier_OutsideEast/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_OutsideEast_MapBorder::
+	.incbin "data/layouts/BattleFrontier_OutsideEast/border.bin"
+
+BattleFrontier_OutsideEast_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_OutsideEast/map.bin"
+
+	.align 2
+BattleFrontier_OutsideEast_Layout::
+	.4byte 0x48
+	.4byte 0x48
+	.4byte BattleFrontier_OutsideEast_MapBorder
+	.4byte BattleFrontier_OutsideEast_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_BattleFrontierOutsideEast
+
diff --git a/data/maps/BattleFrontier_OutsideEast/map.bin b/data/layouts/BattleFrontier_OutsideEast/map.bin
index b073c4585..b073c4585 100644
--- a/data/maps/BattleFrontier_OutsideEast/map.bin
+++ b/data/layouts/BattleFrontier_OutsideEast/map.bin
diff --git a/data/maps/BattleFrontier_OutsideWest/border.bin b/data/layouts/BattleFrontier_OutsideWest/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/BattleFrontier_OutsideWest/border.bin
+++ b/data/layouts/BattleFrontier_OutsideWest/border.bin
diff --git a/data/layouts/BattleFrontier_OutsideWest/layout.inc b/data/layouts/BattleFrontier_OutsideWest/layout.inc
new file mode 100644
index 000000000..a506e554f
--- /dev/null
+++ b/data/layouts/BattleFrontier_OutsideWest/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_OutsideWest_MapBorder::
+	.incbin "data/layouts/BattleFrontier_OutsideWest/border.bin"
+
+BattleFrontier_OutsideWest_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_OutsideWest/map.bin"
+
+	.align 2
+BattleFrontier_OutsideWest_Layout::
+	.4byte 0x38
+	.4byte 0x48
+	.4byte BattleFrontier_OutsideWest_MapBorder
+	.4byte BattleFrontier_OutsideWest_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_BattleFrontierOutsideWest
+
diff --git a/data/maps/BattleFrontier_OutsideWest/map.bin b/data/layouts/BattleFrontier_OutsideWest/map.bin
index d43111bda..d43111bda 100644
--- a/data/maps/BattleFrontier_OutsideWest/map.bin
+++ b/data/layouts/BattleFrontier_OutsideWest/map.bin
diff --git a/data/maps/BattleFrontier_RankingHall/border.bin b/data/layouts/BattleFrontier_RankingHall/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_RankingHall/border.bin
+++ b/data/layouts/BattleFrontier_RankingHall/border.bin
diff --git a/data/layouts/BattleFrontier_RankingHall/layout.inc b/data/layouts/BattleFrontier_RankingHall/layout.inc
new file mode 100644
index 000000000..d7615e693
--- /dev/null
+++ b/data/layouts/BattleFrontier_RankingHall/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_RankingHall_MapBorder::
+	.incbin "data/layouts/BattleFrontier_RankingHall/border.bin"
+
+BattleFrontier_RankingHall_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_RankingHall/map.bin"
+
+	.align 2
+BattleFrontier_RankingHall_Layout::
+	.4byte 0x35
+	.4byte 0xf
+	.4byte BattleFrontier_RankingHall_MapBorder
+	.4byte BattleFrontier_RankingHall_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFrontierRankingHall
+
diff --git a/data/maps/BattleFrontier_RankingHall/map.bin b/data/layouts/BattleFrontier_RankingHall/map.bin
index df32e0665..df32e0665 100644
--- a/data/maps/BattleFrontier_RankingHall/map.bin
+++ b/data/layouts/BattleFrontier_RankingHall/map.bin
diff --git a/data/maps/BattleFrontier_ReceptionGate/border.bin b/data/layouts/BattleFrontier_ReceptionGate/border.bin
index 9afd13cdc..9afd13cdc 100644
--- a/data/maps/BattleFrontier_ReceptionGate/border.bin
+++ b/data/layouts/BattleFrontier_ReceptionGate/border.bin
diff --git a/data/layouts/BattleFrontier_ReceptionGate/layout.inc b/data/layouts/BattleFrontier_ReceptionGate/layout.inc
new file mode 100644
index 000000000..3dd4aeaa5
--- /dev/null
+++ b/data/layouts/BattleFrontier_ReceptionGate/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_ReceptionGate_MapBorder::
+	.incbin "data/layouts/BattleFrontier_ReceptionGate/border.bin"
+
+BattleFrontier_ReceptionGate_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_ReceptionGate/map.bin"
+
+	.align 2
+BattleFrontier_ReceptionGate_Layout::
+	.4byte 0x9
+	.4byte 0xe
+	.4byte BattleFrontier_ReceptionGate_MapBorder
+	.4byte BattleFrontier_ReceptionGate_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_BattleFrontier
+
diff --git a/data/maps/BattleFrontier_ReceptionGate/map.bin b/data/layouts/BattleFrontier_ReceptionGate/map.bin
index 2b75ea851..2b75ea851 100644
--- a/data/maps/BattleFrontier_ReceptionGate/map.bin
+++ b/data/layouts/BattleFrontier_ReceptionGate/map.bin
diff --git a/data/maps/BattleFrontier_ScottsHouse/border.bin b/data/layouts/BattleFrontier_ScottsHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleFrontier_ScottsHouse/border.bin
+++ b/data/layouts/BattleFrontier_ScottsHouse/border.bin
diff --git a/data/layouts/BattleFrontier_ScottsHouse/layout.inc b/data/layouts/BattleFrontier_ScottsHouse/layout.inc
new file mode 100644
index 000000000..f08737109
--- /dev/null
+++ b/data/layouts/BattleFrontier_ScottsHouse/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_ScottsHouse_MapBorder::
+	.incbin "data/layouts/BattleFrontier_ScottsHouse/border.bin"
+
+BattleFrontier_ScottsHouse_MapBlockdata::
+	.incbin "data/layouts/BattleFrontier_ScottsHouse/map.bin"
+
+	.align 2
+BattleFrontier_ScottsHouse_Layout::
+	.4byte 0x6
+	.4byte 0x8
+	.4byte BattleFrontier_ScottsHouse_MapBorder
+	.4byte BattleFrontier_ScottsHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFrontier
+
diff --git a/data/maps/BattleFrontier_ScottsHouse/map.bin b/data/layouts/BattleFrontier_ScottsHouse/map.bin
index 8844e94dd..8844e94dd 100644
--- a/data/maps/BattleFrontier_ScottsHouse/map.bin
+++ b/data/layouts/BattleFrontier_ScottsHouse/map.bin
diff --git a/data/maps/BattlePyramidSquare01/border.bin b/data/layouts/BattlePyramidSquare01/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare01/border.bin
+++ b/data/layouts/BattlePyramidSquare01/border.bin
diff --git a/data/layouts/BattlePyramidSquare01/layout.inc b/data/layouts/BattlePyramidSquare01/layout.inc
new file mode 100644
index 000000000..fe710cc40
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare01/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare01_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare01/border.bin"
+
+BattlePyramidSquare01_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare01/map.bin"
+
+	.align 2
+BattlePyramidSquare01_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare01_MapBorder
+	.4byte BattlePyramidSquare01_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare01/map.bin b/data/layouts/BattlePyramidSquare01/map.bin
index 586ccbdbd..586ccbdbd 100644
--- a/data/maps/BattlePyramidSquare01/map.bin
+++ b/data/layouts/BattlePyramidSquare01/map.bin
diff --git a/data/maps/BattlePyramidSquare02/border.bin b/data/layouts/BattlePyramidSquare02/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare02/border.bin
+++ b/data/layouts/BattlePyramidSquare02/border.bin
diff --git a/data/layouts/BattlePyramidSquare02/layout.inc b/data/layouts/BattlePyramidSquare02/layout.inc
new file mode 100644
index 000000000..6aa5b7aa9
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare02/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare02_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare02/border.bin"
+
+BattlePyramidSquare02_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare02/map.bin"
+
+	.align 2
+BattlePyramidSquare02_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare02_MapBorder
+	.4byte BattlePyramidSquare02_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare02/map.bin b/data/layouts/BattlePyramidSquare02/map.bin
index 5a9b8d4ce..5a9b8d4ce 100644
--- a/data/maps/BattlePyramidSquare02/map.bin
+++ b/data/layouts/BattlePyramidSquare02/map.bin
diff --git a/data/maps/BattlePyramidSquare03/border.bin b/data/layouts/BattlePyramidSquare03/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare03/border.bin
+++ b/data/layouts/BattlePyramidSquare03/border.bin
diff --git a/data/layouts/BattlePyramidSquare03/layout.inc b/data/layouts/BattlePyramidSquare03/layout.inc
new file mode 100644
index 000000000..4da41f9e9
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare03/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare03_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare03/border.bin"
+
+BattlePyramidSquare03_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare03/map.bin"
+
+	.align 2
+BattlePyramidSquare03_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare03_MapBorder
+	.4byte BattlePyramidSquare03_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare03/map.bin b/data/layouts/BattlePyramidSquare03/map.bin
index 903b8a49b..903b8a49b 100644
--- a/data/maps/BattlePyramidSquare03/map.bin
+++ b/data/layouts/BattlePyramidSquare03/map.bin
diff --git a/data/maps/BattlePyramidSquare04/border.bin b/data/layouts/BattlePyramidSquare04/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare04/border.bin
+++ b/data/layouts/BattlePyramidSquare04/border.bin
diff --git a/data/layouts/BattlePyramidSquare04/layout.inc b/data/layouts/BattlePyramidSquare04/layout.inc
new file mode 100644
index 000000000..c298ee6f4
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare04/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare04_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare04/border.bin"
+
+BattlePyramidSquare04_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare04/map.bin"
+
+	.align 2
+BattlePyramidSquare04_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare04_MapBorder
+	.4byte BattlePyramidSquare04_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare04/map.bin b/data/layouts/BattlePyramidSquare04/map.bin
index 32a264546..32a264546 100644
--- a/data/maps/BattlePyramidSquare04/map.bin
+++ b/data/layouts/BattlePyramidSquare04/map.bin
diff --git a/data/maps/BattlePyramidSquare05/border.bin b/data/layouts/BattlePyramidSquare05/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare05/border.bin
+++ b/data/layouts/BattlePyramidSquare05/border.bin
diff --git a/data/layouts/BattlePyramidSquare05/layout.inc b/data/layouts/BattlePyramidSquare05/layout.inc
new file mode 100644
index 000000000..87ce53274
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare05/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare05_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare05/border.bin"
+
+BattlePyramidSquare05_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare05/map.bin"
+
+	.align 2
+BattlePyramidSquare05_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare05_MapBorder
+	.4byte BattlePyramidSquare05_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare05/map.bin b/data/layouts/BattlePyramidSquare05/map.bin
index d6c5a6897..d6c5a6897 100644
--- a/data/maps/BattlePyramidSquare05/map.bin
+++ b/data/layouts/BattlePyramidSquare05/map.bin
diff --git a/data/maps/BattlePyramidSquare06/border.bin b/data/layouts/BattlePyramidSquare06/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare06/border.bin
+++ b/data/layouts/BattlePyramidSquare06/border.bin
diff --git a/data/layouts/BattlePyramidSquare06/layout.inc b/data/layouts/BattlePyramidSquare06/layout.inc
new file mode 100644
index 000000000..bcaeb89b0
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare06/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare06_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare06/border.bin"
+
+BattlePyramidSquare06_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare06/map.bin"
+
+	.align 2
+BattlePyramidSquare06_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare06_MapBorder
+	.4byte BattlePyramidSquare06_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare06/map.bin b/data/layouts/BattlePyramidSquare06/map.bin
index c30533aab..c30533aab 100644
--- a/data/maps/BattlePyramidSquare06/map.bin
+++ b/data/layouts/BattlePyramidSquare06/map.bin
diff --git a/data/maps/BattlePyramidSquare07/border.bin b/data/layouts/BattlePyramidSquare07/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare07/border.bin
+++ b/data/layouts/BattlePyramidSquare07/border.bin
diff --git a/data/layouts/BattlePyramidSquare07/layout.inc b/data/layouts/BattlePyramidSquare07/layout.inc
new file mode 100644
index 000000000..bb469b3c8
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare07/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare07_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare07/border.bin"
+
+BattlePyramidSquare07_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare07/map.bin"
+
+	.align 2
+BattlePyramidSquare07_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare07_MapBorder
+	.4byte BattlePyramidSquare07_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare07/map.bin b/data/layouts/BattlePyramidSquare07/map.bin
index 25f9c1529..25f9c1529 100644
--- a/data/maps/BattlePyramidSquare07/map.bin
+++ b/data/layouts/BattlePyramidSquare07/map.bin
diff --git a/data/maps/BattlePyramidSquare08/border.bin b/data/layouts/BattlePyramidSquare08/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare08/border.bin
+++ b/data/layouts/BattlePyramidSquare08/border.bin
diff --git a/data/layouts/BattlePyramidSquare08/layout.inc b/data/layouts/BattlePyramidSquare08/layout.inc
new file mode 100644
index 000000000..df88b710f
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare08/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare08_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare08/border.bin"
+
+BattlePyramidSquare08_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare08/map.bin"
+
+	.align 2
+BattlePyramidSquare08_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare08_MapBorder
+	.4byte BattlePyramidSquare08_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare08/map.bin b/data/layouts/BattlePyramidSquare08/map.bin
index 86a830696..86a830696 100644
--- a/data/maps/BattlePyramidSquare08/map.bin
+++ b/data/layouts/BattlePyramidSquare08/map.bin
diff --git a/data/maps/BattlePyramidSquare09/border.bin b/data/layouts/BattlePyramidSquare09/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare09/border.bin
+++ b/data/layouts/BattlePyramidSquare09/border.bin
diff --git a/data/layouts/BattlePyramidSquare09/layout.inc b/data/layouts/BattlePyramidSquare09/layout.inc
new file mode 100644
index 000000000..2869d9ac2
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare09/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare09_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare09/border.bin"
+
+BattlePyramidSquare09_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare09/map.bin"
+
+	.align 2
+BattlePyramidSquare09_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare09_MapBorder
+	.4byte BattlePyramidSquare09_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare09/map.bin b/data/layouts/BattlePyramidSquare09/map.bin
index e4f648704..e4f648704 100644
--- a/data/maps/BattlePyramidSquare09/map.bin
+++ b/data/layouts/BattlePyramidSquare09/map.bin
diff --git a/data/maps/BattlePyramidSquare10/border.bin b/data/layouts/BattlePyramidSquare10/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare10/border.bin
+++ b/data/layouts/BattlePyramidSquare10/border.bin
diff --git a/data/layouts/BattlePyramidSquare10/layout.inc b/data/layouts/BattlePyramidSquare10/layout.inc
new file mode 100644
index 000000000..2ba8e8124
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare10/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare10_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare10/border.bin"
+
+BattlePyramidSquare10_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare10/map.bin"
+
+	.align 2
+BattlePyramidSquare10_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare10_MapBorder
+	.4byte BattlePyramidSquare10_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare10/map.bin b/data/layouts/BattlePyramidSquare10/map.bin
index 4aa7fd771..4aa7fd771 100644
--- a/data/maps/BattlePyramidSquare10/map.bin
+++ b/data/layouts/BattlePyramidSquare10/map.bin
diff --git a/data/maps/BattlePyramidSquare11/border.bin b/data/layouts/BattlePyramidSquare11/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare11/border.bin
+++ b/data/layouts/BattlePyramidSquare11/border.bin
diff --git a/data/layouts/BattlePyramidSquare11/layout.inc b/data/layouts/BattlePyramidSquare11/layout.inc
new file mode 100644
index 000000000..190bddf10
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare11/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare11_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare11/border.bin"
+
+BattlePyramidSquare11_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare11/map.bin"
+
+	.align 2
+BattlePyramidSquare11_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare11_MapBorder
+	.4byte BattlePyramidSquare11_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare11/map.bin b/data/layouts/BattlePyramidSquare11/map.bin
index f393f51e5..f393f51e5 100644
--- a/data/maps/BattlePyramidSquare11/map.bin
+++ b/data/layouts/BattlePyramidSquare11/map.bin
diff --git a/data/maps/BattlePyramidSquare12/border.bin b/data/layouts/BattlePyramidSquare12/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare12/border.bin
+++ b/data/layouts/BattlePyramidSquare12/border.bin
diff --git a/data/layouts/BattlePyramidSquare12/layout.inc b/data/layouts/BattlePyramidSquare12/layout.inc
new file mode 100644
index 000000000..199f66ace
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare12/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare12_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare12/border.bin"
+
+BattlePyramidSquare12_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare12/map.bin"
+
+	.align 2
+BattlePyramidSquare12_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare12_MapBorder
+	.4byte BattlePyramidSquare12_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare12/map.bin b/data/layouts/BattlePyramidSquare12/map.bin
index 64dd96955..64dd96955 100644
--- a/data/maps/BattlePyramidSquare12/map.bin
+++ b/data/layouts/BattlePyramidSquare12/map.bin
diff --git a/data/maps/BattlePyramidSquare13/border.bin b/data/layouts/BattlePyramidSquare13/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare13/border.bin
+++ b/data/layouts/BattlePyramidSquare13/border.bin
diff --git a/data/layouts/BattlePyramidSquare13/layout.inc b/data/layouts/BattlePyramidSquare13/layout.inc
new file mode 100644
index 000000000..351b04227
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare13/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare13_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare13/border.bin"
+
+BattlePyramidSquare13_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare13/map.bin"
+
+	.align 2
+BattlePyramidSquare13_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare13_MapBorder
+	.4byte BattlePyramidSquare13_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare13/map.bin b/data/layouts/BattlePyramidSquare13/map.bin
index 5fc1485a7..5fc1485a7 100644
--- a/data/maps/BattlePyramidSquare13/map.bin
+++ b/data/layouts/BattlePyramidSquare13/map.bin
diff --git a/data/maps/BattlePyramidSquare14/border.bin b/data/layouts/BattlePyramidSquare14/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare14/border.bin
+++ b/data/layouts/BattlePyramidSquare14/border.bin
diff --git a/data/layouts/BattlePyramidSquare14/layout.inc b/data/layouts/BattlePyramidSquare14/layout.inc
new file mode 100644
index 000000000..653ad161b
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare14/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare14_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare14/border.bin"
+
+BattlePyramidSquare14_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare14/map.bin"
+
+	.align 2
+BattlePyramidSquare14_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare14_MapBorder
+	.4byte BattlePyramidSquare14_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare14/map.bin b/data/layouts/BattlePyramidSquare14/map.bin
index 21655a872..21655a872 100644
--- a/data/maps/BattlePyramidSquare14/map.bin
+++ b/data/layouts/BattlePyramidSquare14/map.bin
diff --git a/data/maps/BattlePyramidSquare15/border.bin b/data/layouts/BattlePyramidSquare15/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare15/border.bin
+++ b/data/layouts/BattlePyramidSquare15/border.bin
diff --git a/data/layouts/BattlePyramidSquare15/layout.inc b/data/layouts/BattlePyramidSquare15/layout.inc
new file mode 100644
index 000000000..24090c671
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare15/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare15_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare15/border.bin"
+
+BattlePyramidSquare15_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare15/map.bin"
+
+	.align 2
+BattlePyramidSquare15_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare15_MapBorder
+	.4byte BattlePyramidSquare15_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare15/map.bin b/data/layouts/BattlePyramidSquare15/map.bin
index ccbd87d9a..ccbd87d9a 100644
--- a/data/maps/BattlePyramidSquare15/map.bin
+++ b/data/layouts/BattlePyramidSquare15/map.bin
diff --git a/data/maps/BattlePyramidSquare16/border.bin b/data/layouts/BattlePyramidSquare16/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattlePyramidSquare16/border.bin
+++ b/data/layouts/BattlePyramidSquare16/border.bin
diff --git a/data/layouts/BattlePyramidSquare16/layout.inc b/data/layouts/BattlePyramidSquare16/layout.inc
new file mode 100644
index 000000000..67187b9bf
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare16/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare16_MapBorder::
+	.incbin "data/layouts/BattlePyramidSquare16/border.bin"
+
+BattlePyramidSquare16_MapBlockdata::
+	.incbin "data/layouts/BattlePyramidSquare16/map.bin"
+
+	.align 2
+BattlePyramidSquare16_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte BattlePyramidSquare16_MapBorder
+	.4byte BattlePyramidSquare16_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePyramid
+
diff --git a/data/maps/BattlePyramidSquare16/map.bin b/data/layouts/BattlePyramidSquare16/map.bin
index 601eb526e..601eb526e 100644
--- a/data/maps/BattlePyramidSquare16/map.bin
+++ b/data/layouts/BattlePyramidSquare16/map.bin
diff --git a/data/maps/DewfordTown_Gym/border.bin b/data/layouts/BattleTentBattleRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/DewfordTown_Gym/border.bin
+++ b/data/layouts/BattleTentBattleRoom/border.bin
diff --git a/data/layouts/BattleTentBattleRoom/layout.inc b/data/layouts/BattleTentBattleRoom/layout.inc
new file mode 100644
index 000000000..4f9a8e626
--- /dev/null
+++ b/data/layouts/BattleTentBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleTentBattleRoom_MapBorder::
+	.incbin "data/layouts/BattleTentBattleRoom/border.bin"
+
+BattleTentBattleRoom_MapBlockdata::
+	.incbin "data/layouts/BattleTentBattleRoom/map.bin"
+
+	.align 2
+BattleTentBattleRoom_Layout::
+	.4byte 0xa
+	.4byte 0x9
+	.4byte BattleTentBattleRoom_MapBorder
+	.4byte BattleTentBattleRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTent
+
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.bin b/data/layouts/BattleTentBattleRoom/map.bin
index 92a738d5e..92a738d5e 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/map.bin
+++ b/data/layouts/BattleTentBattleRoom/map.bin
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/border.bin b/data/layouts/BattleTentCorridor/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/border.bin
+++ b/data/layouts/BattleTentCorridor/border.bin
diff --git a/data/layouts/BattleTentCorridor/layout.inc b/data/layouts/BattleTentCorridor/layout.inc
new file mode 100644
index 000000000..9abcdefa4
--- /dev/null
+++ b/data/layouts/BattleTentCorridor/layout.inc
@@ -0,0 +1,15 @@
+BattleTentCorridor_MapBorder::
+	.incbin "data/layouts/BattleTentCorridor/border.bin"
+
+BattleTentCorridor_MapBlockdata::
+	.incbin "data/layouts/BattleTentCorridor/map.bin"
+
+	.align 2
+BattleTentCorridor_Layout::
+	.4byte 0x5
+	.4byte 0x8
+	.4byte BattleTentCorridor_MapBorder
+	.4byte BattleTentCorridor_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTent
+
diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.bin b/data/layouts/BattleTentCorridor/map.bin
index 4cd270b21..4cd270b21 100644
--- a/data/maps/FallarborTown_BattleTentCorridor/map.bin
+++ b/data/layouts/BattleTentCorridor/map.bin
diff --git a/data/maps/EverGrandeCity_DrakesRoom/border.bin b/data/layouts/BattleTentLobby/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/border.bin
+++ b/data/layouts/BattleTentLobby/border.bin
diff --git a/data/layouts/BattleTentLobby/layout.inc b/data/layouts/BattleTentLobby/layout.inc
new file mode 100644
index 000000000..a3216370f
--- /dev/null
+++ b/data/layouts/BattleTentLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleTentLobby_MapBorder::
+	.incbin "data/layouts/BattleTentLobby/border.bin"
+
+BattleTentLobby_MapBlockdata::
+	.incbin "data/layouts/BattleTentLobby/map.bin"
+
+	.align 2
+BattleTentLobby_Layout::
+	.4byte 0xd
+	.4byte 0xa
+	.4byte BattleTentLobby_MapBorder
+	.4byte BattleTentLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTent
+
diff --git a/data/maps/FallarborTown_BattleTentLobby/map.bin b/data/layouts/BattleTentLobby/map.bin
index 9ff37dc2c..9ff37dc2c 100644
--- a/data/maps/FallarborTown_BattleTentLobby/map.bin
+++ b/data/layouts/BattleTentLobby/map.bin
diff --git a/data/maps/BirthIsland_Exterior/border.bin b/data/layouts/BirthIsland_Exterior/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/BirthIsland_Exterior/border.bin
+++ b/data/layouts/BirthIsland_Exterior/border.bin
diff --git a/data/layouts/BirthIsland_Exterior/layout.inc b/data/layouts/BirthIsland_Exterior/layout.inc
new file mode 100644
index 000000000..17dc4f0fb
--- /dev/null
+++ b/data/layouts/BirthIsland_Exterior/layout.inc
@@ -0,0 +1,15 @@
+BirthIsland_Exterior_MapBorder::
+	.incbin "data/layouts/BirthIsland_Exterior/border.bin"
+
+BirthIsland_Exterior_MapBlockdata::
+	.incbin "data/layouts/BirthIsland_Exterior/map.bin"
+
+	.align 2
+BirthIsland_Exterior_Layout::
+	.4byte 0x1e
+	.4byte 0x1e
+	.4byte BirthIsland_Exterior_MapBorder
+	.4byte BirthIsland_Exterior_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
+
diff --git a/data/maps/BirthIsland_Exterior/map.bin b/data/layouts/BirthIsland_Exterior/map.bin
index 38dfe77a8..38dfe77a8 100644
--- a/data/maps/BirthIsland_Exterior/map.bin
+++ b/data/layouts/BirthIsland_Exterior/map.bin
diff --git a/data/maps/BirthIsland_Harbor/border.bin b/data/layouts/CableCarStation/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/BirthIsland_Harbor/border.bin
+++ b/data/layouts/CableCarStation/border.bin
diff --git a/data/layouts/CableCarStation/layout.inc b/data/layouts/CableCarStation/layout.inc
new file mode 100644
index 000000000..1113f89f2
--- /dev/null
+++ b/data/layouts/CableCarStation/layout.inc
@@ -0,0 +1,15 @@
+CableCarStation_MapBorder::
+	.incbin "data/layouts/CableCarStation/border.bin"
+
+CableCarStation_MapBlockdata::
+	.incbin "data/layouts/CableCarStation/map.bin"
+
+	.align 2
+CableCarStation_Layout::
+	.4byte 0xd
+	.4byte 0xc
+	.4byte CableCarStation_MapBorder
+	.4byte CableCarStation_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/Route112_CableCarStation/map.bin b/data/layouts/CableCarStation/map.bin
index 93db9d5f0..93db9d5f0 100644
--- a/data/maps/Route112_CableCarStation/map.bin
+++ b/data/layouts/CableCarStation/map.bin
diff --git a/data/maps/CaveOfOrigin_1F/border.bin b/data/layouts/CaveOfOrigin_1F/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_1F/border.bin
+++ b/data/layouts/CaveOfOrigin_1F/border.bin
diff --git a/data/layouts/CaveOfOrigin_1F/layout.inc b/data/layouts/CaveOfOrigin_1F/layout.inc
new file mode 100644
index 000000000..616af1655
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_1F/layout.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_1F_MapBorder::
+	.incbin "data/layouts/CaveOfOrigin_1F/border.bin"
+
+CaveOfOrigin_1F_MapBlockdata::
+	.incbin "data/layouts/CaveOfOrigin_1F/map.bin"
+
+	.align 2
+CaveOfOrigin_1F_Layout::
+	.4byte 0x17
+	.4byte 0x17
+	.4byte CaveOfOrigin_1F_MapBorder
+	.4byte CaveOfOrigin_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/CaveOfOrigin_1F/map.bin b/data/layouts/CaveOfOrigin_1F/map.bin
index c3c5e7abf..c3c5e7abf 100644
--- a/data/maps/CaveOfOrigin_1F/map.bin
+++ b/data/layouts/CaveOfOrigin_1F/map.bin
diff --git a/data/maps/CaveOfOrigin_B1F/border.bin b/data/layouts/CaveOfOrigin_B1F/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_B1F/border.bin
+++ b/data/layouts/CaveOfOrigin_B1F/border.bin
diff --git a/data/layouts/CaveOfOrigin_B1F/layout.inc b/data/layouts/CaveOfOrigin_B1F/layout.inc
new file mode 100644
index 000000000..5850f15c9
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B1F/layout.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_B1F_MapBorder::
+	.incbin "data/layouts/CaveOfOrigin_B1F/border.bin"
+
+CaveOfOrigin_B1F_MapBlockdata::
+	.incbin "data/layouts/CaveOfOrigin_B1F/map.bin"
+
+	.align 2
+CaveOfOrigin_B1F_Layout::
+	.4byte 0x13
+	.4byte 0x13
+	.4byte CaveOfOrigin_B1F_MapBorder
+	.4byte CaveOfOrigin_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/CaveOfOrigin_B1F/map.bin b/data/layouts/CaveOfOrigin_B1F/map.bin
index 1fb2d71bb..1fb2d71bb 100644
--- a/data/maps/CaveOfOrigin_B1F/map.bin
+++ b/data/layouts/CaveOfOrigin_B1F/map.bin
diff --git a/data/maps/CaveOfOrigin_Entrance/border.bin b/data/layouts/CaveOfOrigin_Entrance/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_Entrance/border.bin
+++ b/data/layouts/CaveOfOrigin_Entrance/border.bin
diff --git a/data/layouts/CaveOfOrigin_Entrance/layout.inc b/data/layouts/CaveOfOrigin_Entrance/layout.inc
new file mode 100644
index 000000000..11e230ce3
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_Entrance/layout.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_Entrance_MapBorder::
+	.incbin "data/layouts/CaveOfOrigin_Entrance/border.bin"
+
+CaveOfOrigin_Entrance_MapBlockdata::
+	.incbin "data/layouts/CaveOfOrigin_Entrance/map.bin"
+
+	.align 2
+CaveOfOrigin_Entrance_Layout::
+	.4byte 0x13
+	.4byte 0x1a
+	.4byte CaveOfOrigin_Entrance_MapBorder
+	.4byte CaveOfOrigin_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/CaveOfOrigin_Entrance/map.bin b/data/layouts/CaveOfOrigin_Entrance/map.bin
index 4bbffd109..4bbffd109 100644
--- a/data/maps/CaveOfOrigin_Entrance/map.bin
+++ b/data/layouts/CaveOfOrigin_Entrance/map.bin
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc
new file mode 100644
index 000000000..294bf786a
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_UnusedRubySapphireMap1_MapBorder::
+	.incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin"
+
+CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata::
+	.incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin"
+
+	.align 2
+CaveOfOrigin_UnusedRubySapphireMap1_Layout::
+	.4byte 0x17
+	.4byte 0x17
+	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBorder
+	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin
index 0ffbdaaa0..0ffbdaaa0 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin
index 4117717f2..4117717f2 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc
new file mode 100644
index 000000000..c3a05f75f
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_UnusedRubySapphireMap2_MapBorder::
+	.incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin"
+
+CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata::
+	.incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin"
+
+	.align 2
+CaveOfOrigin_UnusedRubySapphireMap2_Layout::
+	.4byte 0x15
+	.4byte 0x15
+	.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBorder
+	.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin
index 4c1fd5ab8..4c1fd5ab8 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc
new file mode 100644
index 000000000..cbc5c052a
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_UnusedRubySapphireMap3_MapBorder::
+	.incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin"
+
+CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata::
+	.incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin"
+
+	.align 2
+CaveOfOrigin_UnusedRubySapphireMap3_Layout::
+	.4byte 0x13
+	.4byte 0x15
+	.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBorder
+	.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin
index ea574b224..ea574b224 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin
diff --git a/data/maps/DesertRuins/border.bin b/data/layouts/DesertRuins/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/maps/DesertRuins/border.bin
+++ b/data/layouts/DesertRuins/border.bin
diff --git a/data/layouts/DesertRuins/layout.inc b/data/layouts/DesertRuins/layout.inc
new file mode 100644
index 000000000..4d6e7571a
--- /dev/null
+++ b/data/layouts/DesertRuins/layout.inc
@@ -0,0 +1,15 @@
+DesertRuins_MapBorder::
+	.incbin "data/layouts/DesertRuins/border.bin"
+
+DesertRuins_MapBlockdata::
+	.incbin "data/layouts/DesertRuins/map.bin"
+
+	.align 2
+DesertRuins_Layout::
+	.4byte 0x11
+	.4byte 0x21
+	.4byte DesertRuins_MapBorder
+	.4byte DesertRuins_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/DesertRuins/map.bin b/data/layouts/DesertRuins/map.bin
index 406cf7279..406cf7279 100644
--- a/data/maps/DesertRuins/map.bin
+++ b/data/layouts/DesertRuins/map.bin
diff --git a/data/maps/DesertUnderpass/border.bin b/data/layouts/DesertUnderpass/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/DesertUnderpass/border.bin
+++ b/data/layouts/DesertUnderpass/border.bin
diff --git a/data/layouts/DesertUnderpass/layout.inc b/data/layouts/DesertUnderpass/layout.inc
new file mode 100644
index 000000000..9a17a128e
--- /dev/null
+++ b/data/layouts/DesertUnderpass/layout.inc
@@ -0,0 +1,15 @@
+DesertUnderpass_MapBorder::
+	.incbin "data/layouts/DesertUnderpass/border.bin"
+
+DesertUnderpass_MapBlockdata::
+	.incbin "data/layouts/DesertUnderpass/map.bin"
+
+	.align 2
+DesertUnderpass_Layout::
+	.4byte 0x8b
+	.4byte 0x17
+	.4byte DesertUnderpass_MapBorder
+	.4byte DesertUnderpass_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/DesertUnderpass/map.bin b/data/layouts/DesertUnderpass/map.bin
index 2f82e9357..2f82e9357 100644
--- a/data/maps/DesertUnderpass/map.bin
+++ b/data/layouts/DesertUnderpass/map.bin
diff --git a/data/maps/DewfordTown/border.bin b/data/layouts/DewfordTown/border.bin
index 281762f5b..281762f5b 100644
--- a/data/maps/DewfordTown/border.bin
+++ b/data/layouts/DewfordTown/border.bin
diff --git a/data/layouts/DewfordTown/layout.inc b/data/layouts/DewfordTown/layout.inc
new file mode 100644
index 000000000..28ccdc43c
--- /dev/null
+++ b/data/layouts/DewfordTown/layout.inc
@@ -0,0 +1,15 @@
+DewfordTown_MapBorder::
+	.incbin "data/layouts/DewfordTown/border.bin"
+
+DewfordTown_MapBlockdata::
+	.incbin "data/layouts/DewfordTown/map.bin"
+
+	.align 2
+DewfordTown_Layout::
+	.4byte 0x14
+	.4byte 0x14
+	.4byte DewfordTown_MapBorder
+	.4byte DewfordTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
+
diff --git a/data/maps/DewfordTown/map.bin b/data/layouts/DewfordTown/map.bin
index e8a1154e8..e8a1154e8 100644
--- a/data/maps/DewfordTown/map.bin
+++ b/data/layouts/DewfordTown/map.bin
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/border.bin b/data/layouts/DewfordTown_Gym/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/border.bin
+++ b/data/layouts/DewfordTown_Gym/border.bin
diff --git a/data/layouts/DewfordTown_Gym/layout.inc b/data/layouts/DewfordTown_Gym/layout.inc
new file mode 100644
index 000000000..bbada5bdc
--- /dev/null
+++ b/data/layouts/DewfordTown_Gym/layout.inc
@@ -0,0 +1,15 @@
+DewfordTown_Gym_MapBorder::
+	.incbin "data/layouts/DewfordTown_Gym/border.bin"
+
+DewfordTown_Gym_MapBlockdata::
+	.incbin "data/layouts/DewfordTown_Gym/map.bin"
+
+	.align 2
+DewfordTown_Gym_Layout::
+	.4byte 0x12
+	.4byte 0x1c
+	.4byte DewfordTown_Gym_MapBorder
+	.4byte DewfordTown_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_DewfordGym
+
diff --git a/data/maps/DewfordTown_Gym/map.bin b/data/layouts/DewfordTown_Gym/map.bin
index 43cd6e64a..43cd6e64a 100644
--- a/data/maps/DewfordTown_Gym/map.bin
+++ b/data/layouts/DewfordTown_Gym/map.bin
diff --git a/data/maps/DewfordTown_Hall/border.bin b/data/layouts/DewfordTown_Hall/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/DewfordTown_Hall/border.bin
+++ b/data/layouts/DewfordTown_Hall/border.bin
diff --git a/data/layouts/DewfordTown_Hall/layout.inc b/data/layouts/DewfordTown_Hall/layout.inc
new file mode 100644
index 000000000..bd9cd03ae
--- /dev/null
+++ b/data/layouts/DewfordTown_Hall/layout.inc
@@ -0,0 +1,15 @@
+DewfordTown_Hall_MapBorder::
+	.incbin "data/layouts/DewfordTown_Hall/border.bin"
+
+DewfordTown_Hall_MapBlockdata::
+	.incbin "data/layouts/DewfordTown_Hall/map.bin"
+
+	.align 2
+DewfordTown_Hall_Layout::
+	.4byte 0x11
+	.4byte 0x9
+	.4byte DewfordTown_Hall_MapBorder
+	.4byte DewfordTown_Hall_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/DewfordTown_Hall/map.bin b/data/layouts/DewfordTown_Hall/map.bin
index 5fd13209d..5fd13209d 100644
--- a/data/maps/DewfordTown_Hall/map.bin
+++ b/data/layouts/DewfordTown_Hall/map.bin
diff --git a/data/maps/DewfordTown_House1/border.bin b/data/layouts/DoubleBattleColosseum/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/DewfordTown_House1/border.bin
+++ b/data/layouts/DoubleBattleColosseum/border.bin
diff --git a/data/layouts/DoubleBattleColosseum/layout.inc b/data/layouts/DoubleBattleColosseum/layout.inc
new file mode 100644
index 000000000..61d112c1e
--- /dev/null
+++ b/data/layouts/DoubleBattleColosseum/layout.inc
@@ -0,0 +1,15 @@
+DoubleBattleColosseum_MapBorder::
+	.incbin "data/layouts/DoubleBattleColosseum/border.bin"
+
+DoubleBattleColosseum_MapBlockdata::
+	.incbin "data/layouts/DoubleBattleColosseum/map.bin"
+
+	.align 2
+DoubleBattleColosseum_Layout::
+	.4byte 0xe
+	.4byte 0x9
+	.4byte DoubleBattleColosseum_MapBorder
+	.4byte DoubleBattleColosseum_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
+
diff --git a/data/maps/DoubleBattleColosseum/map.bin b/data/layouts/DoubleBattleColosseum/map.bin
index 77606e818..77606e818 100644
--- a/data/maps/DoubleBattleColosseum/map.bin
+++ b/data/layouts/DoubleBattleColosseum/map.bin
diff --git a/data/maps/EverGrandeCity/border.bin b/data/layouts/EverGrandeCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/EverGrandeCity/border.bin
+++ b/data/layouts/EverGrandeCity/border.bin
diff --git a/data/layouts/EverGrandeCity/layout.inc b/data/layouts/EverGrandeCity/layout.inc
new file mode 100644
index 000000000..16c02fbaa
--- /dev/null
+++ b/data/layouts/EverGrandeCity/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_MapBorder::
+	.incbin "data/layouts/EverGrandeCity/border.bin"
+
+EverGrandeCity_MapBlockdata::
+	.incbin "data/layouts/EverGrandeCity/map.bin"
+
+	.align 2
+EverGrandeCity_Layout::
+	.4byte 0x28
+	.4byte 0x50
+	.4byte EverGrandeCity_MapBorder
+	.4byte EverGrandeCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_EverGrande
+
diff --git a/data/maps/EverGrandeCity/map.bin b/data/layouts/EverGrandeCity/map.bin
index 33b271d5d..33b271d5d 100644
--- a/data/maps/EverGrandeCity/map.bin
+++ b/data/layouts/EverGrandeCity/map.bin
diff --git a/data/maps/EverGrandeCity_Hall1/border.bin b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_Hall1/border.bin
+++ b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc
new file mode 100644
index 000000000..dad4c7ef3
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_ChampionsRoom_MapBorder::
+	.incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin"
+
+EverGrandeCity_ChampionsRoom_MapBlockdata::
+	.incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin"
+
+	.align 2
+EverGrandeCity_ChampionsRoom_Layout::
+	.4byte 0xd
+	.4byte 0xd
+	.4byte EverGrandeCity_ChampionsRoom_MapBorder
+	.4byte EverGrandeCity_ChampionsRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
+
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.bin b/data/layouts/EverGrandeCity_ChampionsRoom/map.bin
index a234307b5..a234307b5 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/map.bin
+++ b/data/layouts/EverGrandeCity_ChampionsRoom/map.bin
diff --git a/data/maps/EverGrandeCity_Hall4/border.bin b/data/layouts/EverGrandeCity_DrakesRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_Hall4/border.bin
+++ b/data/layouts/EverGrandeCity_DrakesRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc
new file mode 100644
index 000000000..9c140d49d
--- /dev/null
+++ b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_DrakesRoom_MapBorder::
+	.incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin"
+
+EverGrandeCity_DrakesRoom_MapBlockdata::
+	.incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin"
+
+	.align 2
+EverGrandeCity_DrakesRoom_Layout::
+	.4byte 0xd
+	.4byte 0xe
+	.4byte EverGrandeCity_DrakesRoom_MapBorder
+	.4byte EverGrandeCity_DrakesRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
+
diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.bin b/data/layouts/EverGrandeCity_DrakesRoom/map.bin
index 3b5248d98..3b5248d98 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/map.bin
+++ b/data/layouts/EverGrandeCity_DrakesRoom/map.bin
diff --git a/data/maps/EverGrandeCity_HallOfFame/border.bin b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_HallOfFame/border.bin
+++ b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc
new file mode 100644
index 000000000..bcd610d8c
--- /dev/null
+++ b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_GlaciasRoom_MapBorder::
+	.incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin"
+
+EverGrandeCity_GlaciasRoom_MapBlockdata::
+	.incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin"
+
+	.align 2
+EverGrandeCity_GlaciasRoom_Layout::
+	.4byte 0xd
+	.4byte 0xe
+	.4byte EverGrandeCity_GlaciasRoom_MapBorder
+	.4byte EverGrandeCity_GlaciasRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
+
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.bin b/data/layouts/EverGrandeCity_GlaciasRoom/map.bin
index 2d7db7377..2d7db7377 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/map.bin
+++ b/data/layouts/EverGrandeCity_GlaciasRoom/map.bin
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/border.bin b/data/layouts/EverGrandeCity_Hall4/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/border.bin
+++ b/data/layouts/EverGrandeCity_Hall4/border.bin
diff --git a/data/layouts/EverGrandeCity_Hall4/layout.inc b/data/layouts/EverGrandeCity_Hall4/layout.inc
new file mode 100644
index 000000000..464fc8998
--- /dev/null
+++ b/data/layouts/EverGrandeCity_Hall4/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_Hall4_MapBorder::
+	.incbin "data/layouts/EverGrandeCity_Hall4/border.bin"
+
+EverGrandeCity_Hall4_MapBlockdata::
+	.incbin "data/layouts/EverGrandeCity_Hall4/map.bin"
+
+	.align 2
+EverGrandeCity_Hall4_Layout::
+	.4byte 0xb
+	.4byte 0x22
+	.4byte EverGrandeCity_Hall4_MapBorder
+	.4byte EverGrandeCity_Hall4_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
+
diff --git a/data/maps/EverGrandeCity_Hall4/map.bin b/data/layouts/EverGrandeCity_Hall4/map.bin
index 580ae095a..580ae095a 100644
--- a/data/maps/EverGrandeCity_Hall4/map.bin
+++ b/data/layouts/EverGrandeCity_Hall4/map.bin
diff --git a/data/maps/EverGrandeCity_SidneysRoom/border.bin b/data/layouts/EverGrandeCity_HallOfFame/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/border.bin
+++ b/data/layouts/EverGrandeCity_HallOfFame/border.bin
diff --git a/data/layouts/EverGrandeCity_HallOfFame/layout.inc b/data/layouts/EverGrandeCity_HallOfFame/layout.inc
new file mode 100644
index 000000000..deaa4429d
--- /dev/null
+++ b/data/layouts/EverGrandeCity_HallOfFame/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_HallOfFame_MapBorder::
+	.incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin"
+
+EverGrandeCity_HallOfFame_MapBlockdata::
+	.incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin"
+
+	.align 2
+EverGrandeCity_HallOfFame_Layout::
+	.4byte 0xf
+	.4byte 0x11
+	.4byte EverGrandeCity_HallOfFame_MapBorder
+	.4byte EverGrandeCity_HallOfFame_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
+
diff --git a/data/maps/EverGrandeCity_HallOfFame/map.bin b/data/layouts/EverGrandeCity_HallOfFame/map.bin
index 1df9e4804..1df9e4804 100644
--- a/data/maps/EverGrandeCity_HallOfFame/map.bin
+++ b/data/layouts/EverGrandeCity_HallOfFame/map.bin
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/border.bin b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/border.bin
+++ b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc
new file mode 100644
index 000000000..b02d5c312
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_PhoebesRoom_MapBorder::
+	.incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin"
+
+EverGrandeCity_PhoebesRoom_MapBlockdata::
+	.incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin"
+
+	.align 2
+EverGrandeCity_PhoebesRoom_Layout::
+	.4byte 0xd
+	.4byte 0xe
+	.4byte EverGrandeCity_PhoebesRoom_MapBorder
+	.4byte EverGrandeCity_PhoebesRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
+
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.bin b/data/layouts/EverGrandeCity_PhoebesRoom/map.bin
index 2e75b706c..2e75b706c 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/map.bin
+++ b/data/layouts/EverGrandeCity_PhoebesRoom/map.bin
diff --git a/data/maps/DewfordTown_House2/border.bin b/data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/DewfordTown_House2/border.bin
+++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin
diff --git a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc
new file mode 100644
index 000000000..d84e6449f
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_PokemonLeague_1F_MapBorder::
+	.incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin"
+
+EverGrandeCity_PokemonLeague_1F_MapBlockdata::
+	.incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin"
+
+	.align 2
+EverGrandeCity_PokemonLeague_1F_Layout::
+	.4byte 0x13
+	.4byte 0xc
+	.4byte EverGrandeCity_PokemonLeague_1F_MapBorder
+	.4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
+
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.bin b/data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin
index 6bab68102..6bab68102 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.bin
+++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin
diff --git a/data/maps/FallarborTown_BattleTentCorridor/border.bin b/data/layouts/EverGrandeCity_ShortHall/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/FallarborTown_BattleTentCorridor/border.bin
+++ b/data/layouts/EverGrandeCity_ShortHall/border.bin
diff --git a/data/layouts/EverGrandeCity_ShortHall/layout.inc b/data/layouts/EverGrandeCity_ShortHall/layout.inc
new file mode 100644
index 000000000..2159c894d
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ShortHall/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_ShortHall_MapBorder::
+	.incbin "data/layouts/EverGrandeCity_ShortHall/border.bin"
+
+EverGrandeCity_ShortHall_MapBlockdata::
+	.incbin "data/layouts/EverGrandeCity_ShortHall/map.bin"
+
+	.align 2
+EverGrandeCity_ShortHall_Layout::
+	.4byte 0xb
+	.4byte 0xd
+	.4byte EverGrandeCity_ShortHall_MapBorder
+	.4byte EverGrandeCity_ShortHall_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
+
diff --git a/data/maps/EverGrandeCity_Hall1/map.bin b/data/layouts/EverGrandeCity_ShortHall/map.bin
index 75812b238..75812b238 100644
--- a/data/maps/EverGrandeCity_Hall1/map.bin
+++ b/data/layouts/EverGrandeCity_ShortHall/map.bin
diff --git a/data/maps/FallarborTown_BattleTentLobby/border.bin b/data/layouts/EverGrandeCity_SidneysRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/FallarborTown_BattleTentLobby/border.bin
+++ b/data/layouts/EverGrandeCity_SidneysRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc
new file mode 100644
index 000000000..86ffa16a1
--- /dev/null
+++ b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_SidneysRoom_MapBorder::
+	.incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin"
+
+EverGrandeCity_SidneysRoom_MapBlockdata::
+	.incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin"
+
+	.align 2
+EverGrandeCity_SidneysRoom_Layout::
+	.4byte 0xd
+	.4byte 0xe
+	.4byte EverGrandeCity_SidneysRoom_MapBorder
+	.4byte EverGrandeCity_SidneysRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
+
diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.bin b/data/layouts/EverGrandeCity_SidneysRoom/map.bin
index ebca00c5c..ebca00c5c 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/map.bin
+++ b/data/layouts/EverGrandeCity_SidneysRoom/map.bin
diff --git a/data/maps/FallarborTown/border.bin b/data/layouts/FallarborTown/border.bin
index 23e2a92e5..23e2a92e5 100644
--- a/data/maps/FallarborTown/border.bin
+++ b/data/layouts/FallarborTown/border.bin
diff --git a/data/layouts/FallarborTown/layout.inc b/data/layouts/FallarborTown/layout.inc
new file mode 100644
index 000000000..7f0894903
--- /dev/null
+++ b/data/layouts/FallarborTown/layout.inc
@@ -0,0 +1,15 @@
+FallarborTown_MapBorder::
+	.incbin "data/layouts/FallarborTown/border.bin"
+
+FallarborTown_MapBlockdata::
+	.incbin "data/layouts/FallarborTown/map.bin"
+
+	.align 2
+FallarborTown_Layout::
+	.4byte 0x14
+	.4byte 0x14
+	.4byte FallarborTown_MapBorder
+	.4byte FallarborTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
+
diff --git a/data/maps/FallarborTown/map.bin b/data/layouts/FallarborTown/map.bin
index 950a54761..950a54761 100644
--- a/data/maps/FallarborTown/map.bin
+++ b/data/layouts/FallarborTown/map.bin
diff --git a/data/maps/DoubleBattleColosseum/border.bin b/data/layouts/FallarborTown_LeftoverRSContestHall/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/DoubleBattleColosseum/border.bin
+++ b/data/layouts/FallarborTown_LeftoverRSContestHall/border.bin
diff --git a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc
new file mode 100644
index 000000000..66acc546b
--- /dev/null
+++ b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc
@@ -0,0 +1,15 @@
+FallarborTown_LeftoverRSContestHall_MapBorder::
+	.incbin "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin"
+
+FallarborTown_LeftoverRSContestHall_MapBlockdata::
+	.incbin "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin"
+
+	.align 2
+FallarborTown_LeftoverRSContestHall_Layout::
+	.4byte 0x15
+	.4byte 0x12
+	.4byte FallarborTown_LeftoverRSContestHall_MapBorder
+	.4byte FallarborTown_LeftoverRSContestHall_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
+
diff --git a/data/maps/FallarborTown_LeftoverRSContestHall/map.bin b/data/layouts/FallarborTown_LeftoverRSContestHall/map.bin
index d65e7c489..d65e7c489 100644
--- a/data/maps/FallarborTown_LeftoverRSContestHall/map.bin
+++ b/data/layouts/FallarborTown_LeftoverRSContestHall/map.bin
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/border.bin b/data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/border.bin
+++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin
diff --git a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc
new file mode 100644
index 000000000..3ad232728
--- /dev/null
+++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc
@@ -0,0 +1,15 @@
+FallarborTown_LeftoverRSContestLobby_MapBorder::
+	.incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin"
+
+FallarborTown_LeftoverRSContestLobby_MapBlockdata::
+	.incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin"
+
+	.align 2
+FallarborTown_LeftoverRSContestLobby_Layout::
+	.4byte 0xf
+	.4byte 0x7
+	.4byte FallarborTown_LeftoverRSContestLobby_MapBorder
+	.4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
+
diff --git a/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin b/data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin
index 87407546a..87407546a 100644
--- a/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin
+++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin
diff --git a/data/maps/FarawayIsland_Entrance/border.bin b/data/layouts/FarawayIsland_Entrance/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/FarawayIsland_Entrance/border.bin
+++ b/data/layouts/FarawayIsland_Entrance/border.bin
diff --git a/data/layouts/FarawayIsland_Entrance/layout.inc b/data/layouts/FarawayIsland_Entrance/layout.inc
new file mode 100644
index 000000000..c7d6bef91
--- /dev/null
+++ b/data/layouts/FarawayIsland_Entrance/layout.inc
@@ -0,0 +1,15 @@
+FarawayIsland_Entrance_MapBorder::
+	.incbin "data/layouts/FarawayIsland_Entrance/border.bin"
+
+FarawayIsland_Entrance_MapBlockdata::
+	.incbin "data/layouts/FarawayIsland_Entrance/map.bin"
+
+	.align 2
+FarawayIsland_Entrance_Layout::
+	.4byte 0x22
+	.4byte 0x2e
+	.4byte FarawayIsland_Entrance_MapBorder
+	.4byte FarawayIsland_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
+
diff --git a/data/maps/FarawayIsland_Entrance/map.bin b/data/layouts/FarawayIsland_Entrance/map.bin
index 389f6b0cd..389f6b0cd 100644
--- a/data/maps/FarawayIsland_Entrance/map.bin
+++ b/data/layouts/FarawayIsland_Entrance/map.bin
diff --git a/data/maps/FarawayIsland_Interior/border.bin b/data/layouts/FarawayIsland_Interior/border.bin
index addb5d6ce..addb5d6ce 100644
--- a/data/maps/FarawayIsland_Interior/border.bin
+++ b/data/layouts/FarawayIsland_Interior/border.bin
diff --git a/data/layouts/FarawayIsland_Interior/layout.inc b/data/layouts/FarawayIsland_Interior/layout.inc
new file mode 100644
index 000000000..787dd53c9
--- /dev/null
+++ b/data/layouts/FarawayIsland_Interior/layout.inc
@@ -0,0 +1,15 @@
+FarawayIsland_Interior_MapBorder::
+	.incbin "data/layouts/FarawayIsland_Interior/border.bin"
+
+FarawayIsland_Interior_MapBlockdata::
+	.incbin "data/layouts/FarawayIsland_Interior/map.bin"
+
+	.align 2
+FarawayIsland_Interior_Layout::
+	.4byte 0x1d
+	.4byte 0x1a
+	.4byte FarawayIsland_Interior_MapBorder
+	.4byte FarawayIsland_Interior_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fortree
+
diff --git a/data/maps/FarawayIsland_Interior/map.bin b/data/layouts/FarawayIsland_Interior/map.bin
index 847295734..847295734 100644
--- a/data/maps/FarawayIsland_Interior/map.bin
+++ b/data/layouts/FarawayIsland_Interior/map.bin
diff --git a/data/maps/FieryPath/border.bin b/data/layouts/FieryPath/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/FieryPath/border.bin
+++ b/data/layouts/FieryPath/border.bin
diff --git a/data/layouts/FieryPath/layout.inc b/data/layouts/FieryPath/layout.inc
new file mode 100644
index 000000000..c129ae715
--- /dev/null
+++ b/data/layouts/FieryPath/layout.inc
@@ -0,0 +1,15 @@
+FieryPath_MapBorder::
+	.incbin "data/layouts/FieryPath/border.bin"
+
+FieryPath_MapBlockdata::
+	.incbin "data/layouts/FieryPath/map.bin"
+
+	.align 2
+FieryPath_Layout::
+	.4byte 0x23
+	.4byte 0x26
+	.4byte FieryPath_MapBorder
+	.4byte FieryPath_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
+
diff --git a/data/maps/FieryPath/map.bin b/data/layouts/FieryPath/map.bin
index 5928fb173..5928fb173 100644
--- a/data/maps/FieryPath/map.bin
+++ b/data/layouts/FieryPath/map.bin
diff --git a/data/maps/FortreeCity/border.bin b/data/layouts/FortreeCity/border.bin
index addb5d6ce..addb5d6ce 100644
--- a/data/maps/FortreeCity/border.bin
+++ b/data/layouts/FortreeCity/border.bin
diff --git a/data/layouts/FortreeCity/layout.inc b/data/layouts/FortreeCity/layout.inc
new file mode 100644
index 000000000..02564b36a
--- /dev/null
+++ b/data/layouts/FortreeCity/layout.inc
@@ -0,0 +1,15 @@
+FortreeCity_MapBorder::
+	.incbin "data/layouts/FortreeCity/border.bin"
+
+FortreeCity_MapBlockdata::
+	.incbin "data/layouts/FortreeCity/map.bin"
+
+	.align 2
+FortreeCity_Layout::
+	.4byte 0x28
+	.4byte 0x14
+	.4byte FortreeCity_MapBorder
+	.4byte FortreeCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fortree
+
diff --git a/data/maps/FortreeCity/map.bin b/data/layouts/FortreeCity/map.bin
index a2aa40e98..a2aa40e98 100644
--- a/data/maps/FortreeCity/map.bin
+++ b/data/layouts/FortreeCity/map.bin
diff --git a/data/maps/FallarborTown_LeftoverRSContestHall/border.bin b/data/layouts/FortreeCity_DecorationShop/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FallarborTown_LeftoverRSContestHall/border.bin
+++ b/data/layouts/FortreeCity_DecorationShop/border.bin
diff --git a/data/layouts/FortreeCity_DecorationShop/layout.inc b/data/layouts/FortreeCity_DecorationShop/layout.inc
new file mode 100644
index 000000000..6460a35b5
--- /dev/null
+++ b/data/layouts/FortreeCity_DecorationShop/layout.inc
@@ -0,0 +1,15 @@
+FortreeCity_DecorationShop_MapBorder::
+	.incbin "data/layouts/FortreeCity_DecorationShop/border.bin"
+
+FortreeCity_DecorationShop_MapBlockdata::
+	.incbin "data/layouts/FortreeCity_DecorationShop/map.bin"
+
+	.align 2
+FortreeCity_DecorationShop_Layout::
+	.4byte 0x8
+	.4byte 0x6
+	.4byte FortreeCity_DecorationShop_MapBorder
+	.4byte FortreeCity_DecorationShop_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/FortreeCity_DecorationShop/map.bin b/data/layouts/FortreeCity_DecorationShop/map.bin
index 6ca8b4e61..6ca8b4e61 100644
--- a/data/maps/FortreeCity_DecorationShop/map.bin
+++ b/data/layouts/FortreeCity_DecorationShop/map.bin
diff --git a/data/maps/FortreeCity_Gym/border.bin b/data/layouts/FortreeCity_Gym/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/FortreeCity_Gym/border.bin
+++ b/data/layouts/FortreeCity_Gym/border.bin
diff --git a/data/layouts/FortreeCity_Gym/layout.inc b/data/layouts/FortreeCity_Gym/layout.inc
new file mode 100644
index 000000000..da7f1e73e
--- /dev/null
+++ b/data/layouts/FortreeCity_Gym/layout.inc
@@ -0,0 +1,15 @@
+FortreeCity_Gym_MapBorder::
+	.incbin "data/layouts/FortreeCity_Gym/border.bin"
+
+FortreeCity_Gym_MapBlockdata::
+	.incbin "data/layouts/FortreeCity_Gym/map.bin"
+
+	.align 2
+FortreeCity_Gym_Layout::
+	.4byte 0x14
+	.4byte 0x19
+	.4byte FortreeCity_Gym_MapBorder
+	.4byte FortreeCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_FortreeGym
+
diff --git a/data/maps/FortreeCity_Gym/map.bin b/data/layouts/FortreeCity_Gym/map.bin
index cff943707..cff943707 100644
--- a/data/maps/FortreeCity_Gym/map.bin
+++ b/data/layouts/FortreeCity_Gym/map.bin
diff --git a/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin b/data/layouts/FortreeCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin
+++ b/data/layouts/FortreeCity_House1/border.bin
diff --git a/data/layouts/FortreeCity_House1/layout.inc b/data/layouts/FortreeCity_House1/layout.inc
new file mode 100644
index 000000000..214846c22
--- /dev/null
+++ b/data/layouts/FortreeCity_House1/layout.inc
@@ -0,0 +1,15 @@
+FortreeCity_House1_MapBorder::
+	.incbin "data/layouts/FortreeCity_House1/border.bin"
+
+FortreeCity_House1_MapBlockdata::
+	.incbin "data/layouts/FortreeCity_House1/map.bin"
+
+	.align 2
+FortreeCity_House1_Layout::
+	.4byte 0x8
+	.4byte 0x6
+	.4byte FortreeCity_House1_MapBorder
+	.4byte FortreeCity_House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/FortreeCity_House1/map.bin b/data/layouts/FortreeCity_House1/map.bin
index 5a3ac8cb6..5a3ac8cb6 100644
--- a/data/maps/FortreeCity_House1/map.bin
+++ b/data/layouts/FortreeCity_House1/map.bin
diff --git a/data/maps/FortreeCity_DecorationShop/border.bin b/data/layouts/FortreeCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FortreeCity_DecorationShop/border.bin
+++ b/data/layouts/FortreeCity_House2/border.bin
diff --git a/data/layouts/FortreeCity_House2/layout.inc b/data/layouts/FortreeCity_House2/layout.inc
new file mode 100644
index 000000000..3aa0898bf
--- /dev/null
+++ b/data/layouts/FortreeCity_House2/layout.inc
@@ -0,0 +1,15 @@
+FortreeCity_House2_MapBorder::
+	.incbin "data/layouts/FortreeCity_House2/border.bin"
+
+FortreeCity_House2_MapBlockdata::
+	.incbin "data/layouts/FortreeCity_House2/map.bin"
+
+	.align 2
+FortreeCity_House2_Layout::
+	.4byte 0x8
+	.4byte 0x6
+	.4byte FortreeCity_House2_MapBorder
+	.4byte FortreeCity_House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/FortreeCity_House2/map.bin b/data/layouts/FortreeCity_House2/map.bin
index 3fbcd6043..3fbcd6043 100644
--- a/data/maps/FortreeCity_House2/map.bin
+++ b/data/layouts/FortreeCity_House2/map.bin
diff --git a/data/maps/GraniteCave_1F/border.bin b/data/layouts/GraniteCave_1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/GraniteCave_1F/border.bin
+++ b/data/layouts/GraniteCave_1F/border.bin
diff --git a/data/layouts/GraniteCave_1F/layout.inc b/data/layouts/GraniteCave_1F/layout.inc
new file mode 100644
index 000000000..009fd12f5
--- /dev/null
+++ b/data/layouts/GraniteCave_1F/layout.inc
@@ -0,0 +1,15 @@
+GraniteCave_1F_MapBorder::
+	.incbin "data/layouts/GraniteCave_1F/border.bin"
+
+GraniteCave_1F_MapBlockdata::
+	.incbin "data/layouts/GraniteCave_1F/map.bin"
+
+	.align 2
+GraniteCave_1F_Layout::
+	.4byte 0x2a
+	.4byte 0xf
+	.4byte GraniteCave_1F_MapBorder
+	.4byte GraniteCave_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/GraniteCave_1F/map.bin b/data/layouts/GraniteCave_1F/map.bin
index 58c7945ab..58c7945ab 100644
--- a/data/maps/GraniteCave_1F/map.bin
+++ b/data/layouts/GraniteCave_1F/map.bin
diff --git a/data/maps/GraniteCave_B1F/border.bin b/data/layouts/GraniteCave_B1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/GraniteCave_B1F/border.bin
+++ b/data/layouts/GraniteCave_B1F/border.bin
diff --git a/data/layouts/GraniteCave_B1F/layout.inc b/data/layouts/GraniteCave_B1F/layout.inc
new file mode 100644
index 000000000..a57b238be
--- /dev/null
+++ b/data/layouts/GraniteCave_B1F/layout.inc
@@ -0,0 +1,15 @@
+GraniteCave_B1F_MapBorder::
+	.incbin "data/layouts/GraniteCave_B1F/border.bin"
+
+GraniteCave_B1F_MapBlockdata::
+	.incbin "data/layouts/GraniteCave_B1F/map.bin"
+
+	.align 2
+GraniteCave_B1F_Layout::
+	.4byte 0x20
+	.4byte 0x1a
+	.4byte GraniteCave_B1F_MapBorder
+	.4byte GraniteCave_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/GraniteCave_B1F/map.bin b/data/layouts/GraniteCave_B1F/map.bin
index 27f98c6cf..27f98c6cf 100644
--- a/data/maps/GraniteCave_B1F/map.bin
+++ b/data/layouts/GraniteCave_B1F/map.bin
diff --git a/data/maps/GraniteCave_B2F/border.bin b/data/layouts/GraniteCave_B2F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/GraniteCave_B2F/border.bin
+++ b/data/layouts/GraniteCave_B2F/border.bin
diff --git a/data/layouts/GraniteCave_B2F/layout.inc b/data/layouts/GraniteCave_B2F/layout.inc
new file mode 100644
index 000000000..7ffd04b00
--- /dev/null
+++ b/data/layouts/GraniteCave_B2F/layout.inc
@@ -0,0 +1,15 @@
+GraniteCave_B2F_MapBorder::
+	.incbin "data/layouts/GraniteCave_B2F/border.bin"
+
+GraniteCave_B2F_MapBlockdata::
+	.incbin "data/layouts/GraniteCave_B2F/map.bin"
+
+	.align 2
+GraniteCave_B2F_Layout::
+	.4byte 0x20
+	.4byte 0x1a
+	.4byte GraniteCave_B2F_MapBorder
+	.4byte GraniteCave_B2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/GraniteCave_B2F/map.bin b/data/layouts/GraniteCave_B2F/map.bin
index bbf8dc7af..bbf8dc7af 100644
--- a/data/maps/GraniteCave_B2F/map.bin
+++ b/data/layouts/GraniteCave_B2F/map.bin
diff --git a/data/maps/GraniteCave_StevensRoom/border.bin b/data/layouts/GraniteCave_StevensRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/GraniteCave_StevensRoom/border.bin
+++ b/data/layouts/GraniteCave_StevensRoom/border.bin
diff --git a/data/layouts/GraniteCave_StevensRoom/layout.inc b/data/layouts/GraniteCave_StevensRoom/layout.inc
new file mode 100644
index 000000000..5ee4fade4
--- /dev/null
+++ b/data/layouts/GraniteCave_StevensRoom/layout.inc
@@ -0,0 +1,15 @@
+GraniteCave_StevensRoom_MapBorder::
+	.incbin "data/layouts/GraniteCave_StevensRoom/border.bin"
+
+GraniteCave_StevensRoom_MapBlockdata::
+	.incbin "data/layouts/GraniteCave_StevensRoom/map.bin"
+
+	.align 2
+GraniteCave_StevensRoom_Layout::
+	.4byte 0xf
+	.4byte 0xe
+	.4byte GraniteCave_StevensRoom_MapBorder
+	.4byte GraniteCave_StevensRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/GraniteCave_StevensRoom/map.bin b/data/layouts/GraniteCave_StevensRoom/map.bin
index 3dc6987c2..3dc6987c2 100644
--- a/data/maps/GraniteCave_StevensRoom/map.bin
+++ b/data/layouts/GraniteCave_StevensRoom/map.bin
diff --git a/data/maps/FortreeCity_House1/border.bin b/data/layouts/Harbor/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FortreeCity_House1/border.bin
+++ b/data/layouts/Harbor/border.bin
diff --git a/data/layouts/Harbor/layout.inc b/data/layouts/Harbor/layout.inc
new file mode 100644
index 000000000..e95b8ec9d
--- /dev/null
+++ b/data/layouts/Harbor/layout.inc
@@ -0,0 +1,15 @@
+Harbor_MapBorder::
+	.incbin "data/layouts/Harbor/border.bin"
+
+Harbor_MapBlockdata::
+	.incbin "data/layouts/Harbor/map.bin"
+
+	.align 2
+Harbor_Layout::
+	.4byte 0x18
+	.4byte 0xf
+	.4byte Harbor_MapBorder
+	.4byte Harbor_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/SlateportCity_Harbor/map.bin b/data/layouts/Harbor/map.bin
index c77c1edfb..c77c1edfb 100644
--- a/data/maps/SlateportCity_Harbor/map.bin
+++ b/data/layouts/Harbor/map.bin
diff --git a/data/maps/LavaridgeTown_Gym_1F/border.bin b/data/layouts/House1/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LavaridgeTown_Gym_1F/border.bin
+++ b/data/layouts/House1/border.bin
diff --git a/data/layouts/House1/layout.inc b/data/layouts/House1/layout.inc
new file mode 100644
index 000000000..b93f24df4
--- /dev/null
+++ b/data/layouts/House1/layout.inc
@@ -0,0 +1,15 @@
+House1_MapBorder::
+	.incbin "data/layouts/House1/border.bin"
+
+House1_MapBlockdata::
+	.incbin "data/layouts/House1/map.bin"
+
+	.align 2
+House1_Layout::
+	.4byte 0xa
+	.4byte 0x9
+	.4byte House1_MapBorder
+	.4byte House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/OldaleTown_House1/map.bin b/data/layouts/House1/map.bin
index ea185484d..ea185484d 100644
--- a/data/maps/OldaleTown_House1/map.bin
+++ b/data/layouts/House1/map.bin
diff --git a/data/maps/LavaridgeTown_Gym_B1F/border.bin b/data/layouts/House2/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/border.bin
+++ b/data/layouts/House2/border.bin
diff --git a/data/layouts/House2/layout.inc b/data/layouts/House2/layout.inc
new file mode 100644
index 000000000..35566d8d1
--- /dev/null
+++ b/data/layouts/House2/layout.inc
@@ -0,0 +1,15 @@
+House2_MapBorder::
+	.incbin "data/layouts/House2/border.bin"
+
+House2_MapBlockdata::
+	.incbin "data/layouts/House2/map.bin"
+
+	.align 2
+House2_Layout::
+	.4byte 0xb
+	.4byte 0x8
+	.4byte House2_MapBorder
+	.4byte House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/OldaleTown_House2/map.bin b/data/layouts/House2/map.bin
index 0e9f07964..0e9f07964 100644
--- a/data/maps/OldaleTown_House2/map.bin
+++ b/data/layouts/House2/map.bin
diff --git a/data/maps/FortreeCity_House2/border.bin b/data/layouts/House3/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FortreeCity_House2/border.bin
+++ b/data/layouts/House3/border.bin
diff --git a/data/layouts/House3/layout.inc b/data/layouts/House3/layout.inc
new file mode 100644
index 000000000..6e2de11f4
--- /dev/null
+++ b/data/layouts/House3/layout.inc
@@ -0,0 +1,15 @@
+House3_MapBorder::
+	.incbin "data/layouts/House3/border.bin"
+
+House3_MapBlockdata::
+	.incbin "data/layouts/House3/map.bin"
+
+	.align 2
+House3_Layout::
+	.4byte 0xa
+	.4byte 0x8
+	.4byte House3_MapBorder
+	.4byte House3_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/DewfordTown_House1/map.bin b/data/layouts/House3/map.bin
index 1f732ba3f..1f732ba3f 100644
--- a/data/maps/DewfordTown_House1/map.bin
+++ b/data/layouts/House3/map.bin
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin b/data/layouts/House4/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin
+++ b/data/layouts/House4/border.bin
diff --git a/data/layouts/House4/layout.inc b/data/layouts/House4/layout.inc
new file mode 100644
index 000000000..b06b3d427
--- /dev/null
+++ b/data/layouts/House4/layout.inc
@@ -0,0 +1,15 @@
+House4_MapBorder::
+	.incbin "data/layouts/House4/border.bin"
+
+House4_MapBlockdata::
+	.incbin "data/layouts/House4/map.bin"
+
+	.align 2
+House4_Layout::
+	.4byte 0xa
+	.4byte 0x9
+	.4byte House4_MapBorder
+	.4byte House4_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/DewfordTown_House2/map.bin b/data/layouts/House4/map.bin
index 6274e4418..6274e4418 100644
--- a/data/maps/DewfordTown_House2/map.bin
+++ b/data/layouts/House4/map.bin
diff --git a/data/maps/LilycoveCity_ContestHall/border.bin b/data/layouts/HouseWithBed/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_ContestHall/border.bin
+++ b/data/layouts/HouseWithBed/border.bin
diff --git a/data/layouts/HouseWithBed/layout.inc b/data/layouts/HouseWithBed/layout.inc
new file mode 100644
index 000000000..7fb8d2c9b
--- /dev/null
+++ b/data/layouts/HouseWithBed/layout.inc
@@ -0,0 +1,15 @@
+HouseWithBed_MapBorder::
+	.incbin "data/layouts/HouseWithBed/border.bin"
+
+HouseWithBed_MapBlockdata::
+	.incbin "data/layouts/HouseWithBed/map.bin"
+
+	.align 2
+HouseWithBed_Layout::
+	.4byte 0xa
+	.4byte 0x8
+	.4byte HouseWithBed_MapBorder
+	.4byte HouseWithBed_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/PetalburgCity_House2/map.bin b/data/layouts/HouseWithBed/map.bin
index b91b7153b..b91b7153b 100644
--- a/data/maps/PetalburgCity_House2/map.bin
+++ b/data/layouts/HouseWithBed/map.bin
diff --git a/data/maps/InsideOfTruck/border.bin b/data/layouts/InsideOfTruck/border.bin
index 8459c2996..8459c2996 100644
--- a/data/maps/InsideOfTruck/border.bin
+++ b/data/layouts/InsideOfTruck/border.bin
diff --git a/data/layouts/InsideOfTruck/layout.inc b/data/layouts/InsideOfTruck/layout.inc
new file mode 100644
index 000000000..d1ddf8686
--- /dev/null
+++ b/data/layouts/InsideOfTruck/layout.inc
@@ -0,0 +1,15 @@
+InsideOfTruck_MapBorder::
+	.incbin "data/layouts/InsideOfTruck/border.bin"
+
+InsideOfTruck_MapBlockdata::
+	.incbin "data/layouts/InsideOfTruck/map.bin"
+
+	.align 2
+InsideOfTruck_Layout::
+	.4byte 0x5
+	.4byte 0x5
+	.4byte InsideOfTruck_MapBorder
+	.4byte InsideOfTruck_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideOfTruck
+
diff --git a/data/maps/InsideOfTruck/map.bin b/data/layouts/InsideOfTruck/map.bin
index 84b946be5..84b946be5 100644
--- a/data/maps/InsideOfTruck/map.bin
+++ b/data/layouts/InsideOfTruck/map.bin
diff --git a/data/maps/IslandCave/border.bin b/data/layouts/IslandCave/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/maps/IslandCave/border.bin
+++ b/data/layouts/IslandCave/border.bin
diff --git a/data/layouts/IslandCave/layout.inc b/data/layouts/IslandCave/layout.inc
new file mode 100644
index 000000000..5a3035b72
--- /dev/null
+++ b/data/layouts/IslandCave/layout.inc
@@ -0,0 +1,15 @@
+IslandCave_MapBorder::
+	.incbin "data/layouts/IslandCave/border.bin"
+
+IslandCave_MapBlockdata::
+	.incbin "data/layouts/IslandCave/map.bin"
+
+	.align 2
+IslandCave_Layout::
+	.4byte 0x11
+	.4byte 0x21
+	.4byte IslandCave_MapBorder
+	.4byte IslandCave_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/IslandCave/map.bin b/data/layouts/IslandCave/map.bin
index a7fa61b4d..a7fa61b4d 100644
--- a/data/maps/IslandCave/map.bin
+++ b/data/layouts/IslandCave/map.bin
diff --git a/data/maps/LilycoveCity_ContestLobby/border.bin b/data/layouts/IslandHarbor/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_ContestLobby/border.bin
+++ b/data/layouts/IslandHarbor/border.bin
diff --git a/data/layouts/IslandHarbor/layout.inc b/data/layouts/IslandHarbor/layout.inc
new file mode 100644
index 000000000..7fc86dca4
--- /dev/null
+++ b/data/layouts/IslandHarbor/layout.inc
@@ -0,0 +1,15 @@
+IslandHarbor_MapBorder::
+	.incbin "data/layouts/IslandHarbor/border.bin"
+
+IslandHarbor_MapBlockdata::
+	.incbin "data/layouts/IslandHarbor/map.bin"
+
+	.align 2
+IslandHarbor_Layout::
+	.4byte 0x11
+	.4byte 0xd
+	.4byte IslandHarbor_MapBorder
+	.4byte IslandHarbor_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_IslandHarbor
+
diff --git a/data/maps/BirthIsland_Harbor/map.bin b/data/layouts/IslandHarbor/map.bin
index e14816107..e14816107 100644
--- a/data/maps/BirthIsland_Harbor/map.bin
+++ b/data/layouts/IslandHarbor/map.bin
diff --git a/data/maps/JaggedPass/border.bin b/data/layouts/JaggedPass/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/JaggedPass/border.bin
+++ b/data/layouts/JaggedPass/border.bin
diff --git a/data/layouts/JaggedPass/layout.inc b/data/layouts/JaggedPass/layout.inc
new file mode 100644
index 000000000..5620551b8
--- /dev/null
+++ b/data/layouts/JaggedPass/layout.inc
@@ -0,0 +1,15 @@
+JaggedPass_MapBorder::
+	.incbin "data/layouts/JaggedPass/border.bin"
+
+JaggedPass_MapBlockdata::
+	.incbin "data/layouts/JaggedPass/map.bin"
+
+	.align 2
+JaggedPass_Layout::
+	.4byte 0x1e
+	.4byte 0x2e
+	.4byte JaggedPass_MapBorder
+	.4byte JaggedPass_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
+
diff --git a/data/maps/JaggedPass/map.bin b/data/layouts/JaggedPass/map.bin
index 57195b4f5..57195b4f5 100644
--- a/data/maps/JaggedPass/map.bin
+++ b/data/layouts/JaggedPass/map.bin
diff --git a/data/maps/LavaridgeTown/border.bin b/data/layouts/LavaridgeTown/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/LavaridgeTown/border.bin
+++ b/data/layouts/LavaridgeTown/border.bin
diff --git a/data/layouts/LavaridgeTown/layout.inc b/data/layouts/LavaridgeTown/layout.inc
new file mode 100644
index 000000000..662955430
--- /dev/null
+++ b/data/layouts/LavaridgeTown/layout.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_MapBorder::
+	.incbin "data/layouts/LavaridgeTown/border.bin"
+
+LavaridgeTown_MapBlockdata::
+	.incbin "data/layouts/LavaridgeTown/map.bin"
+
+	.align 2
+LavaridgeTown_Layout::
+	.4byte 0x14
+	.4byte 0x14
+	.4byte LavaridgeTown_MapBorder
+	.4byte LavaridgeTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
+
diff --git a/data/maps/LavaridgeTown/map.bin b/data/layouts/LavaridgeTown/map.bin
index 604ad5f3f..604ad5f3f 100644
--- a/data/maps/LavaridgeTown/map.bin
+++ b/data/layouts/LavaridgeTown/map.bin
diff --git a/data/maps/LavaridgeTown_HerbShop/border.bin b/data/layouts/LavaridgeTown_Gym_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LavaridgeTown_HerbShop/border.bin
+++ b/data/layouts/LavaridgeTown_Gym_1F/border.bin
diff --git a/data/layouts/LavaridgeTown_Gym_1F/layout.inc b/data/layouts/LavaridgeTown_Gym_1F/layout.inc
new file mode 100644
index 000000000..36f4cb826
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_1F/layout.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_Gym_1F_MapBorder::
+	.incbin "data/layouts/LavaridgeTown_Gym_1F/border.bin"
+
+LavaridgeTown_Gym_1F_MapBlockdata::
+	.incbin "data/layouts/LavaridgeTown_Gym_1F/map.bin"
+
+	.align 2
+LavaridgeTown_Gym_1F_Layout::
+	.4byte 0x11
+	.4byte 0x13
+	.4byte LavaridgeTown_Gym_1F_MapBorder
+	.4byte LavaridgeTown_Gym_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_LavaridgeGym
+
diff --git a/data/maps/LavaridgeTown_Gym_1F/map.bin b/data/layouts/LavaridgeTown_Gym_1F/map.bin
index 31d16da5e..31d16da5e 100644
--- a/data/maps/LavaridgeTown_Gym_1F/map.bin
+++ b/data/layouts/LavaridgeTown_Gym_1F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin b/data/layouts/LavaridgeTown_Gym_B1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin
+++ b/data/layouts/LavaridgeTown_Gym_B1F/border.bin
diff --git a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc
new file mode 100644
index 000000000..9b80d7f90
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_Gym_B1F_MapBorder::
+	.incbin "data/layouts/LavaridgeTown_Gym_B1F/border.bin"
+
+LavaridgeTown_Gym_B1F_MapBlockdata::
+	.incbin "data/layouts/LavaridgeTown_Gym_B1F/map.bin"
+
+	.align 2
+LavaridgeTown_Gym_B1F_Layout::
+	.4byte 0x11
+	.4byte 0x13
+	.4byte LavaridgeTown_Gym_B1F_MapBorder
+	.4byte LavaridgeTown_Gym_B1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_LavaridgeGym
+
diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.bin b/data/layouts/LavaridgeTown_Gym_B1F/map.bin
index aeaf0177c..aeaf0177c 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/map.bin
+++ b/data/layouts/LavaridgeTown_Gym_B1F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin b/data/layouts/LavaridgeTown_HerbShop/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin
+++ b/data/layouts/LavaridgeTown_HerbShop/border.bin
diff --git a/data/layouts/LavaridgeTown_HerbShop/layout.inc b/data/layouts/LavaridgeTown_HerbShop/layout.inc
new file mode 100644
index 000000000..c59e12e49
--- /dev/null
+++ b/data/layouts/LavaridgeTown_HerbShop/layout.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_HerbShop_MapBorder::
+	.incbin "data/layouts/LavaridgeTown_HerbShop/border.bin"
+
+LavaridgeTown_HerbShop_MapBlockdata::
+	.incbin "data/layouts/LavaridgeTown_HerbShop/map.bin"
+
+	.align 2
+LavaridgeTown_HerbShop_Layout::
+	.4byte 0xb
+	.4byte 0x8
+	.4byte LavaridgeTown_HerbShop_MapBorder
+	.4byte LavaridgeTown_HerbShop_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
+
diff --git a/data/maps/LavaridgeTown_HerbShop/map.bin b/data/layouts/LavaridgeTown_HerbShop/map.bin
index cc0294a80..cc0294a80 100644
--- a/data/maps/LavaridgeTown_HerbShop/map.bin
+++ b/data/layouts/LavaridgeTown_HerbShop/map.bin
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin
+++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin
diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc
new file mode 100644
index 000000000..e38d63815
--- /dev/null
+++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_PokemonCenter_1F_MapBorder::
+	.incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin"
+
+LavaridgeTown_PokemonCenter_1F_MapBlockdata::
+	.incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin"
+
+	.align 2
+LavaridgeTown_PokemonCenter_1F_Layout::
+	.4byte 0xe
+	.4byte 0x9
+	.4byte LavaridgeTown_PokemonCenter_1F_MapBorder
+	.4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
+
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin
index d841f9f1a..d841f9f1a 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin
+++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin
diff --git a/data/maps/LilycoveCity/border.bin b/data/layouts/LilycoveCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/LilycoveCity/border.bin
+++ b/data/layouts/LilycoveCity/border.bin
diff --git a/data/layouts/LilycoveCity/layout.inc b/data/layouts/LilycoveCity/layout.inc
new file mode 100644
index 000000000..ed4bd81e4
--- /dev/null
+++ b/data/layouts/LilycoveCity/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_MapBorder::
+	.incbin "data/layouts/LilycoveCity/border.bin"
+
+LilycoveCity_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity/map.bin"
+
+	.align 2
+LilycoveCity_Layout::
+	.4byte 0x50
+	.4byte 0x28
+	.4byte LilycoveCity_MapBorder
+	.4byte LilycoveCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
+
diff --git a/data/maps/LilycoveCity/map.bin b/data/layouts/LilycoveCity/map.bin
index 5d6b56ad9..5d6b56ad9 100644
--- a/data/maps/LilycoveCity/map.bin
+++ b/data/layouts/LilycoveCity/map.bin
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin b/data/layouts/LilycoveCity_ContestHall/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin
+++ b/data/layouts/LilycoveCity_ContestHall/border.bin
diff --git a/data/layouts/LilycoveCity_ContestHall/layout.inc b/data/layouts/LilycoveCity_ContestHall/layout.inc
new file mode 100644
index 000000000..61e6e27ee
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestHall/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_ContestHall_MapBorder::
+	.incbin "data/layouts/LilycoveCity_ContestHall/border.bin"
+
+LilycoveCity_ContestHall_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_ContestHall/map.bin"
+
+	.align 2
+LilycoveCity_ContestHall_Layout::
+	.4byte 0x33
+	.4byte 0x21
+	.4byte LilycoveCity_ContestHall_MapBorder
+	.4byte LilycoveCity_ContestHall_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
+
diff --git a/data/maps/LilycoveCity_ContestHall/map.bin b/data/layouts/LilycoveCity_ContestHall/map.bin
index 06fdae4f7..06fdae4f7 100644
--- a/data/maps/LilycoveCity_ContestHall/map.bin
+++ b/data/layouts/LilycoveCity_ContestHall/map.bin
diff --git a/data/maps/LilycoveCity_House2/border.bin b/data/layouts/LilycoveCity_ContestLobby/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_House2/border.bin
+++ b/data/layouts/LilycoveCity_ContestLobby/border.bin
diff --git a/data/layouts/LilycoveCity_ContestLobby/layout.inc b/data/layouts/LilycoveCity_ContestLobby/layout.inc
new file mode 100644
index 000000000..20cf4389f
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestLobby/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_ContestLobby_MapBorder::
+	.incbin "data/layouts/LilycoveCity_ContestLobby/border.bin"
+
+LilycoveCity_ContestLobby_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_ContestLobby/map.bin"
+
+	.align 2
+LilycoveCity_ContestLobby_Layout::
+	.4byte 0x1f
+	.4byte 0xc
+	.4byte LilycoveCity_ContestLobby_MapBorder
+	.4byte LilycoveCity_ContestLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
+
diff --git a/data/maps/LilycoveCity_ContestLobby/map.bin b/data/layouts/LilycoveCity_ContestLobby/map.bin
index 122962e42..122962e42 100644
--- a/data/maps/LilycoveCity_ContestLobby/map.bin
+++ b/data/layouts/LilycoveCity_ContestLobby/map.bin
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin
diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc
new file mode 100644
index 000000000..b275834f7
--- /dev/null
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_CoveLilyMotel_1F_MapBorder::
+	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin"
+
+LilycoveCity_CoveLilyMotel_1F_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin"
+
+	.align 2
+LilycoveCity_CoveLilyMotel_1F_Layout::
+	.4byte 0xc
+	.4byte 0x9
+	.4byte LilycoveCity_CoveLilyMotel_1F_MapBorder
+	.4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin
index 5242f8e57..5242f8e57 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin
diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc
new file mode 100644
index 000000000..82a294c48
--- /dev/null
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_CoveLilyMotel_2F_MapBorder::
+	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin"
+
+LilycoveCity_CoveLilyMotel_2F_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin"
+
+	.align 2
+LilycoveCity_CoveLilyMotel_2F_Layout::
+	.4byte 0xc
+	.4byte 0x9
+	.4byte LilycoveCity_CoveLilyMotel_2F_MapBorder
+	.4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin b/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin
index 4484b5b55..4484b5b55 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc
new file mode 100644
index 000000000..899e934bd
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStoreElevator_MapBorder::
+	.incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin"
+
+LilycoveCity_DepartmentStoreElevator_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStoreElevator_Layout::
+	.4byte 0x5
+	.4byte 0x6
+	.4byte LilycoveCity_DepartmentStoreElevator_MapBorder
+	.4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleFrontier
+
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin
index 7d9ae193b..7d9ae193b 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc
new file mode 100644
index 000000000..d40483308
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStoreRooftop_MapBorder::
+	.incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin"
+
+LilycoveCity_DepartmentStoreRooftop_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStoreRooftop_Layout::
+	.4byte 0x12
+	.4byte 0xc
+	.4byte LilycoveCity_DepartmentStoreRooftop_MapBorder
+	.4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
+
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin
index e9125baf0..e9125baf0 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc
new file mode 100644
index 000000000..d3b5d9420
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_1F_MapBorder::
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin"
+
+LilycoveCity_DepartmentStore_1F_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_1F_Layout::
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_1F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin
index 2d3d15360..2d3d15360 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc
new file mode 100644
index 000000000..e5b01c8fd
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_2F_MapBorder::
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin"
+
+LilycoveCity_DepartmentStore_2F_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_2F_Layout::
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_2F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin
index 82ca90b08..82ca90b08 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc
new file mode 100644
index 000000000..5d7aa93eb
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_3F_MapBorder::
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin"
+
+LilycoveCity_DepartmentStore_3F_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_3F_Layout::
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_3F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_3F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin
index c10b776f5..c10b776f5 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc
new file mode 100644
index 000000000..b4585ca03
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_4F_MapBorder::
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin"
+
+LilycoveCity_DepartmentStore_4F_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_4F_Layout::
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_4F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_4F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin
index bc1a09e2c..bc1a09e2c 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin
diff --git a/data/maps/MauvilleCity_GameCorner/border.bin b/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MauvilleCity_GameCorner/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc
new file mode 100644
index 000000000..ade5e4bf5
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_5F_MapBorder::
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin"
+
+LilycoveCity_DepartmentStore_5F_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_5F_Layout::
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_5F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_5F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin
index 80acc3900..80acc3900 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin b/data/layouts/LilycoveCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin
+++ b/data/layouts/LilycoveCity_House2/border.bin
diff --git a/data/layouts/LilycoveCity_House2/layout.inc b/data/layouts/LilycoveCity_House2/layout.inc
new file mode 100644
index 000000000..de51e7fd6
--- /dev/null
+++ b/data/layouts/LilycoveCity_House2/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_House2_MapBorder::
+	.incbin "data/layouts/LilycoveCity_House2/border.bin"
+
+LilycoveCity_House2_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_House2/map.bin"
+
+	.align 2
+LilycoveCity_House2_Layout::
+	.4byte 0x8
+	.4byte 0x8
+	.4byte LilycoveCity_House2_MapBorder
+	.4byte LilycoveCity_House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/LilycoveCity_House2/map.bin b/data/layouts/LilycoveCity_House2/map.bin
index e381f20eb..e381f20eb 100644
--- a/data/maps/LilycoveCity_House2/map.bin
+++ b/data/layouts/LilycoveCity_House2/map.bin
diff --git a/data/maps/LinkContestRoom1/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom1/border.bin
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin
diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc
new file mode 100644
index 000000000..0dab4095c
--- /dev/null
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_LilycoveMuseum_1F_MapBorder::
+	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin"
+
+LilycoveCity_LilycoveMuseum_1F_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin"
+
+	.align 2
+LilycoveCity_LilycoveMuseum_1F_Layout::
+	.4byte 0x15
+	.4byte 0xe
+	.4byte LilycoveCity_LilycoveMuseum_1F_MapBorder
+	.4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_LilycoveMuseum
+
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin
index 6e92a8b58..6e92a8b58 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin
diff --git a/data/maps/LinkContestRoom2/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom2/border.bin
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin
diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc
new file mode 100644
index 000000000..aea446410
--- /dev/null
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_LilycoveMuseum_2F_MapBorder::
+	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin"
+
+LilycoveCity_LilycoveMuseum_2F_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin"
+
+	.align 2
+LilycoveCity_LilycoveMuseum_2F_Layout::
+	.4byte 0x16
+	.4byte 0xd
+	.4byte LilycoveCity_LilycoveMuseum_2F_MapBorder
+	.4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_LilycoveMuseum
+
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin
index 76a918838..76a918838 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin
diff --git a/data/maps/LinkContestRoom3/border.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom3/border.bin
+++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin
diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc
new file mode 100644
index 000000000..9b30c7c08
--- /dev/null
+++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_PokemonTrainerFanClub_MapBorder::
+	.incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin"
+
+LilycoveCity_PokemonTrainerFanClub_MapBlockdata::
+	.incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin"
+
+	.align 2
+LilycoveCity_PokemonTrainerFanClub_Layout::
+	.4byte 0xc
+	.4byte 0xe
+	.4byte LilycoveCity_PokemonTrainerFanClub_MapBorder
+	.4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin
index cddfe5d9d..cddfe5d9d 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin
+++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin
diff --git a/data/maps/LinkContestRoom4/border.bin b/data/layouts/LinkContestRoom1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom4/border.bin
+++ b/data/layouts/LinkContestRoom1/border.bin
diff --git a/data/layouts/LinkContestRoom1/layout.inc b/data/layouts/LinkContestRoom1/layout.inc
new file mode 100644
index 000000000..e71fe2df3
--- /dev/null
+++ b/data/layouts/LinkContestRoom1/layout.inc
@@ -0,0 +1,15 @@
+LinkContestRoom1_MapBorder::
+	.incbin "data/layouts/LinkContestRoom1/border.bin"
+
+LinkContestRoom1_MapBlockdata::
+	.incbin "data/layouts/LinkContestRoom1/map.bin"
+
+	.align 2
+LinkContestRoom1_Layout::
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom1_MapBorder
+	.4byte LinkContestRoom1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
+
diff --git a/data/maps/LinkContestRoom1/map.bin b/data/layouts/LinkContestRoom1/map.bin
index a8853f6ae..a8853f6ae 100644
--- a/data/maps/LinkContestRoom1/map.bin
+++ b/data/layouts/LinkContestRoom1/map.bin
diff --git a/data/maps/LinkContestRoom5/border.bin b/data/layouts/LinkContestRoom2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom5/border.bin
+++ b/data/layouts/LinkContestRoom2/border.bin
diff --git a/data/layouts/LinkContestRoom2/layout.inc b/data/layouts/LinkContestRoom2/layout.inc
new file mode 100644
index 000000000..2dd66ab96
--- /dev/null
+++ b/data/layouts/LinkContestRoom2/layout.inc
@@ -0,0 +1,15 @@
+LinkContestRoom2_MapBorder::
+	.incbin "data/layouts/LinkContestRoom2/border.bin"
+
+LinkContestRoom2_MapBlockdata::
+	.incbin "data/layouts/LinkContestRoom2/map.bin"
+
+	.align 2
+LinkContestRoom2_Layout::
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom2_MapBorder
+	.4byte LinkContestRoom2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
+
diff --git a/data/maps/LinkContestRoom2/map.bin b/data/layouts/LinkContestRoom2/map.bin
index 7cb63b40d..7cb63b40d 100644
--- a/data/maps/LinkContestRoom2/map.bin
+++ b/data/layouts/LinkContestRoom2/map.bin
diff --git a/data/maps/LinkContestRoom6/border.bin b/data/layouts/LinkContestRoom3/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom6/border.bin
+++ b/data/layouts/LinkContestRoom3/border.bin
diff --git a/data/layouts/LinkContestRoom3/layout.inc b/data/layouts/LinkContestRoom3/layout.inc
new file mode 100644
index 000000000..c53cad723
--- /dev/null
+++ b/data/layouts/LinkContestRoom3/layout.inc
@@ -0,0 +1,15 @@
+LinkContestRoom3_MapBorder::
+	.incbin "data/layouts/LinkContestRoom3/border.bin"
+
+LinkContestRoom3_MapBlockdata::
+	.incbin "data/layouts/LinkContestRoom3/map.bin"
+
+	.align 2
+LinkContestRoom3_Layout::
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom3_MapBorder
+	.4byte LinkContestRoom3_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
+
diff --git a/data/maps/LinkContestRoom3/map.bin b/data/layouts/LinkContestRoom3/map.bin
index 59e9e9182..59e9e9182 100644
--- a/data/maps/LinkContestRoom3/map.bin
+++ b/data/layouts/LinkContestRoom3/map.bin
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin b/data/layouts/LinkContestRoom4/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin
+++ b/data/layouts/LinkContestRoom4/border.bin
diff --git a/data/layouts/LinkContestRoom4/layout.inc b/data/layouts/LinkContestRoom4/layout.inc
new file mode 100644
index 000000000..883918f37
--- /dev/null
+++ b/data/layouts/LinkContestRoom4/layout.inc
@@ -0,0 +1,15 @@
+LinkContestRoom4_MapBorder::
+	.incbin "data/layouts/LinkContestRoom4/border.bin"
+
+LinkContestRoom4_MapBlockdata::
+	.incbin "data/layouts/LinkContestRoom4/map.bin"
+
+	.align 2
+LinkContestRoom4_Layout::
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom4_MapBorder
+	.4byte LinkContestRoom4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
+
diff --git a/data/maps/LinkContestRoom4/map.bin b/data/layouts/LinkContestRoom4/map.bin
index 4e2166c19..4e2166c19 100644
--- a/data/maps/LinkContestRoom4/map.bin
+++ b/data/layouts/LinkContestRoom4/map.bin
diff --git a/data/maps/MeteorFalls_1F_1R/border.bin b/data/layouts/LinkContestRoom5/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MeteorFalls_1F_1R/border.bin
+++ b/data/layouts/LinkContestRoom5/border.bin
diff --git a/data/layouts/LinkContestRoom5/layout.inc b/data/layouts/LinkContestRoom5/layout.inc
new file mode 100644
index 000000000..72a9d9f4e
--- /dev/null
+++ b/data/layouts/LinkContestRoom5/layout.inc
@@ -0,0 +1,15 @@
+LinkContestRoom5_MapBorder::
+	.incbin "data/layouts/LinkContestRoom5/border.bin"
+
+LinkContestRoom5_MapBlockdata::
+	.incbin "data/layouts/LinkContestRoom5/map.bin"
+
+	.align 2
+LinkContestRoom5_Layout::
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom5_MapBorder
+	.4byte LinkContestRoom5_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
+
diff --git a/data/maps/LinkContestRoom5/map.bin b/data/layouts/LinkContestRoom5/map.bin
index ad068fe7c..ad068fe7c 100644
--- a/data/maps/LinkContestRoom5/map.bin
+++ b/data/layouts/LinkContestRoom5/map.bin
diff --git a/data/maps/MeteorFalls_1F_2R/border.bin b/data/layouts/LinkContestRoom6/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MeteorFalls_1F_2R/border.bin
+++ b/data/layouts/LinkContestRoom6/border.bin
diff --git a/data/layouts/LinkContestRoom6/layout.inc b/data/layouts/LinkContestRoom6/layout.inc
new file mode 100644
index 000000000..33db4b56d
--- /dev/null
+++ b/data/layouts/LinkContestRoom6/layout.inc
@@ -0,0 +1,15 @@
+LinkContestRoom6_MapBorder::
+	.incbin "data/layouts/LinkContestRoom6/border.bin"
+
+LinkContestRoom6_MapBlockdata::
+	.incbin "data/layouts/LinkContestRoom6/map.bin"
+
+	.align 2
+LinkContestRoom6_Layout::
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom6_MapBorder
+	.4byte LinkContestRoom6_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
+
diff --git a/data/maps/LinkContestRoom6/map.bin b/data/layouts/LinkContestRoom6/map.bin
index 9fcec5a5e..9fcec5a5e 100644
--- a/data/maps/LinkContestRoom6/map.bin
+++ b/data/layouts/LinkContestRoom6/map.bin
diff --git a/data/maps/LittlerootTown/border.bin b/data/layouts/LittlerootTown/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/LittlerootTown/border.bin
+++ b/data/layouts/LittlerootTown/border.bin
diff --git a/data/layouts/LittlerootTown/layout.inc b/data/layouts/LittlerootTown/layout.inc
new file mode 100644
index 000000000..8193ac695
--- /dev/null
+++ b/data/layouts/LittlerootTown/layout.inc
@@ -0,0 +1,15 @@
+LittlerootTown_MapBorder::
+	.incbin "data/layouts/LittlerootTown/border.bin"
+
+LittlerootTown_MapBlockdata::
+	.incbin "data/layouts/LittlerootTown/map.bin"
+
+	.align 2
+LittlerootTown_Layout::
+	.4byte 0x14
+	.4byte 0x14
+	.4byte LittlerootTown_MapBorder
+	.4byte LittlerootTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
+
diff --git a/data/maps/LittlerootTown/map.bin b/data/layouts/LittlerootTown/map.bin
index 9af76f90e..9af76f90e 100644
--- a/data/maps/LittlerootTown/map.bin
+++ b/data/layouts/LittlerootTown/map.bin
diff --git a/data/maps/MauvilleCity_Gym/border.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MauvilleCity_Gym/border.bin
+++ b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin
diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc
new file mode 100644
index 000000000..092c7d20b
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc
@@ -0,0 +1,15 @@
+LittlerootTown_BrendansHouse_1F_MapBorder::
+	.incbin "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin"
+
+LittlerootTown_BrendansHouse_1F_MapBlockdata::
+	.incbin "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin"
+
+	.align 2
+LittlerootTown_BrendansHouse_1F_Layout::
+	.4byte 0xb
+	.4byte 0x9
+	.4byte LittlerootTown_BrendansHouse_1F_MapBorder
+	.4byte LittlerootTown_BrendansHouse_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
+
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin
index 3ae8e69a6..3ae8e69a6 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin
+++ b/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin b/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin
+++ b/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin
diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc
new file mode 100644
index 000000000..5235f4d98
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc
@@ -0,0 +1,15 @@
+LittlerootTown_BrendansHouse_2F_MapBorder::
+	.incbin "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin"
+
+LittlerootTown_BrendansHouse_2F_MapBlockdata::
+	.incbin "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin"
+
+	.align 2
+LittlerootTown_BrendansHouse_2F_Layout::
+	.4byte 0x9
+	.4byte 0x8
+	.4byte LittlerootTown_BrendansHouse_2F_MapBorder
+	.4byte LittlerootTown_BrendansHouse_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
+
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin
index bfa5b907e..bfa5b907e 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin
+++ b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/border.bin b/data/layouts/LittlerootTown_MaysHouse_1F/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/border.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_1F/border.bin
diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc
new file mode 100644
index 000000000..88b81a289
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc
@@ -0,0 +1,15 @@
+LittlerootTown_MaysHouse_1F_MapBorder::
+	.incbin "data/layouts/LittlerootTown_MaysHouse_1F/border.bin"
+
+LittlerootTown_MaysHouse_1F_MapBlockdata::
+	.incbin "data/layouts/LittlerootTown_MaysHouse_1F/map.bin"
+
+	.align 2
+LittlerootTown_MaysHouse_1F_Layout::
+	.4byte 0xb
+	.4byte 0x9
+	.4byte LittlerootTown_MaysHouse_1F_MapBorder
+	.4byte LittlerootTown_MaysHouse_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
+
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.bin b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin
index 21f62ebe3..21f62ebe3 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/map.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/border.bin b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/border.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc
new file mode 100644
index 000000000..0b6134dbd
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc
@@ -0,0 +1,15 @@
+LittlerootTown_MaysHouse_2F_MapBorder::
+	.incbin "data/layouts/LittlerootTown_MaysHouse_2F/border.bin"
+
+LittlerootTown_MaysHouse_2F_MapBlockdata::
+	.incbin "data/layouts/LittlerootTown_MaysHouse_2F/map.bin"
+
+	.align 2
+LittlerootTown_MaysHouse_2F_Layout::
+	.4byte 0x9
+	.4byte 0x8
+	.4byte LittlerootTown_MaysHouse_2F_MapBorder
+	.4byte LittlerootTown_MaysHouse_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
+
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.bin b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
index 5904a9639..5904a9639 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/map.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
diff --git a/data/maps/MeteorFalls_B1F_1R/border.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MeteorFalls_B1F_1R/border.bin
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin
diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc
new file mode 100644
index 000000000..d0be539a0
--- /dev/null
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc
@@ -0,0 +1,15 @@
+LittlerootTown_ProfessorBirchsLab_MapBorder::
+	.incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin"
+
+LittlerootTown_ProfessorBirchsLab_MapBlockdata::
+	.incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin"
+
+	.align 2
+LittlerootTown_ProfessorBirchsLab_Layout::
+	.4byte 0xd
+	.4byte 0xd
+	.4byte LittlerootTown_ProfessorBirchsLab_MapBorder
+	.4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
+
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin
index 0f84e80b2..0f84e80b2 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin
diff --git a/data/maps/MagmaHideout_1F/border.bin b/data/layouts/MagmaHideout_1F/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/MagmaHideout_1F/border.bin
+++ b/data/layouts/MagmaHideout_1F/border.bin
diff --git a/data/layouts/MagmaHideout_1F/layout.inc b/data/layouts/MagmaHideout_1F/layout.inc
new file mode 100644
index 000000000..b50c7f015
--- /dev/null
+++ b/data/layouts/MagmaHideout_1F/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_1F_MapBorder::
+	.incbin "data/layouts/MagmaHideout_1F/border.bin"
+
+MagmaHideout_1F_MapBlockdata::
+	.incbin "data/layouts/MagmaHideout_1F/map.bin"
+
+	.align 2
+MagmaHideout_1F_Layout::
+	.4byte 0x25
+	.4byte 0x26
+	.4byte MagmaHideout_1F_MapBorder
+	.4byte MagmaHideout_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
+
diff --git a/data/maps/MagmaHideout_1F/map.bin b/data/layouts/MagmaHideout_1F/map.bin
index fdf0d4252..fdf0d4252 100644
--- a/data/maps/MagmaHideout_1F/map.bin
+++ b/data/layouts/MagmaHideout_1F/map.bin
diff --git a/data/maps/MagmaHideout_2F_1R/border.bin b/data/layouts/MagmaHideout_2F_1R/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/MagmaHideout_2F_1R/border.bin
+++ b/data/layouts/MagmaHideout_2F_1R/border.bin
diff --git a/data/layouts/MagmaHideout_2F_1R/layout.inc b/data/layouts/MagmaHideout_2F_1R/layout.inc
new file mode 100644
index 000000000..b9f0d27d7
--- /dev/null
+++ b/data/layouts/MagmaHideout_2F_1R/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_2F_1R_MapBorder::
+	.incbin "data/layouts/MagmaHideout_2F_1R/border.bin"
+
+MagmaHideout_2F_1R_MapBlockdata::
+	.incbin "data/layouts/MagmaHideout_2F_1R/map.bin"
+
+	.align 2
+MagmaHideout_2F_1R_Layout::
+	.4byte 0x21
+	.4byte 0x27
+	.4byte MagmaHideout_2F_1R_MapBorder
+	.4byte MagmaHideout_2F_1R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
+
diff --git a/data/maps/MagmaHideout_2F_1R/map.bin b/data/layouts/MagmaHideout_2F_1R/map.bin
index d74c32347..d74c32347 100644
--- a/data/maps/MagmaHideout_2F_1R/map.bin
+++ b/data/layouts/MagmaHideout_2F_1R/map.bin
diff --git a/data/maps/MagmaHideout_2F_2R/border.bin b/data/layouts/MagmaHideout_2F_2R/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/MagmaHideout_2F_2R/border.bin
+++ b/data/layouts/MagmaHideout_2F_2R/border.bin
diff --git a/data/layouts/MagmaHideout_2F_2R/layout.inc b/data/layouts/MagmaHideout_2F_2R/layout.inc
new file mode 100644
index 000000000..01507909c
--- /dev/null
+++ b/data/layouts/MagmaHideout_2F_2R/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_2F_2R_MapBorder::
+	.incbin "data/layouts/MagmaHideout_2F_2R/border.bin"
+
+MagmaHideout_2F_2R_MapBlockdata::
+	.incbin "data/layouts/MagmaHideout_2F_2R/map.bin"
+
+	.align 2
+MagmaHideout_2F_2R_Layout::
+	.4byte 0x31
+	.4byte 0x1c
+	.4byte MagmaHideout_2F_2R_MapBorder
+	.4byte MagmaHideout_2F_2R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
+
diff --git a/data/maps/MagmaHideout_2F_2R/map.bin b/data/layouts/MagmaHideout_2F_2R/map.bin
index 34cbf7eaa..34cbf7eaa 100644
--- a/data/maps/MagmaHideout_2F_2R/map.bin
+++ b/data/layouts/MagmaHideout_2F_2R/map.bin
diff --git a/data/maps/MagmaHideout_2F_3R/border.bin b/data/layouts/MagmaHideout_2F_3R/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/MagmaHideout_2F_3R/border.bin
+++ b/data/layouts/MagmaHideout_2F_3R/border.bin
diff --git a/data/layouts/MagmaHideout_2F_3R/layout.inc b/data/layouts/MagmaHideout_2F_3R/layout.inc
new file mode 100644
index 000000000..d88fb50fd
--- /dev/null
+++ b/data/layouts/MagmaHideout_2F_3R/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_2F_3R_MapBorder::
+	.incbin "data/layouts/MagmaHideout_2F_3R/border.bin"
+
+MagmaHideout_2F_3R_MapBlockdata::
+	.incbin "data/layouts/MagmaHideout_2F_3R/map.bin"
+
+	.align 2
+MagmaHideout_2F_3R_Layout::
+	.4byte 0x3c
+	.4byte 0x13
+	.4byte MagmaHideout_2F_3R_MapBorder
+	.4byte MagmaHideout_2F_3R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
+
diff --git a/data/maps/MagmaHideout_2F_3R/map.bin b/data/layouts/MagmaHideout_2F_3R/map.bin
index f25017291..f25017291 100644
--- a/data/maps/MagmaHideout_2F_3R/map.bin
+++ b/data/layouts/MagmaHideout_2F_3R/map.bin
diff --git a/data/maps/MagmaHideout_3F_1R/border.bin b/data/layouts/MagmaHideout_3F_1R/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/MagmaHideout_3F_1R/border.bin
+++ b/data/layouts/MagmaHideout_3F_1R/border.bin
diff --git a/data/layouts/MagmaHideout_3F_1R/layout.inc b/data/layouts/MagmaHideout_3F_1R/layout.inc
new file mode 100644
index 000000000..c2199b2f2
--- /dev/null
+++ b/data/layouts/MagmaHideout_3F_1R/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_3F_1R_MapBorder::
+	.incbin "data/layouts/MagmaHideout_3F_1R/border.bin"
+
+MagmaHideout_3F_1R_MapBlockdata::
+	.incbin "data/layouts/MagmaHideout_3F_1R/map.bin"
+
+	.align 2
+MagmaHideout_3F_1R_Layout::
+	.4byte 0x1c
+	.4byte 0x18
+	.4byte MagmaHideout_3F_1R_MapBorder
+	.4byte MagmaHideout_3F_1R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
+
diff --git a/data/maps/MagmaHideout_3F_1R/map.bin b/data/layouts/MagmaHideout_3F_1R/map.bin
index da590f5dd..da590f5dd 100644
--- a/data/maps/MagmaHideout_3F_1R/map.bin
+++ b/data/layouts/MagmaHideout_3F_1R/map.bin
diff --git a/data/maps/MagmaHideout_3F_2R/border.bin b/data/layouts/MagmaHideout_3F_2R/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/MagmaHideout_3F_2R/border.bin
+++ b/data/layouts/MagmaHideout_3F_2R/border.bin
diff --git a/data/layouts/MagmaHideout_3F_2R/layout.inc b/data/layouts/MagmaHideout_3F_2R/layout.inc
new file mode 100644
index 000000000..2c4662a49
--- /dev/null
+++ b/data/layouts/MagmaHideout_3F_2R/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_3F_2R_MapBorder::
+	.incbin "data/layouts/MagmaHideout_3F_2R/border.bin"
+
+MagmaHideout_3F_2R_MapBlockdata::
+	.incbin "data/layouts/MagmaHideout_3F_2R/map.bin"
+
+	.align 2
+MagmaHideout_3F_2R_Layout::
+	.4byte 0x18
+	.4byte 0x11
+	.4byte MagmaHideout_3F_2R_MapBorder
+	.4byte MagmaHideout_3F_2R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
+
diff --git a/data/maps/MagmaHideout_3F_2R/map.bin b/data/layouts/MagmaHideout_3F_2R/map.bin
index 49857819a..49857819a 100644
--- a/data/maps/MagmaHideout_3F_2R/map.bin
+++ b/data/layouts/MagmaHideout_3F_2R/map.bin
diff --git a/data/maps/MagmaHideout_3F_3R/border.bin b/data/layouts/MagmaHideout_3F_3R/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/MagmaHideout_3F_3R/border.bin
+++ b/data/layouts/MagmaHideout_3F_3R/border.bin
diff --git a/data/layouts/MagmaHideout_3F_3R/layout.inc b/data/layouts/MagmaHideout_3F_3R/layout.inc
new file mode 100644
index 000000000..4042b9653
--- /dev/null
+++ b/data/layouts/MagmaHideout_3F_3R/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_3F_3R_MapBorder::
+	.incbin "data/layouts/MagmaHideout_3F_3R/border.bin"
+
+MagmaHideout_3F_3R_MapBlockdata::
+	.incbin "data/layouts/MagmaHideout_3F_3R/map.bin"
+
+	.align 2
+MagmaHideout_3F_3R_Layout::
+	.4byte 0x21
+	.4byte 0x18
+	.4byte MagmaHideout_3F_3R_MapBorder
+	.4byte MagmaHideout_3F_3R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
+
diff --git a/data/maps/MagmaHideout_3F_3R/map.bin b/data/layouts/MagmaHideout_3F_3R/map.bin
index 7c808ffb5..7c808ffb5 100644
--- a/data/maps/MagmaHideout_3F_3R/map.bin
+++ b/data/layouts/MagmaHideout_3F_3R/map.bin
diff --git a/data/maps/MagmaHideout_4F/border.bin b/data/layouts/MagmaHideout_4F/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/MagmaHideout_4F/border.bin
+++ b/data/layouts/MagmaHideout_4F/border.bin
diff --git a/data/layouts/MagmaHideout_4F/layout.inc b/data/layouts/MagmaHideout_4F/layout.inc
new file mode 100644
index 000000000..d7f8c547c
--- /dev/null
+++ b/data/layouts/MagmaHideout_4F/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_4F_MapBorder::
+	.incbin "data/layouts/MagmaHideout_4F/border.bin"
+
+MagmaHideout_4F_MapBlockdata::
+	.incbin "data/layouts/MagmaHideout_4F/map.bin"
+
+	.align 2
+MagmaHideout_4F_Layout::
+	.4byte 0x3b
+	.4byte 0x1c
+	.4byte MagmaHideout_4F_MapBorder
+	.4byte MagmaHideout_4F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
+
diff --git a/data/maps/MagmaHideout_4F/map.bin b/data/layouts/MagmaHideout_4F/map.bin
index 45a5547c6..45a5547c6 100644
--- a/data/maps/MagmaHideout_4F/map.bin
+++ b/data/layouts/MagmaHideout_4F/map.bin
diff --git a/data/maps/MarineCave_End/border.bin b/data/layouts/MarineCave_End/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/MarineCave_End/border.bin
+++ b/data/layouts/MarineCave_End/border.bin
diff --git a/data/layouts/MarineCave_End/layout.inc b/data/layouts/MarineCave_End/layout.inc
new file mode 100644
index 000000000..256338b89
--- /dev/null
+++ b/data/layouts/MarineCave_End/layout.inc
@@ -0,0 +1,15 @@
+MarineCave_End_MapBorder::
+	.incbin "data/layouts/MarineCave_End/border.bin"
+
+MarineCave_End_MapBlockdata::
+	.incbin "data/layouts/MarineCave_End/map.bin"
+
+	.align 2
+MarineCave_End_Layout::
+	.4byte 0x1b
+	.4byte 0x1e
+	.4byte MarineCave_End_MapBorder
+	.4byte MarineCave_End_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/MarineCave_End/map.bin b/data/layouts/MarineCave_End/map.bin
index 85138661d..85138661d 100644
--- a/data/maps/MarineCave_End/map.bin
+++ b/data/layouts/MarineCave_End/map.bin
diff --git a/data/maps/MarineCave_Entrance/border.bin b/data/layouts/MarineCave_Entrance/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/MarineCave_Entrance/border.bin
+++ b/data/layouts/MarineCave_Entrance/border.bin
diff --git a/data/layouts/MarineCave_Entrance/layout.inc b/data/layouts/MarineCave_Entrance/layout.inc
new file mode 100644
index 000000000..219c182d7
--- /dev/null
+++ b/data/layouts/MarineCave_Entrance/layout.inc
@@ -0,0 +1,15 @@
+MarineCave_Entrance_MapBorder::
+	.incbin "data/layouts/MarineCave_Entrance/border.bin"
+
+MarineCave_Entrance_MapBlockdata::
+	.incbin "data/layouts/MarineCave_Entrance/map.bin"
+
+	.align 2
+MarineCave_Entrance_Layout::
+	.4byte 0x14
+	.4byte 0x14
+	.4byte MarineCave_Entrance_MapBorder
+	.4byte MarineCave_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/MarineCave_Entrance/map.bin b/data/layouts/MarineCave_Entrance/map.bin
index 62aa8537f..62aa8537f 100644
--- a/data/maps/MarineCave_Entrance/map.bin
+++ b/data/layouts/MarineCave_Entrance/map.bin
diff --git a/data/maps/MossdeepCity_GameCorner_1F/border.bin b/data/layouts/Mart/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/border.bin
+++ b/data/layouts/Mart/border.bin
diff --git a/data/layouts/Mart/layout.inc b/data/layouts/Mart/layout.inc
new file mode 100644
index 000000000..5233e09ab
--- /dev/null
+++ b/data/layouts/Mart/layout.inc
@@ -0,0 +1,15 @@
+Mart_MapBorder::
+	.incbin "data/layouts/Mart/border.bin"
+
+Mart_MapBlockdata::
+	.incbin "data/layouts/Mart/map.bin"
+
+	.align 2
+Mart_Layout::
+	.4byte 0xb
+	.4byte 0x8
+	.4byte Mart_MapBorder
+	.4byte Mart_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
+
diff --git a/data/maps/OldaleTown_Mart/map.bin b/data/layouts/Mart/map.bin
index 08f393264..08f393264 100644
--- a/data/maps/OldaleTown_Mart/map.bin
+++ b/data/layouts/Mart/map.bin
diff --git a/data/maps/MauvilleCity/border.bin b/data/layouts/MauvilleCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/MauvilleCity/border.bin
+++ b/data/layouts/MauvilleCity/border.bin
diff --git a/data/layouts/MauvilleCity/layout.inc b/data/layouts/MauvilleCity/layout.inc
new file mode 100644
index 000000000..7a8c17da2
--- /dev/null
+++ b/data/layouts/MauvilleCity/layout.inc
@@ -0,0 +1,15 @@
+MauvilleCity_MapBorder::
+	.incbin "data/layouts/MauvilleCity/border.bin"
+
+MauvilleCity_MapBlockdata::
+	.incbin "data/layouts/MauvilleCity/map.bin"
+
+	.align 2
+MauvilleCity_Layout::
+	.4byte 0x28
+	.4byte 0x14
+	.4byte MauvilleCity_MapBorder
+	.4byte MauvilleCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
+
diff --git a/data/maps/MauvilleCity/map.bin b/data/layouts/MauvilleCity/map.bin
index 80a38e902..80a38e902 100644
--- a/data/maps/MauvilleCity/map.bin
+++ b/data/layouts/MauvilleCity/map.bin
diff --git a/data/maps/MauvilleCity_BikeShop/border.bin b/data/layouts/MauvilleCity_BikeShop/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/MauvilleCity_BikeShop/border.bin
+++ b/data/layouts/MauvilleCity_BikeShop/border.bin
diff --git a/data/layouts/MauvilleCity_BikeShop/layout.inc b/data/layouts/MauvilleCity_BikeShop/layout.inc
new file mode 100644
index 000000000..f0d358a35
--- /dev/null
+++ b/data/layouts/MauvilleCity_BikeShop/layout.inc
@@ -0,0 +1,15 @@
+MauvilleCity_BikeShop_MapBorder::
+	.incbin "data/layouts/MauvilleCity_BikeShop/border.bin"
+
+MauvilleCity_BikeShop_MapBlockdata::
+	.incbin "data/layouts/MauvilleCity_BikeShop/map.bin"
+
+	.align 2
+MauvilleCity_BikeShop_Layout::
+	.4byte 0xc
+	.4byte 0x9
+	.4byte MauvilleCity_BikeShop_MapBorder
+	.4byte MauvilleCity_BikeShop_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_BikeShop
+
diff --git a/data/maps/MauvilleCity_BikeShop/map.bin b/data/layouts/MauvilleCity_BikeShop/map.bin
index 9891b9fd5..9891b9fd5 100644
--- a/data/maps/MauvilleCity_BikeShop/map.bin
+++ b/data/layouts/MauvilleCity_BikeShop/map.bin
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/border.bin b/data/layouts/MauvilleCity_GameCorner/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/border.bin
+++ b/data/layouts/MauvilleCity_GameCorner/border.bin
diff --git a/data/layouts/MauvilleCity_GameCorner/layout.inc b/data/layouts/MauvilleCity_GameCorner/layout.inc
new file mode 100644
index 000000000..307f7205e
--- /dev/null
+++ b/data/layouts/MauvilleCity_GameCorner/layout.inc
@@ -0,0 +1,15 @@
+MauvilleCity_GameCorner_MapBorder::
+	.incbin "data/layouts/MauvilleCity_GameCorner/border.bin"
+
+MauvilleCity_GameCorner_MapBlockdata::
+	.incbin "data/layouts/MauvilleCity_GameCorner/map.bin"
+
+	.align 2
+MauvilleCity_GameCorner_Layout::
+	.4byte 0x16
+	.4byte 0xb
+	.4byte MauvilleCity_GameCorner_MapBorder
+	.4byte MauvilleCity_GameCorner_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_MauvilleGameCorner
+
diff --git a/data/maps/MauvilleCity_GameCorner/map.bin b/data/layouts/MauvilleCity_GameCorner/map.bin
index ce3f9bf73..ce3f9bf73 100644
--- a/data/maps/MauvilleCity_GameCorner/map.bin
+++ b/data/layouts/MauvilleCity_GameCorner/map.bin
diff --git a/data/maps/MossdeepCity_StevensHouse/border.bin b/data/layouts/MauvilleCity_Gym/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MossdeepCity_StevensHouse/border.bin
+++ b/data/layouts/MauvilleCity_Gym/border.bin
diff --git a/data/layouts/MauvilleCity_Gym/layout.inc b/data/layouts/MauvilleCity_Gym/layout.inc
new file mode 100644
index 000000000..290fca78e
--- /dev/null
+++ b/data/layouts/MauvilleCity_Gym/layout.inc
@@ -0,0 +1,15 @@
+MauvilleCity_Gym_MapBorder::
+	.incbin "data/layouts/MauvilleCity_Gym/border.bin"
+
+MauvilleCity_Gym_MapBlockdata::
+	.incbin "data/layouts/MauvilleCity_Gym/map.bin"
+
+	.align 2
+MauvilleCity_Gym_Layout::
+	.4byte 0xa
+	.4byte 0x15
+	.4byte MauvilleCity_Gym_MapBorder
+	.4byte MauvilleCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_MauvilleGym
+
diff --git a/data/maps/MauvilleCity_Gym/map.bin b/data/layouts/MauvilleCity_Gym/map.bin
index 8860e5651..8860e5651 100644
--- a/data/maps/MauvilleCity_Gym/map.bin
+++ b/data/layouts/MauvilleCity_Gym/map.bin
diff --git a/data/maps/MeteorFalls_B1F_2R/border.bin b/data/layouts/MeteorFalls_1F_1R/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MeteorFalls_B1F_2R/border.bin
+++ b/data/layouts/MeteorFalls_1F_1R/border.bin
diff --git a/data/layouts/MeteorFalls_1F_1R/layout.inc b/data/layouts/MeteorFalls_1F_1R/layout.inc
new file mode 100644
index 000000000..ba7a0e487
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_1R/layout.inc
@@ -0,0 +1,15 @@
+MeteorFalls_1F_1R_MapBorder::
+	.incbin "data/layouts/MeteorFalls_1F_1R/border.bin"
+
+MeteorFalls_1F_1R_MapBlockdata::
+	.incbin "data/layouts/MeteorFalls_1F_1R/map.bin"
+
+	.align 2
+MeteorFalls_1F_1R_Layout::
+	.4byte 0x1e
+	.4byte 0x2a
+	.4byte MeteorFalls_1F_1R_MapBorder
+	.4byte MeteorFalls_1F_1R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
+
diff --git a/data/maps/MeteorFalls_1F_1R/map.bin b/data/layouts/MeteorFalls_1F_1R/map.bin
index 4891475a3..4891475a3 100644
--- a/data/maps/MeteorFalls_1F_1R/map.bin
+++ b/data/layouts/MeteorFalls_1F_1R/map.bin
diff --git a/data/maps/MeteorFalls_StevensCave/border.bin b/data/layouts/MeteorFalls_1F_2R/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MeteorFalls_StevensCave/border.bin
+++ b/data/layouts/MeteorFalls_1F_2R/border.bin
diff --git a/data/layouts/MeteorFalls_1F_2R/layout.inc b/data/layouts/MeteorFalls_1F_2R/layout.inc
new file mode 100644
index 000000000..2e3fcaf2e
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_2R/layout.inc
@@ -0,0 +1,15 @@
+MeteorFalls_1F_2R_MapBorder::
+	.incbin "data/layouts/MeteorFalls_1F_2R/border.bin"
+
+MeteorFalls_1F_2R_MapBlockdata::
+	.incbin "data/layouts/MeteorFalls_1F_2R/map.bin"
+
+	.align 2
+MeteorFalls_1F_2R_Layout::
+	.4byte 0x1e
+	.4byte 0x20
+	.4byte MeteorFalls_1F_2R_MapBorder
+	.4byte MeteorFalls_1F_2R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
+
diff --git a/data/maps/MeteorFalls_1F_2R/map.bin b/data/layouts/MeteorFalls_1F_2R/map.bin
index 67ce2b784..67ce2b784 100644
--- a/data/maps/MeteorFalls_1F_2R/map.bin
+++ b/data/layouts/MeteorFalls_1F_2R/map.bin
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin b/data/layouts/MeteorFalls_B1F_1R/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin
+++ b/data/layouts/MeteorFalls_B1F_1R/border.bin
diff --git a/data/layouts/MeteorFalls_B1F_1R/layout.inc b/data/layouts/MeteorFalls_B1F_1R/layout.inc
new file mode 100644
index 000000000..a4f385d8f
--- /dev/null
+++ b/data/layouts/MeteorFalls_B1F_1R/layout.inc
@@ -0,0 +1,15 @@
+MeteorFalls_B1F_1R_MapBorder::
+	.incbin "data/layouts/MeteorFalls_B1F_1R/border.bin"
+
+MeteorFalls_B1F_1R_MapBlockdata::
+	.incbin "data/layouts/MeteorFalls_B1F_1R/map.bin"
+
+	.align 2
+MeteorFalls_B1F_1R_Layout::
+	.4byte 0x1d
+	.4byte 0x26
+	.4byte MeteorFalls_B1F_1R_MapBorder
+	.4byte MeteorFalls_B1F_1R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
+
diff --git a/data/maps/MeteorFalls_B1F_1R/map.bin b/data/layouts/MeteorFalls_B1F_1R/map.bin
index a37afdb17..a37afdb17 100644
--- a/data/maps/MeteorFalls_B1F_1R/map.bin
+++ b/data/layouts/MeteorFalls_B1F_1R/map.bin
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin b/data/layouts/MeteorFalls_B1F_2R/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin
+++ b/data/layouts/MeteorFalls_B1F_2R/border.bin
diff --git a/data/layouts/MeteorFalls_B1F_2R/layout.inc b/data/layouts/MeteorFalls_B1F_2R/layout.inc
new file mode 100644
index 000000000..982edc975
--- /dev/null
+++ b/data/layouts/MeteorFalls_B1F_2R/layout.inc
@@ -0,0 +1,15 @@
+MeteorFalls_B1F_2R_MapBorder::
+	.incbin "data/layouts/MeteorFalls_B1F_2R/border.bin"
+
+MeteorFalls_B1F_2R_MapBlockdata::
+	.incbin "data/layouts/MeteorFalls_B1F_2R/map.bin"
+
+	.align 2
+MeteorFalls_B1F_2R_Layout::
+	.4byte 0xb
+	.4byte 0x12
+	.4byte MeteorFalls_B1F_2R_MapBorder
+	.4byte MeteorFalls_B1F_2R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
+
diff --git a/data/maps/MeteorFalls_B1F_2R/map.bin b/data/layouts/MeteorFalls_B1F_2R/map.bin
index 5f4497752..5f4497752 100644
--- a/data/maps/MeteorFalls_B1F_2R/map.bin
+++ b/data/layouts/MeteorFalls_B1F_2R/map.bin
diff --git a/data/maps/MtPyre_1F/border.bin b/data/layouts/MeteorFalls_StevensCave/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_1F/border.bin
+++ b/data/layouts/MeteorFalls_StevensCave/border.bin
diff --git a/data/layouts/MeteorFalls_StevensCave/layout.inc b/data/layouts/MeteorFalls_StevensCave/layout.inc
new file mode 100644
index 000000000..1baf70a09
--- /dev/null
+++ b/data/layouts/MeteorFalls_StevensCave/layout.inc
@@ -0,0 +1,15 @@
+MeteorFalls_StevensCave_MapBorder::
+	.incbin "data/layouts/MeteorFalls_StevensCave/border.bin"
+
+MeteorFalls_StevensCave_MapBlockdata::
+	.incbin "data/layouts/MeteorFalls_StevensCave/map.bin"
+
+	.align 2
+MeteorFalls_StevensCave_Layout::
+	.4byte 0x1e
+	.4byte 0x20
+	.4byte MeteorFalls_StevensCave_MapBorder
+	.4byte MeteorFalls_StevensCave_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
+
diff --git a/data/maps/MeteorFalls_StevensCave/map.bin b/data/layouts/MeteorFalls_StevensCave/map.bin
index e509d66c2..e509d66c2 100644
--- a/data/maps/MeteorFalls_StevensCave/map.bin
+++ b/data/layouts/MeteorFalls_StevensCave/map.bin
diff --git a/data/maps/MirageTower_1F/border.bin b/data/layouts/MirageTower_1F/border.bin
index 58596f99a..58596f99a 100644
--- a/data/maps/MirageTower_1F/border.bin
+++ b/data/layouts/MirageTower_1F/border.bin
diff --git a/data/layouts/MirageTower_1F/layout.inc b/data/layouts/MirageTower_1F/layout.inc
new file mode 100644
index 000000000..be36cc758
--- /dev/null
+++ b/data/layouts/MirageTower_1F/layout.inc
@@ -0,0 +1,15 @@
+MirageTower_1F_MapBorder::
+	.incbin "data/layouts/MirageTower_1F/border.bin"
+
+MirageTower_1F_MapBlockdata::
+	.incbin "data/layouts/MirageTower_1F/map.bin"
+
+	.align 2
+MirageTower_1F_Layout::
+	.4byte 0x15
+	.4byte 0x11
+	.4byte MirageTower_1F_MapBorder
+	.4byte MirageTower_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MirageTower
+
diff --git a/data/maps/MirageTower_1F/map.bin b/data/layouts/MirageTower_1F/map.bin
index b77d14890..b77d14890 100644
--- a/data/maps/MirageTower_1F/map.bin
+++ b/data/layouts/MirageTower_1F/map.bin
diff --git a/data/maps/MirageTower_2F/border.bin b/data/layouts/MirageTower_2F/border.bin
index 58596f99a..58596f99a 100644
--- a/data/maps/MirageTower_2F/border.bin
+++ b/data/layouts/MirageTower_2F/border.bin
diff --git a/data/layouts/MirageTower_2F/layout.inc b/data/layouts/MirageTower_2F/layout.inc
new file mode 100644
index 000000000..ec4971bc4
--- /dev/null
+++ b/data/layouts/MirageTower_2F/layout.inc
@@ -0,0 +1,15 @@
+MirageTower_2F_MapBorder::
+	.incbin "data/layouts/MirageTower_2F/border.bin"
+
+MirageTower_2F_MapBlockdata::
+	.incbin "data/layouts/MirageTower_2F/map.bin"
+
+	.align 2
+MirageTower_2F_Layout::
+	.4byte 0x15
+	.4byte 0x11
+	.4byte MirageTower_2F_MapBorder
+	.4byte MirageTower_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MirageTower
+
diff --git a/data/maps/MirageTower_2F/map.bin b/data/layouts/MirageTower_2F/map.bin
index 79c3056a9..79c3056a9 100644
--- a/data/maps/MirageTower_2F/map.bin
+++ b/data/layouts/MirageTower_2F/map.bin
diff --git a/data/maps/MirageTower_3F/border.bin b/data/layouts/MirageTower_3F/border.bin
index 58596f99a..58596f99a 100644
--- a/data/maps/MirageTower_3F/border.bin
+++ b/data/layouts/MirageTower_3F/border.bin
diff --git a/data/layouts/MirageTower_3F/layout.inc b/data/layouts/MirageTower_3F/layout.inc
new file mode 100644
index 000000000..c12de3a15
--- /dev/null
+++ b/data/layouts/MirageTower_3F/layout.inc
@@ -0,0 +1,15 @@
+MirageTower_3F_MapBorder::
+	.incbin "data/layouts/MirageTower_3F/border.bin"
+
+MirageTower_3F_MapBlockdata::
+	.incbin "data/layouts/MirageTower_3F/map.bin"
+
+	.align 2
+MirageTower_3F_Layout::
+	.4byte 0x15
+	.4byte 0x11
+	.4byte MirageTower_3F_MapBorder
+	.4byte MirageTower_3F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MirageTower
+
diff --git a/data/maps/MirageTower_3F/map.bin b/data/layouts/MirageTower_3F/map.bin
index 376ac2836..376ac2836 100644
--- a/data/maps/MirageTower_3F/map.bin
+++ b/data/layouts/MirageTower_3F/map.bin
diff --git a/data/maps/MirageTower_4F/border.bin b/data/layouts/MirageTower_4F/border.bin
index 58596f99a..58596f99a 100644
--- a/data/maps/MirageTower_4F/border.bin
+++ b/data/layouts/MirageTower_4F/border.bin
diff --git a/data/layouts/MirageTower_4F/layout.inc b/data/layouts/MirageTower_4F/layout.inc
new file mode 100644
index 000000000..518f7c943
--- /dev/null
+++ b/data/layouts/MirageTower_4F/layout.inc
@@ -0,0 +1,15 @@
+MirageTower_4F_MapBorder::
+	.incbin "data/layouts/MirageTower_4F/border.bin"
+
+MirageTower_4F_MapBlockdata::
+	.incbin "data/layouts/MirageTower_4F/map.bin"
+
+	.align 2
+MirageTower_4F_Layout::
+	.4byte 0xd
+	.4byte 0xa
+	.4byte MirageTower_4F_MapBorder
+	.4byte MirageTower_4F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MirageTower
+
diff --git a/data/maps/MirageTower_4F/map.bin b/data/layouts/MirageTower_4F/map.bin
index 283534fb7..283534fb7 100644
--- a/data/maps/MirageTower_4F/map.bin
+++ b/data/layouts/MirageTower_4F/map.bin
diff --git a/data/maps/MossdeepCity/border.bin b/data/layouts/MossdeepCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/MossdeepCity/border.bin
+++ b/data/layouts/MossdeepCity/border.bin
diff --git a/data/layouts/MossdeepCity/layout.inc b/data/layouts/MossdeepCity/layout.inc
new file mode 100644
index 000000000..881cf9498
--- /dev/null
+++ b/data/layouts/MossdeepCity/layout.inc
@@ -0,0 +1,15 @@
+MossdeepCity_MapBorder::
+	.incbin "data/layouts/MossdeepCity/border.bin"
+
+MossdeepCity_MapBlockdata::
+	.incbin "data/layouts/MossdeepCity/map.bin"
+
+	.align 2
+MossdeepCity_Layout::
+	.4byte 0x50
+	.4byte 0x28
+	.4byte MossdeepCity_MapBorder
+	.4byte MossdeepCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
+
diff --git a/data/maps/MossdeepCity/map.bin b/data/layouts/MossdeepCity/map.bin
index bf150f5bb..bf150f5bb 100644
--- a/data/maps/MossdeepCity/map.bin
+++ b/data/layouts/MossdeepCity/map.bin
diff --git a/data/maps/OldaleTown_House1/border.bin b/data/layouts/MossdeepCity_GameCorner_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/OldaleTown_House1/border.bin
+++ b/data/layouts/MossdeepCity_GameCorner_1F/border.bin
diff --git a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc
new file mode 100644
index 000000000..2c2fb717d
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc
@@ -0,0 +1,15 @@
+MossdeepCity_GameCorner_1F_MapBorder::
+	.incbin "data/layouts/MossdeepCity_GameCorner_1F/border.bin"
+
+MossdeepCity_GameCorner_1F_MapBlockdata::
+	.incbin "data/layouts/MossdeepCity_GameCorner_1F/map.bin"
+
+	.align 2
+MossdeepCity_GameCorner_1F_Layout::
+	.4byte 0xc
+	.4byte 0xa
+	.4byte MossdeepCity_GameCorner_1F_MapBorder
+	.4byte MossdeepCity_GameCorner_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_MossdeepGameCorner
+
diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.bin b/data/layouts/MossdeepCity_GameCorner_1F/map.bin
index 8be990dde..8be990dde 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/map.bin
+++ b/data/layouts/MossdeepCity_GameCorner_1F/map.bin
diff --git a/data/maps/OldaleTown_House2/border.bin b/data/layouts/MossdeepCity_GameCorner_B1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/OldaleTown_House2/border.bin
+++ b/data/layouts/MossdeepCity_GameCorner_B1F/border.bin
diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc
new file mode 100644
index 000000000..ec5dd2a57
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc
@@ -0,0 +1,15 @@
+MossdeepCity_GameCorner_B1F_MapBorder::
+	.incbin "data/layouts/MossdeepCity_GameCorner_B1F/border.bin"
+
+MossdeepCity_GameCorner_B1F_MapBlockdata::
+	.incbin "data/layouts/MossdeepCity_GameCorner_B1F/map.bin"
+
+	.align 2
+MossdeepCity_GameCorner_B1F_Layout::
+	.4byte 0xc
+	.4byte 0x9
+	.4byte MossdeepCity_GameCorner_B1F_MapBorder
+	.4byte MossdeepCity_GameCorner_B1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.bin b/data/layouts/MossdeepCity_GameCorner_B1F/map.bin
index 399d05705..399d05705 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/map.bin
+++ b/data/layouts/MossdeepCity_GameCorner_B1F/map.bin
diff --git a/data/maps/MossdeepCity_Gym/border.bin b/data/layouts/MossdeepCity_Gym/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/MossdeepCity_Gym/border.bin
+++ b/data/layouts/MossdeepCity_Gym/border.bin
diff --git a/data/layouts/MossdeepCity_Gym/layout.inc b/data/layouts/MossdeepCity_Gym/layout.inc
new file mode 100644
index 000000000..a65212a40
--- /dev/null
+++ b/data/layouts/MossdeepCity_Gym/layout.inc
@@ -0,0 +1,15 @@
+MossdeepCity_Gym_MapBorder::
+	.incbin "data/layouts/MossdeepCity_Gym/border.bin"
+
+MossdeepCity_Gym_MapBlockdata::
+	.incbin "data/layouts/MossdeepCity_Gym/map.bin"
+
+	.align 2
+MossdeepCity_Gym_Layout::
+	.4byte 0x1a
+	.4byte 0x24
+	.4byte MossdeepCity_Gym_MapBorder
+	.4byte MossdeepCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_MossdeepGym
+
diff --git a/data/maps/MossdeepCity_Gym/map.bin b/data/layouts/MossdeepCity_Gym/map.bin
index da585f73f..da585f73f 100644
--- a/data/maps/MossdeepCity_Gym/map.bin
+++ b/data/layouts/MossdeepCity_Gym/map.bin
diff --git a/data/maps/MtPyre_2F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_2F/border.bin
+++ b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin
diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc
new file mode 100644
index 000000000..759e68891
--- /dev/null
+++ b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc
@@ -0,0 +1,15 @@
+MossdeepCity_SpaceCenter_1F_MapBorder::
+	.incbin "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin"
+
+MossdeepCity_SpaceCenter_1F_MapBlockdata::
+	.incbin "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin"
+
+	.align 2
+MossdeepCity_SpaceCenter_1F_Layout::
+	.4byte 0x10
+	.4byte 0xa
+	.4byte MossdeepCity_SpaceCenter_1F_MapBorder
+	.4byte MossdeepCity_SpaceCenter_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin b/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin
index 44f5081b9..44f5081b9 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin
+++ b/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin
diff --git a/data/maps/MtPyre_3F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_3F/border.bin
+++ b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin
diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc
new file mode 100644
index 000000000..6e370a7fa
--- /dev/null
+++ b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc
@@ -0,0 +1,15 @@
+MossdeepCity_SpaceCenter_2F_MapBorder::
+	.incbin "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin"
+
+MossdeepCity_SpaceCenter_2F_MapBlockdata::
+	.incbin "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin"
+
+	.align 2
+MossdeepCity_SpaceCenter_2F_Layout::
+	.4byte 0x10
+	.4byte 0xa
+	.4byte MossdeepCity_SpaceCenter_2F_MapBorder
+	.4byte MossdeepCity_SpaceCenter_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin b/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin
index d2e52d780..d2e52d780 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin
+++ b/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin
diff --git a/data/maps/OldaleTown_Mart/border.bin b/data/layouts/MossdeepCity_StevensHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/OldaleTown_Mart/border.bin
+++ b/data/layouts/MossdeepCity_StevensHouse/border.bin
diff --git a/data/layouts/MossdeepCity_StevensHouse/layout.inc b/data/layouts/MossdeepCity_StevensHouse/layout.inc
new file mode 100644
index 000000000..0db92aee9
--- /dev/null
+++ b/data/layouts/MossdeepCity_StevensHouse/layout.inc
@@ -0,0 +1,15 @@
+MossdeepCity_StevensHouse_MapBorder::
+	.incbin "data/layouts/MossdeepCity_StevensHouse/border.bin"
+
+MossdeepCity_StevensHouse_MapBlockdata::
+	.incbin "data/layouts/MossdeepCity_StevensHouse/map.bin"
+
+	.align 2
+MossdeepCity_StevensHouse_Layout::
+	.4byte 0xb
+	.4byte 0x8
+	.4byte MossdeepCity_StevensHouse_MapBorder
+	.4byte MossdeepCity_StevensHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/MossdeepCity_StevensHouse/map.bin b/data/layouts/MossdeepCity_StevensHouse/map.bin
index ade25497a..ade25497a 100644
--- a/data/maps/MossdeepCity_StevensHouse/map.bin
+++ b/data/layouts/MossdeepCity_StevensHouse/map.bin
diff --git a/data/maps/MtChimney/border.bin b/data/layouts/MtChimney/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/MtChimney/border.bin
+++ b/data/layouts/MtChimney/border.bin
diff --git a/data/layouts/MtChimney/layout.inc b/data/layouts/MtChimney/layout.inc
new file mode 100644
index 000000000..29a3b1ad7
--- /dev/null
+++ b/data/layouts/MtChimney/layout.inc
@@ -0,0 +1,15 @@
+MtChimney_MapBorder::
+	.incbin "data/layouts/MtChimney/border.bin"
+
+MtChimney_MapBlockdata::
+	.incbin "data/layouts/MtChimney/map.bin"
+
+	.align 2
+MtChimney_Layout::
+	.4byte 0x28
+	.4byte 0x2f
+	.4byte MtChimney_MapBorder
+	.4byte MtChimney_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
+
diff --git a/data/maps/MtChimney/map.bin b/data/layouts/MtChimney/map.bin
index 1e7e2868d..1e7e2868d 100644
--- a/data/maps/MtChimney/map.bin
+++ b/data/layouts/MtChimney/map.bin
diff --git a/data/maps/MtPyre_4F/border.bin b/data/layouts/MtPyre_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_4F/border.bin
+++ b/data/layouts/MtPyre_1F/border.bin
diff --git a/data/layouts/MtPyre_1F/layout.inc b/data/layouts/MtPyre_1F/layout.inc
new file mode 100644
index 000000000..2402e815c
--- /dev/null
+++ b/data/layouts/MtPyre_1F/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_1F_MapBorder::
+	.incbin "data/layouts/MtPyre_1F/border.bin"
+
+MtPyre_1F_MapBlockdata::
+	.incbin "data/layouts/MtPyre_1F/map.bin"
+
+	.align 2
+MtPyre_1F_Layout::
+	.4byte 0x16
+	.4byte 0x13
+	.4byte MtPyre_1F_MapBorder
+	.4byte MtPyre_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/MtPyre_1F/map.bin b/data/layouts/MtPyre_1F/map.bin
index 60b992a73..60b992a73 100644
--- a/data/maps/MtPyre_1F/map.bin
+++ b/data/layouts/MtPyre_1F/map.bin
diff --git a/data/maps/MtPyre_5F/border.bin b/data/layouts/MtPyre_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_5F/border.bin
+++ b/data/layouts/MtPyre_2F/border.bin
diff --git a/data/layouts/MtPyre_2F/layout.inc b/data/layouts/MtPyre_2F/layout.inc
new file mode 100644
index 000000000..8d6ca1200
--- /dev/null
+++ b/data/layouts/MtPyre_2F/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_2F_MapBorder::
+	.incbin "data/layouts/MtPyre_2F/border.bin"
+
+MtPyre_2F_MapBlockdata::
+	.incbin "data/layouts/MtPyre_2F/map.bin"
+
+	.align 2
+MtPyre_2F_Layout::
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_2F_MapBorder
+	.4byte MtPyre_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/MtPyre_2F/map.bin b/data/layouts/MtPyre_2F/map.bin
index 97b7e9e31..97b7e9e31 100644
--- a/data/maps/MtPyre_2F/map.bin
+++ b/data/layouts/MtPyre_2F/map.bin
diff --git a/data/maps/MtPyre_6F/border.bin b/data/layouts/MtPyre_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_6F/border.bin
+++ b/data/layouts/MtPyre_3F/border.bin
diff --git a/data/layouts/MtPyre_3F/layout.inc b/data/layouts/MtPyre_3F/layout.inc
new file mode 100644
index 000000000..24ed0f7b1
--- /dev/null
+++ b/data/layouts/MtPyre_3F/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_3F_MapBorder::
+	.incbin "data/layouts/MtPyre_3F/border.bin"
+
+MtPyre_3F_MapBlockdata::
+	.incbin "data/layouts/MtPyre_3F/map.bin"
+
+	.align 2
+MtPyre_3F_Layout::
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_3F_MapBorder
+	.4byte MtPyre_3F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/MtPyre_3F/map.bin b/data/layouts/MtPyre_3F/map.bin
index 758eccc3a..758eccc3a 100644
--- a/data/maps/MtPyre_3F/map.bin
+++ b/data/layouts/MtPyre_3F/map.bin
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/border.bin b/data/layouts/MtPyre_4F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/border.bin
+++ b/data/layouts/MtPyre_4F/border.bin
diff --git a/data/layouts/MtPyre_4F/layout.inc b/data/layouts/MtPyre_4F/layout.inc
new file mode 100644
index 000000000..65a8fcf59
--- /dev/null
+++ b/data/layouts/MtPyre_4F/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_4F_MapBorder::
+	.incbin "data/layouts/MtPyre_4F/border.bin"
+
+MtPyre_4F_MapBlockdata::
+	.incbin "data/layouts/MtPyre_4F/map.bin"
+
+	.align 2
+MtPyre_4F_Layout::
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_4F_MapBorder
+	.4byte MtPyre_4F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/MtPyre_4F/map.bin b/data/layouts/MtPyre_4F/map.bin
index 98dc679ff..98dc679ff 100644
--- a/data/maps/MtPyre_4F/map.bin
+++ b/data/layouts/MtPyre_4F/map.bin
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/border.bin b/data/layouts/MtPyre_5F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/border.bin
+++ b/data/layouts/MtPyre_5F/border.bin
diff --git a/data/layouts/MtPyre_5F/layout.inc b/data/layouts/MtPyre_5F/layout.inc
new file mode 100644
index 000000000..222c6eb80
--- /dev/null
+++ b/data/layouts/MtPyre_5F/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_5F_MapBorder::
+	.incbin "data/layouts/MtPyre_5F/border.bin"
+
+MtPyre_5F_MapBlockdata::
+	.incbin "data/layouts/MtPyre_5F/map.bin"
+
+	.align 2
+MtPyre_5F_Layout::
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_5F_MapBorder
+	.4byte MtPyre_5F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/MtPyre_5F/map.bin b/data/layouts/MtPyre_5F/map.bin
index 12fbeeb7e..12fbeeb7e 100644
--- a/data/maps/MtPyre_5F/map.bin
+++ b/data/layouts/MtPyre_5F/map.bin
diff --git a/data/maps/PacifidlogTown_House1/border.bin b/data/layouts/MtPyre_6F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/PacifidlogTown_House1/border.bin
+++ b/data/layouts/MtPyre_6F/border.bin
diff --git a/data/layouts/MtPyre_6F/layout.inc b/data/layouts/MtPyre_6F/layout.inc
new file mode 100644
index 000000000..31b5288d5
--- /dev/null
+++ b/data/layouts/MtPyre_6F/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_6F_MapBorder::
+	.incbin "data/layouts/MtPyre_6F/border.bin"
+
+MtPyre_6F_MapBlockdata::
+	.incbin "data/layouts/MtPyre_6F/map.bin"
+
+	.align 2
+MtPyre_6F_Layout::
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_6F_MapBorder
+	.4byte MtPyre_6F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/MtPyre_6F/map.bin b/data/layouts/MtPyre_6F/map.bin
index 1f7438bfb..1f7438bfb 100644
--- a/data/maps/MtPyre_6F/map.bin
+++ b/data/layouts/MtPyre_6F/map.bin
diff --git a/data/maps/MtPyre_Exterior/border.bin b/data/layouts/MtPyre_Exterior/border.bin
index 1d7df4a00..1d7df4a00 100644
--- a/data/maps/MtPyre_Exterior/border.bin
+++ b/data/layouts/MtPyre_Exterior/border.bin
diff --git a/data/layouts/MtPyre_Exterior/layout.inc b/data/layouts/MtPyre_Exterior/layout.inc
new file mode 100644
index 000000000..1b5997dba
--- /dev/null
+++ b/data/layouts/MtPyre_Exterior/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_Exterior_MapBorder::
+	.incbin "data/layouts/MtPyre_Exterior/border.bin"
+
+MtPyre_Exterior_MapBlockdata::
+	.incbin "data/layouts/MtPyre_Exterior/map.bin"
+
+	.align 2
+MtPyre_Exterior_Layout::
+	.4byte 0x26
+	.4byte 0x33
+	.4byte MtPyre_Exterior_MapBorder
+	.4byte MtPyre_Exterior_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/MtPyre_Exterior/map.bin b/data/layouts/MtPyre_Exterior/map.bin
index 7ab1e0461..7ab1e0461 100644
--- a/data/maps/MtPyre_Exterior/map.bin
+++ b/data/layouts/MtPyre_Exterior/map.bin
diff --git a/data/maps/MtPyre_Summit/border.bin b/data/layouts/MtPyre_Summit/border.bin
index 1d7df4a00..1d7df4a00 100644
--- a/data/maps/MtPyre_Summit/border.bin
+++ b/data/layouts/MtPyre_Summit/border.bin
diff --git a/data/layouts/MtPyre_Summit/layout.inc b/data/layouts/MtPyre_Summit/layout.inc
new file mode 100644
index 000000000..58e932eb7
--- /dev/null
+++ b/data/layouts/MtPyre_Summit/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_Summit_MapBorder::
+	.incbin "data/layouts/MtPyre_Summit/border.bin"
+
+MtPyre_Summit_MapBlockdata::
+	.incbin "data/layouts/MtPyre_Summit/map.bin"
+
+	.align 2
+MtPyre_Summit_Layout::
+	.4byte 0x32
+	.4byte 0x25
+	.4byte MtPyre_Summit_MapBorder
+	.4byte MtPyre_Summit_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/MtPyre_Summit/map.bin b/data/layouts/MtPyre_Summit/map.bin
index 1de8bd5ea..1de8bd5ea 100644
--- a/data/maps/MtPyre_Summit/map.bin
+++ b/data/layouts/MtPyre_Summit/map.bin
diff --git a/data/maps/NavelRock_B1F/border.bin b/data/layouts/NavelRock_B1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/NavelRock_B1F/border.bin
+++ b/data/layouts/NavelRock_B1F/border.bin
diff --git a/data/layouts/NavelRock_B1F/layout.inc b/data/layouts/NavelRock_B1F/layout.inc
new file mode 100644
index 000000000..6f15bd276
--- /dev/null
+++ b/data/layouts/NavelRock_B1F/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_B1F_MapBorder::
+	.incbin "data/layouts/NavelRock_B1F/border.bin"
+
+NavelRock_B1F_MapBlockdata::
+	.incbin "data/layouts/NavelRock_B1F/map.bin"
+
+	.align 2
+NavelRock_B1F_Layout::
+	.4byte 0x17
+	.4byte 0xb
+	.4byte NavelRock_B1F_MapBorder
+	.4byte NavelRock_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_NavelRock
+
diff --git a/data/maps/NavelRock_B1F/map.bin b/data/layouts/NavelRock_B1F/map.bin
index 861fb6575..861fb6575 100644
--- a/data/maps/NavelRock_B1F/map.bin
+++ b/data/layouts/NavelRock_B1F/map.bin
diff --git a/data/maps/NavelRock_Bottom/border.bin b/data/layouts/NavelRock_Bottom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/NavelRock_Bottom/border.bin
+++ b/data/layouts/NavelRock_Bottom/border.bin
diff --git a/data/layouts/NavelRock_Bottom/layout.inc b/data/layouts/NavelRock_Bottom/layout.inc
new file mode 100644
index 000000000..5c96a8cef
--- /dev/null
+++ b/data/layouts/NavelRock_Bottom/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_Bottom_MapBorder::
+	.incbin "data/layouts/NavelRock_Bottom/border.bin"
+
+NavelRock_Bottom_MapBlockdata::
+	.incbin "data/layouts/NavelRock_Bottom/map.bin"
+
+	.align 2
+NavelRock_Bottom_Layout::
+	.4byte 0x16
+	.4byte 0x16
+	.4byte NavelRock_Bottom_MapBorder
+	.4byte NavelRock_Bottom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_NavelRock
+
diff --git a/data/maps/NavelRock_Bottom/map.bin b/data/layouts/NavelRock_Bottom/map.bin
index af2f8a245..af2f8a245 100644
--- a/data/maps/NavelRock_Bottom/map.bin
+++ b/data/layouts/NavelRock_Bottom/map.bin
diff --git a/data/maps/NavelRock_Entrance/border.bin b/data/layouts/NavelRock_Entrance/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/NavelRock_Entrance/border.bin
+++ b/data/layouts/NavelRock_Entrance/border.bin
diff --git a/data/layouts/NavelRock_Entrance/layout.inc b/data/layouts/NavelRock_Entrance/layout.inc
new file mode 100644
index 000000000..6dcedcb20
--- /dev/null
+++ b/data/layouts/NavelRock_Entrance/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_Entrance_MapBorder::
+	.incbin "data/layouts/NavelRock_Entrance/border.bin"
+
+NavelRock_Entrance_MapBlockdata::
+	.incbin "data/layouts/NavelRock_Entrance/map.bin"
+
+	.align 2
+NavelRock_Entrance_Layout::
+	.4byte 0x15
+	.4byte 0x20
+	.4byte NavelRock_Entrance_MapBorder
+	.4byte NavelRock_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_NavelRock
+
diff --git a/data/maps/NavelRock_Entrance/map.bin b/data/layouts/NavelRock_Entrance/map.bin
index 6fd5b9fa0..6fd5b9fa0 100644
--- a/data/maps/NavelRock_Entrance/map.bin
+++ b/data/layouts/NavelRock_Entrance/map.bin
diff --git a/data/maps/NavelRock_Exterior/border.bin b/data/layouts/NavelRock_Exterior/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/NavelRock_Exterior/border.bin
+++ b/data/layouts/NavelRock_Exterior/border.bin
diff --git a/data/layouts/NavelRock_Exterior/layout.inc b/data/layouts/NavelRock_Exterior/layout.inc
new file mode 100644
index 000000000..c2c4fa95e
--- /dev/null
+++ b/data/layouts/NavelRock_Exterior/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_Exterior_MapBorder::
+	.incbin "data/layouts/NavelRock_Exterior/border.bin"
+
+NavelRock_Exterior_MapBlockdata::
+	.incbin "data/layouts/NavelRock_Exterior/map.bin"
+
+	.align 2
+NavelRock_Exterior_Layout::
+	.4byte 0x15
+	.4byte 0x18
+	.4byte NavelRock_Exterior_MapBorder
+	.4byte NavelRock_Exterior_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
+
diff --git a/data/maps/NavelRock_Exterior/map.bin b/data/layouts/NavelRock_Exterior/map.bin
index 9b3342a1a..9b3342a1a 100644
--- a/data/maps/NavelRock_Exterior/map.bin
+++ b/data/layouts/NavelRock_Exterior/map.bin
diff --git a/data/maps/NavelRock_Fork/border.bin b/data/layouts/NavelRock_Fork/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/NavelRock_Fork/border.bin
+++ b/data/layouts/NavelRock_Fork/border.bin
diff --git a/data/layouts/NavelRock_Fork/layout.inc b/data/layouts/NavelRock_Fork/layout.inc
new file mode 100644
index 000000000..ab5d9c867
--- /dev/null
+++ b/data/layouts/NavelRock_Fork/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_Fork_MapBorder::
+	.incbin "data/layouts/NavelRock_Fork/border.bin"
+
+NavelRock_Fork_MapBlockdata::
+	.incbin "data/layouts/NavelRock_Fork/map.bin"
+
+	.align 2
+NavelRock_Fork_Layout::
+	.4byte 0x1b
+	.4byte 0x56
+	.4byte NavelRock_Fork_MapBorder
+	.4byte NavelRock_Fork_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_NavelRock
+
diff --git a/data/maps/NavelRock_Fork/map.bin b/data/layouts/NavelRock_Fork/map.bin
index 0b314cc16..0b314cc16 100644
--- a/data/maps/NavelRock_Fork/map.bin
+++ b/data/layouts/NavelRock_Fork/map.bin
diff --git a/data/maps/NavelRock_Up1/border.bin b/data/layouts/NavelRock_LadderRoom1/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/NavelRock_Up1/border.bin
+++ b/data/layouts/NavelRock_LadderRoom1/border.bin
diff --git a/data/layouts/NavelRock_LadderRoom1/layout.inc b/data/layouts/NavelRock_LadderRoom1/layout.inc
new file mode 100644
index 000000000..a7fc73d22
--- /dev/null
+++ b/data/layouts/NavelRock_LadderRoom1/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_LadderRoom1_MapBorder::
+	.incbin "data/layouts/NavelRock_LadderRoom1/border.bin"
+
+NavelRock_LadderRoom1_MapBlockdata::
+	.incbin "data/layouts/NavelRock_LadderRoom1/map.bin"
+
+	.align 2
+NavelRock_LadderRoom1_Layout::
+	.4byte 0x9
+	.4byte 0x8
+	.4byte NavelRock_LadderRoom1_MapBorder
+	.4byte NavelRock_LadderRoom1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_NavelRock
+
diff --git a/data/maps/NavelRock_Up1/map.bin b/data/layouts/NavelRock_LadderRoom1/map.bin
index c2951c043..c2951c043 100644
--- a/data/maps/NavelRock_Up1/map.bin
+++ b/data/layouts/NavelRock_LadderRoom1/map.bin
diff --git a/data/maps/NavelRock_Up2/border.bin b/data/layouts/NavelRock_LadderRoom2/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/NavelRock_Up2/border.bin
+++ b/data/layouts/NavelRock_LadderRoom2/border.bin
diff --git a/data/layouts/NavelRock_LadderRoom2/layout.inc b/data/layouts/NavelRock_LadderRoom2/layout.inc
new file mode 100644
index 000000000..8fbd6e51f
--- /dev/null
+++ b/data/layouts/NavelRock_LadderRoom2/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_LadderRoom2_MapBorder::
+	.incbin "data/layouts/NavelRock_LadderRoom2/border.bin"
+
+NavelRock_LadderRoom2_MapBlockdata::
+	.incbin "data/layouts/NavelRock_LadderRoom2/map.bin"
+
+	.align 2
+NavelRock_LadderRoom2_Layout::
+	.4byte 0x9
+	.4byte 0x8
+	.4byte NavelRock_LadderRoom2_MapBorder
+	.4byte NavelRock_LadderRoom2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_NavelRock
+
diff --git a/data/maps/NavelRock_Up2/map.bin b/data/layouts/NavelRock_LadderRoom2/map.bin
index 47dd37b93..47dd37b93 100644
--- a/data/maps/NavelRock_Up2/map.bin
+++ b/data/layouts/NavelRock_LadderRoom2/map.bin
diff --git a/data/maps/NavelRock_Top/border.bin b/data/layouts/NavelRock_Top/border.bin
index 8d839d092..8d839d092 100644
--- a/data/maps/NavelRock_Top/border.bin
+++ b/data/layouts/NavelRock_Top/border.bin
diff --git a/data/layouts/NavelRock_Top/layout.inc b/data/layouts/NavelRock_Top/layout.inc
new file mode 100644
index 000000000..50698cc76
--- /dev/null
+++ b/data/layouts/NavelRock_Top/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_Top_MapBorder::
+	.incbin "data/layouts/NavelRock_Top/border.bin"
+
+NavelRock_Top_MapBlockdata::
+	.incbin "data/layouts/NavelRock_Top/map.bin"
+
+	.align 2
+NavelRock_Top_Layout::
+	.4byte 0x19
+	.4byte 0x1c
+	.4byte NavelRock_Top_MapBorder
+	.4byte NavelRock_Top_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_NavelRock
+
diff --git a/data/maps/NavelRock_Top/map.bin b/data/layouts/NavelRock_Top/map.bin
index fce085ae6..fce085ae6 100644
--- a/data/maps/NavelRock_Top/map.bin
+++ b/data/layouts/NavelRock_Top/map.bin
diff --git a/data/maps/NewMauville_Entrance/border.bin b/data/layouts/NewMauville_Entrance/border.bin
index 4531975c7..4531975c7 100644
--- a/data/maps/NewMauville_Entrance/border.bin
+++ b/data/layouts/NewMauville_Entrance/border.bin
diff --git a/data/layouts/NewMauville_Entrance/layout.inc b/data/layouts/NewMauville_Entrance/layout.inc
new file mode 100644
index 000000000..bbd81cac7
--- /dev/null
+++ b/data/layouts/NewMauville_Entrance/layout.inc
@@ -0,0 +1,15 @@
+NewMauville_Entrance_MapBorder::
+	.incbin "data/layouts/NewMauville_Entrance/border.bin"
+
+NewMauville_Entrance_MapBlockdata::
+	.incbin "data/layouts/NewMauville_Entrance/map.bin"
+
+	.align 2
+NewMauville_Entrance_Layout::
+	.4byte 0x9
+	.4byte 0x9
+	.4byte NewMauville_Entrance_MapBorder
+	.4byte NewMauville_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/NewMauville_Entrance/map.bin b/data/layouts/NewMauville_Entrance/map.bin
index 1e3f471e8..1e3f471e8 100644
--- a/data/maps/NewMauville_Entrance/map.bin
+++ b/data/layouts/NewMauville_Entrance/map.bin
diff --git a/data/maps/NewMauville_Inside/border.bin b/data/layouts/NewMauville_Inside/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/NewMauville_Inside/border.bin
+++ b/data/layouts/NewMauville_Inside/border.bin
diff --git a/data/layouts/NewMauville_Inside/layout.inc b/data/layouts/NewMauville_Inside/layout.inc
new file mode 100644
index 000000000..096142c6d
--- /dev/null
+++ b/data/layouts/NewMauville_Inside/layout.inc
@@ -0,0 +1,15 @@
+NewMauville_Inside_MapBorder::
+	.incbin "data/layouts/NewMauville_Inside/border.bin"
+
+NewMauville_Inside_MapBlockdata::
+	.incbin "data/layouts/NewMauville_Inside/map.bin"
+
+	.align 2
+NewMauville_Inside_Layout::
+	.4byte 0x29
+	.4byte 0x29
+	.4byte NewMauville_Inside_MapBorder
+	.4byte NewMauville_Inside_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_BikeShop
+
diff --git a/data/maps/NewMauville_Inside/map.bin b/data/layouts/NewMauville_Inside/map.bin
index 78d1e39ce..78d1e39ce 100644
--- a/data/maps/NewMauville_Inside/map.bin
+++ b/data/layouts/NewMauville_Inside/map.bin
diff --git a/data/maps/OldaleTown/border.bin b/data/layouts/OldaleTown/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/OldaleTown/border.bin
+++ b/data/layouts/OldaleTown/border.bin
diff --git a/data/layouts/OldaleTown/layout.inc b/data/layouts/OldaleTown/layout.inc
new file mode 100644
index 000000000..9709ca1ea
--- /dev/null
+++ b/data/layouts/OldaleTown/layout.inc
@@ -0,0 +1,15 @@
+OldaleTown_MapBorder::
+	.incbin "data/layouts/OldaleTown/border.bin"
+
+OldaleTown_MapBlockdata::
+	.incbin "data/layouts/OldaleTown/map.bin"
+
+	.align 2
+OldaleTown_Layout::
+	.4byte 0x14
+	.4byte 0x14
+	.4byte OldaleTown_MapBorder
+	.4byte OldaleTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
+
diff --git a/data/maps/OldaleTown/map.bin b/data/layouts/OldaleTown/map.bin
index 28b17c441..28b17c441 100644
--- a/data/maps/OldaleTown/map.bin
+++ b/data/layouts/OldaleTown/map.bin
diff --git a/data/maps/PacifidlogTown/border.bin b/data/layouts/PacifidlogTown/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/PacifidlogTown/border.bin
+++ b/data/layouts/PacifidlogTown/border.bin
diff --git a/data/layouts/PacifidlogTown/layout.inc b/data/layouts/PacifidlogTown/layout.inc
new file mode 100644
index 000000000..4ba791f23
--- /dev/null
+++ b/data/layouts/PacifidlogTown/layout.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_MapBorder::
+	.incbin "data/layouts/PacifidlogTown/border.bin"
+
+PacifidlogTown_MapBlockdata::
+	.incbin "data/layouts/PacifidlogTown/map.bin"
+
+	.align 2
+PacifidlogTown_Layout::
+	.4byte 0x14
+	.4byte 0x28
+	.4byte PacifidlogTown_MapBorder
+	.4byte PacifidlogTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/PacifidlogTown/map.bin b/data/layouts/PacifidlogTown/map.bin
index 02c1454bb..02c1454bb 100644
--- a/data/maps/PacifidlogTown/map.bin
+++ b/data/layouts/PacifidlogTown/map.bin
diff --git a/data/maps/PacifidlogTown_House2/border.bin b/data/layouts/PacifidlogTown_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/PacifidlogTown_House2/border.bin
+++ b/data/layouts/PacifidlogTown_House1/border.bin
diff --git a/data/layouts/PacifidlogTown_House1/layout.inc b/data/layouts/PacifidlogTown_House1/layout.inc
new file mode 100644
index 000000000..b5dcf58b2
--- /dev/null
+++ b/data/layouts/PacifidlogTown_House1/layout.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_House1_MapBorder::
+	.incbin "data/layouts/PacifidlogTown_House1/border.bin"
+
+PacifidlogTown_House1_MapBlockdata::
+	.incbin "data/layouts/PacifidlogTown_House1/map.bin"
+
+	.align 2
+PacifidlogTown_House1_Layout::
+	.4byte 0xa
+	.4byte 0x9
+	.4byte PacifidlogTown_House1_MapBorder
+	.4byte PacifidlogTown_House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/PacifidlogTown_House1/map.bin b/data/layouts/PacifidlogTown_House1/map.bin
index 7865fdc7c..7865fdc7c 100644
--- a/data/maps/PacifidlogTown_House1/map.bin
+++ b/data/layouts/PacifidlogTown_House1/map.bin
diff --git a/data/maps/PetalburgCity_House2/border.bin b/data/layouts/PacifidlogTown_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/PetalburgCity_House2/border.bin
+++ b/data/layouts/PacifidlogTown_House2/border.bin
diff --git a/data/layouts/PacifidlogTown_House2/layout.inc b/data/layouts/PacifidlogTown_House2/layout.inc
new file mode 100644
index 000000000..a10daa3cd
--- /dev/null
+++ b/data/layouts/PacifidlogTown_House2/layout.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_House2_MapBorder::
+	.incbin "data/layouts/PacifidlogTown_House2/border.bin"
+
+PacifidlogTown_House2_MapBlockdata::
+	.incbin "data/layouts/PacifidlogTown_House2/map.bin"
+
+	.align 2
+PacifidlogTown_House2_Layout::
+	.4byte 0xa
+	.4byte 0x9
+	.4byte PacifidlogTown_House2_MapBorder
+	.4byte PacifidlogTown_House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/PacifidlogTown_House2/map.bin b/data/layouts/PacifidlogTown_House2/map.bin
index 617346322..617346322 100644
--- a/data/maps/PacifidlogTown_House2/map.bin
+++ b/data/layouts/PacifidlogTown_House2/map.bin
diff --git a/data/maps/PetalburgCity/border.bin b/data/layouts/PetalburgCity/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/PetalburgCity/border.bin
+++ b/data/layouts/PetalburgCity/border.bin
diff --git a/data/layouts/PetalburgCity/layout.inc b/data/layouts/PetalburgCity/layout.inc
new file mode 100644
index 000000000..bae16b88f
--- /dev/null
+++ b/data/layouts/PetalburgCity/layout.inc
@@ -0,0 +1,15 @@
+PetalburgCity_MapBorder::
+	.incbin "data/layouts/PetalburgCity/border.bin"
+
+PetalburgCity_MapBlockdata::
+	.incbin "data/layouts/PetalburgCity/map.bin"
+
+	.align 2
+PetalburgCity_Layout::
+	.4byte 0x1e
+	.4byte 0x1e
+	.4byte PetalburgCity_MapBorder
+	.4byte PetalburgCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
+
diff --git a/data/maps/PetalburgCity/map.bin b/data/layouts/PetalburgCity/map.bin
index 35f0172ca..35f0172ca 100644
--- a/data/maps/PetalburgCity/map.bin
+++ b/data/layouts/PetalburgCity/map.bin
diff --git a/data/maps/PetalburgCity_Gym/border.bin b/data/layouts/PetalburgCity_Gym/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/PetalburgCity_Gym/border.bin
+++ b/data/layouts/PetalburgCity_Gym/border.bin
diff --git a/data/layouts/PetalburgCity_Gym/layout.inc b/data/layouts/PetalburgCity_Gym/layout.inc
new file mode 100644
index 000000000..36fe1002f
--- /dev/null
+++ b/data/layouts/PetalburgCity_Gym/layout.inc
@@ -0,0 +1,15 @@
+PetalburgCity_Gym_MapBorder::
+	.incbin "data/layouts/PetalburgCity_Gym/border.bin"
+
+PetalburgCity_Gym_MapBlockdata::
+	.incbin "data/layouts/PetalburgCity_Gym/map.bin"
+
+	.align 2
+PetalburgCity_Gym_Layout::
+	.4byte 0x9
+	.4byte 0x70
+	.4byte PetalburgCity_Gym_MapBorder
+	.4byte PetalburgCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PetalburgGym
+
diff --git a/data/maps/PetalburgCity_Gym/map.bin b/data/layouts/PetalburgCity_Gym/map.bin
index 17d5ba980..17d5ba980 100644
--- a/data/maps/PetalburgCity_Gym/map.bin
+++ b/data/layouts/PetalburgCity_Gym/map.bin
diff --git a/data/maps/PetalburgWoods/border.bin b/data/layouts/PetalburgWoods/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/PetalburgWoods/border.bin
+++ b/data/layouts/PetalburgWoods/border.bin
diff --git a/data/layouts/PetalburgWoods/layout.inc b/data/layouts/PetalburgWoods/layout.inc
new file mode 100644
index 000000000..840e17f7e
--- /dev/null
+++ b/data/layouts/PetalburgWoods/layout.inc
@@ -0,0 +1,15 @@
+PetalburgWoods_MapBorder::
+	.incbin "data/layouts/PetalburgWoods/border.bin"
+
+PetalburgWoods_MapBlockdata::
+	.incbin "data/layouts/PetalburgWoods/map.bin"
+
+	.align 2
+PetalburgWoods_Layout::
+	.4byte 0x30
+	.4byte 0x2c
+	.4byte PetalburgWoods_MapBorder
+	.4byte PetalburgWoods_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
+
diff --git a/data/maps/PetalburgWoods/map.bin b/data/layouts/PetalburgWoods/map.bin
index a032b4c43..a032b4c43 100644
--- a/data/maps/PetalburgWoods/map.bin
+++ b/data/layouts/PetalburgWoods/map.bin
diff --git a/data/maps/RecordCorner/border.bin b/data/layouts/PokemonCenter_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RecordCorner/border.bin
+++ b/data/layouts/PokemonCenter_1F/border.bin
diff --git a/data/layouts/PokemonCenter_1F/layout.inc b/data/layouts/PokemonCenter_1F/layout.inc
new file mode 100644
index 000000000..bf1335f84
--- /dev/null
+++ b/data/layouts/PokemonCenter_1F/layout.inc
@@ -0,0 +1,15 @@
+PokemonCenter_1F_MapBorder::
+	.incbin "data/layouts/PokemonCenter_1F/border.bin"
+
+PokemonCenter_1F_MapBlockdata::
+	.incbin "data/layouts/PokemonCenter_1F/map.bin"
+
+	.align 2
+PokemonCenter_1F_Layout::
+	.4byte 0xe
+	.4byte 0x9
+	.4byte PokemonCenter_1F_MapBorder
+	.4byte PokemonCenter_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
+
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.bin b/data/layouts/PokemonCenter_1F/map.bin
index 5201dde15..5201dde15 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/map.bin
+++ b/data/layouts/PokemonCenter_1F/map.bin
diff --git a/data/maps/Route104_MrBrineysHouse/border.bin b/data/layouts/PokemonCenter_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route104_MrBrineysHouse/border.bin
+++ b/data/layouts/PokemonCenter_2F/border.bin
diff --git a/data/layouts/PokemonCenter_2F/layout.inc b/data/layouts/PokemonCenter_2F/layout.inc
new file mode 100644
index 000000000..3cb812de7
--- /dev/null
+++ b/data/layouts/PokemonCenter_2F/layout.inc
@@ -0,0 +1,15 @@
+PokemonCenter_2F_MapBorder::
+	.incbin "data/layouts/PokemonCenter_2F/border.bin"
+
+PokemonCenter_2F_MapBlockdata::
+	.incbin "data/layouts/PokemonCenter_2F/map.bin"
+
+	.align 2
+PokemonCenter_2F_Layout::
+	.4byte 0xe
+	.4byte 0xa
+	.4byte PokemonCenter_2F_MapBorder
+	.4byte PokemonCenter_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
+
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.bin b/data/layouts/PokemonCenter_2F/map.bin
index c623d86fc..c623d86fc 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/map.bin
+++ b/data/layouts/PokemonCenter_2F/map.bin
diff --git a/data/maps/Route110_TrickHouseCorridor/border.bin b/data/layouts/RecordCorner/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route110_TrickHouseCorridor/border.bin
+++ b/data/layouts/RecordCorner/border.bin
diff --git a/data/layouts/RecordCorner/layout.inc b/data/layouts/RecordCorner/layout.inc
new file mode 100644
index 000000000..ed258b2a7
--- /dev/null
+++ b/data/layouts/RecordCorner/layout.inc
@@ -0,0 +1,15 @@
+RecordCorner_MapBorder::
+	.incbin "data/layouts/RecordCorner/border.bin"
+
+RecordCorner_MapBlockdata::
+	.incbin "data/layouts/RecordCorner/map.bin"
+
+	.align 2
+RecordCorner_Layout::
+	.4byte 0x14
+	.4byte 0xa
+	.4byte RecordCorner_MapBorder
+	.4byte RecordCorner_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
+
diff --git a/data/maps/RecordCorner/map.bin b/data/layouts/RecordCorner/map.bin
index 51dfb6e5a..51dfb6e5a 100644
--- a/data/maps/RecordCorner/map.bin
+++ b/data/layouts/RecordCorner/map.bin
diff --git a/data/maps/Route101/border.bin b/data/layouts/Route101/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route101/border.bin
+++ b/data/layouts/Route101/border.bin
diff --git a/data/layouts/Route101/layout.inc b/data/layouts/Route101/layout.inc
new file mode 100644
index 000000000..e42ecf340
--- /dev/null
+++ b/data/layouts/Route101/layout.inc
@@ -0,0 +1,15 @@
+Route101_MapBorder::
+	.incbin "data/layouts/Route101/border.bin"
+
+Route101_MapBlockdata::
+	.incbin "data/layouts/Route101/map.bin"
+
+	.align 2
+Route101_Layout::
+	.4byte 0x14
+	.4byte 0x14
+	.4byte Route101_MapBorder
+	.4byte Route101_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
+
diff --git a/data/maps/Route101/map.bin b/data/layouts/Route101/map.bin
index fab3a1d69..fab3a1d69 100644
--- a/data/maps/Route101/map.bin
+++ b/data/layouts/Route101/map.bin
diff --git a/data/maps/Route102/border.bin b/data/layouts/Route102/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route102/border.bin
+++ b/data/layouts/Route102/border.bin
diff --git a/data/layouts/Route102/layout.inc b/data/layouts/Route102/layout.inc
new file mode 100644
index 000000000..194d44fce
--- /dev/null
+++ b/data/layouts/Route102/layout.inc
@@ -0,0 +1,15 @@
+Route102_MapBorder::
+	.incbin "data/layouts/Route102/border.bin"
+
+Route102_MapBlockdata::
+	.incbin "data/layouts/Route102/map.bin"
+
+	.align 2
+Route102_Layout::
+	.4byte 0x32
+	.4byte 0x14
+	.4byte Route102_MapBorder
+	.4byte Route102_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
+
diff --git a/data/maps/Route102/map.bin b/data/layouts/Route102/map.bin
index 7378bb44b..7378bb44b 100644
--- a/data/maps/Route102/map.bin
+++ b/data/layouts/Route102/map.bin
diff --git a/data/maps/Route103/border.bin b/data/layouts/Route103/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route103/border.bin
+++ b/data/layouts/Route103/border.bin
diff --git a/data/layouts/Route103/layout.inc b/data/layouts/Route103/layout.inc
new file mode 100644
index 000000000..fe3bac066
--- /dev/null
+++ b/data/layouts/Route103/layout.inc
@@ -0,0 +1,15 @@
+Route103_MapBorder::
+	.incbin "data/layouts/Route103/border.bin"
+
+Route103_MapBlockdata::
+	.incbin "data/layouts/Route103/map.bin"
+
+	.align 2
+Route103_Layout::
+	.4byte 0x50
+	.4byte 0x16
+	.4byte Route103_MapBorder
+	.4byte Route103_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
+
diff --git a/data/maps/Route103/map.bin b/data/layouts/Route103/map.bin
index 44518dc92..44518dc92 100644
--- a/data/maps/Route103/map.bin
+++ b/data/layouts/Route103/map.bin
diff --git a/data/maps/Route104/border.bin b/data/layouts/Route104/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route104/border.bin
+++ b/data/layouts/Route104/border.bin
diff --git a/data/layouts/Route104/layout.inc b/data/layouts/Route104/layout.inc
new file mode 100644
index 000000000..9a9418e46
--- /dev/null
+++ b/data/layouts/Route104/layout.inc
@@ -0,0 +1,15 @@
+Route104_MapBorder::
+	.incbin "data/layouts/Route104/border.bin"
+
+Route104_MapBlockdata::
+	.incbin "data/layouts/Route104/map.bin"
+
+	.align 2
+Route104_Layout::
+	.4byte 0x28
+	.4byte 0x50
+	.4byte Route104_MapBorder
+	.4byte Route104_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
+
diff --git a/data/maps/Route104/map.bin b/data/layouts/Route104/map.bin
index 7731bc31c..7731bc31c 100644
--- a/data/maps/Route104/map.bin
+++ b/data/layouts/Route104/map.bin
diff --git a/data/maps/Route110_TrickHouseEnd/border.bin b/data/layouts/Route104_MrBrineysHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route110_TrickHouseEnd/border.bin
+++ b/data/layouts/Route104_MrBrineysHouse/border.bin
diff --git a/data/layouts/Route104_MrBrineysHouse/layout.inc b/data/layouts/Route104_MrBrineysHouse/layout.inc
new file mode 100644
index 000000000..3474f3335
--- /dev/null
+++ b/data/layouts/Route104_MrBrineysHouse/layout.inc
@@ -0,0 +1,15 @@
+Route104_MrBrineysHouse_MapBorder::
+	.incbin "data/layouts/Route104_MrBrineysHouse/border.bin"
+
+Route104_MrBrineysHouse_MapBlockdata::
+	.incbin "data/layouts/Route104_MrBrineysHouse/map.bin"
+
+	.align 2
+Route104_MrBrineysHouse_Layout::
+	.4byte 0xc
+	.4byte 0x9
+	.4byte Route104_MrBrineysHouse_MapBorder
+	.4byte Route104_MrBrineysHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/Route104_MrBrineysHouse/map.bin b/data/layouts/Route104_MrBrineysHouse/map.bin
index 7660fd5d7..7660fd5d7 100644
--- a/data/maps/Route104_MrBrineysHouse/map.bin
+++ b/data/layouts/Route104_MrBrineysHouse/map.bin
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/border.bin b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/border.bin
+++ b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin
diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc
new file mode 100644
index 000000000..a46ffc18c
--- /dev/null
+++ b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc
@@ -0,0 +1,15 @@
+Route104_PrettyPetalFlowerShop_MapBorder::
+	.incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin"
+
+Route104_PrettyPetalFlowerShop_MapBlockdata::
+	.incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin"
+
+	.align 2
+Route104_PrettyPetalFlowerShop_Layout::
+	.4byte 0xf
+	.4byte 0x9
+	.4byte Route104_PrettyPetalFlowerShop_MapBorder
+	.4byte Route104_PrettyPetalFlowerShop_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PrettyPetalFlowerShop
+
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.bin b/data/layouts/Route104_PrettyPetalFlowerShop/map.bin
index d34ff5c1a..d34ff5c1a 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/map.bin
+++ b/data/layouts/Route104_PrettyPetalFlowerShop/map.bin
diff --git a/data/maps/Route104_Prototype/border.bin b/data/layouts/Route104_Prototype/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route104_Prototype/border.bin
+++ b/data/layouts/Route104_Prototype/border.bin
diff --git a/data/layouts/Route104_Prototype/layout.inc b/data/layouts/Route104_Prototype/layout.inc
new file mode 100644
index 000000000..b2b2c4f19
--- /dev/null
+++ b/data/layouts/Route104_Prototype/layout.inc
@@ -0,0 +1,15 @@
+Route104_Prototype_MapBorder::
+	.incbin "data/layouts/Route104_Prototype/border.bin"
+
+Route104_Prototype_MapBlockdata::
+	.incbin "data/layouts/Route104_Prototype/map.bin"
+
+	.align 2
+Route104_Prototype_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte Route104_Prototype_MapBorder
+	.4byte Route104_Prototype_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
+
diff --git a/data/maps/Route104_Prototype/map.bin b/data/layouts/Route104_Prototype/map.bin
index 71bd63e62..71bd63e62 100644
--- a/data/maps/Route104_Prototype/map.bin
+++ b/data/layouts/Route104_Prototype/map.bin
diff --git a/data/maps/Route105/border.bin b/data/layouts/Route105/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route105/border.bin
+++ b/data/layouts/Route105/border.bin
diff --git a/data/layouts/Route105/layout.inc b/data/layouts/Route105/layout.inc
new file mode 100644
index 000000000..ce78ef9cc
--- /dev/null
+++ b/data/layouts/Route105/layout.inc
@@ -0,0 +1,15 @@
+Route105_MapBorder::
+	.incbin "data/layouts/Route105/border.bin"
+
+Route105_MapBlockdata::
+	.incbin "data/layouts/Route105/map.bin"
+
+	.align 2
+Route105_Layout::
+	.4byte 0x28
+	.4byte 0x50
+	.4byte Route105_MapBorder
+	.4byte Route105_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
+
diff --git a/data/maps/Route105/map.bin b/data/layouts/Route105/map.bin
index c4bd8286c..c4bd8286c 100644
--- a/data/maps/Route105/map.bin
+++ b/data/layouts/Route105/map.bin
diff --git a/data/maps/Route106/border.bin b/data/layouts/Route106/border.bin
index 281762f5b..281762f5b 100644
--- a/data/maps/Route106/border.bin
+++ b/data/layouts/Route106/border.bin
diff --git a/data/layouts/Route106/layout.inc b/data/layouts/Route106/layout.inc
new file mode 100644
index 000000000..ea255b383
--- /dev/null
+++ b/data/layouts/Route106/layout.inc
@@ -0,0 +1,15 @@
+Route106_MapBorder::
+	.incbin "data/layouts/Route106/border.bin"
+
+Route106_MapBlockdata::
+	.incbin "data/layouts/Route106/map.bin"
+
+	.align 2
+Route106_Layout::
+	.4byte 0x50
+	.4byte 0x14
+	.4byte Route106_MapBorder
+	.4byte Route106_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
+
diff --git a/data/maps/Route106/map.bin b/data/layouts/Route106/map.bin
index b7e7d7238..b7e7d7238 100644
--- a/data/maps/Route106/map.bin
+++ b/data/layouts/Route106/map.bin
diff --git a/data/maps/Route107/border.bin b/data/layouts/Route107/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route107/border.bin
+++ b/data/layouts/Route107/border.bin
diff --git a/data/layouts/Route107/layout.inc b/data/layouts/Route107/layout.inc
new file mode 100644
index 000000000..ea305b2a7
--- /dev/null
+++ b/data/layouts/Route107/layout.inc
@@ -0,0 +1,15 @@
+Route107_MapBorder::
+	.incbin "data/layouts/Route107/border.bin"
+
+Route107_MapBlockdata::
+	.incbin "data/layouts/Route107/map.bin"
+
+	.align 2
+Route107_Layout::
+	.4byte 0x3c
+	.4byte 0x14
+	.4byte Route107_MapBorder
+	.4byte Route107_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
+
diff --git a/data/maps/Route107/map.bin b/data/layouts/Route107/map.bin
index 521997b0f..521997b0f 100644
--- a/data/maps/Route107/map.bin
+++ b/data/layouts/Route107/map.bin
diff --git a/data/maps/Route108/border.bin b/data/layouts/Route108/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route108/border.bin
+++ b/data/layouts/Route108/border.bin
diff --git a/data/layouts/Route108/layout.inc b/data/layouts/Route108/layout.inc
new file mode 100644
index 000000000..1ec7171cf
--- /dev/null
+++ b/data/layouts/Route108/layout.inc
@@ -0,0 +1,15 @@
+Route108_MapBorder::
+	.incbin "data/layouts/Route108/border.bin"
+
+Route108_MapBlockdata::
+	.incbin "data/layouts/Route108/map.bin"
+
+	.align 2
+Route108_Layout::
+	.4byte 0x3c
+	.4byte 0x14
+	.4byte Route108_MapBorder
+	.4byte Route108_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Slateport
+
diff --git a/data/maps/Route108/map.bin b/data/layouts/Route108/map.bin
index 138ddc020..138ddc020 100644
--- a/data/maps/Route108/map.bin
+++ b/data/layouts/Route108/map.bin
diff --git a/data/maps/Route109/border.bin b/data/layouts/Route109/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route109/border.bin
+++ b/data/layouts/Route109/border.bin
diff --git a/data/layouts/Route109/layout.inc b/data/layouts/Route109/layout.inc
new file mode 100644
index 000000000..fa41585e9
--- /dev/null
+++ b/data/layouts/Route109/layout.inc
@@ -0,0 +1,15 @@
+Route109_MapBorder::
+	.incbin "data/layouts/Route109/border.bin"
+
+Route109_MapBlockdata::
+	.incbin "data/layouts/Route109/map.bin"
+
+	.align 2
+Route109_Layout::
+	.4byte 0x28
+	.4byte 0x3f
+	.4byte Route109_MapBorder
+	.4byte Route109_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Slateport
+
diff --git a/data/maps/Route109/map.bin b/data/layouts/Route109/map.bin
index 62350867e..62350867e 100644
--- a/data/maps/Route109/map.bin
+++ b/data/layouts/Route109/map.bin
diff --git a/data/maps/Route109_SeashoreHouse/border.bin b/data/layouts/Route109_SeashoreHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route109_SeashoreHouse/border.bin
+++ b/data/layouts/Route109_SeashoreHouse/border.bin
diff --git a/data/layouts/Route109_SeashoreHouse/layout.inc b/data/layouts/Route109_SeashoreHouse/layout.inc
new file mode 100644
index 000000000..9ec997b48
--- /dev/null
+++ b/data/layouts/Route109_SeashoreHouse/layout.inc
@@ -0,0 +1,15 @@
+Route109_SeashoreHouse_MapBorder::
+	.incbin "data/layouts/Route109_SeashoreHouse/border.bin"
+
+Route109_SeashoreHouse_MapBlockdata::
+	.incbin "data/layouts/Route109_SeashoreHouse/map.bin"
+
+	.align 2
+Route109_SeashoreHouse_Layout::
+	.4byte 0xf
+	.4byte 0xa
+	.4byte Route109_SeashoreHouse_MapBorder
+	.4byte Route109_SeashoreHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_SeashoreHouse
+
diff --git a/data/maps/Route109_SeashoreHouse/map.bin b/data/layouts/Route109_SeashoreHouse/map.bin
index cb7853a17..cb7853a17 100644
--- a/data/maps/Route109_SeashoreHouse/map.bin
+++ b/data/layouts/Route109_SeashoreHouse/map.bin
diff --git a/data/maps/Route110/border.bin b/data/layouts/Route110/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route110/border.bin
+++ b/data/layouts/Route110/border.bin
diff --git a/data/layouts/Route110/layout.inc b/data/layouts/Route110/layout.inc
new file mode 100644
index 000000000..24e5a9321
--- /dev/null
+++ b/data/layouts/Route110/layout.inc
@@ -0,0 +1,15 @@
+Route110_MapBorder::
+	.incbin "data/layouts/Route110/border.bin"
+
+Route110_MapBlockdata::
+	.incbin "data/layouts/Route110/map.bin"
+
+	.align 2
+Route110_Layout::
+	.4byte 0x28
+	.4byte 0x64
+	.4byte Route110_MapBorder
+	.4byte Route110_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
+
diff --git a/data/maps/Route110/map.bin b/data/layouts/Route110/map.bin
index ac83cb93d..ac83cb93d 100644
--- a/data/maps/Route110/map.bin
+++ b/data/layouts/Route110/map.bin
diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin b/data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin
diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc
new file mode 100644
index 000000000..abf78f62d
--- /dev/null
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc
@@ -0,0 +1,15 @@
+Route110_SeasideCyclingRoadEntrance_MapBorder::
+	.incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin"
+
+Route110_SeasideCyclingRoadEntrance_MapBlockdata::
+	.incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin"
+
+	.align 2
+Route110_SeasideCyclingRoadEntrance_Layout::
+	.4byte 0xf
+	.4byte 0x6
+	.4byte Route110_SeasideCyclingRoadEntrance_MapBorder
+	.4byte Route110_SeasideCyclingRoadEntrance_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
+
diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin b/data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin
index e9fc770d4..e9fc770d4 100644
--- a/data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin
diff --git a/data/maps/Route110_TrickHouseEntrance/border.bin b/data/layouts/Route110_TrickHouseCorridor/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route110_TrickHouseEntrance/border.bin
+++ b/data/layouts/Route110_TrickHouseCorridor/border.bin
diff --git a/data/layouts/Route110_TrickHouseCorridor/layout.inc b/data/layouts/Route110_TrickHouseCorridor/layout.inc
new file mode 100644
index 000000000..fe6ee4d26
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseCorridor/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHouseCorridor_MapBorder::
+	.incbin "data/layouts/Route110_TrickHouseCorridor/border.bin"
+
+Route110_TrickHouseCorridor_MapBlockdata::
+	.incbin "data/layouts/Route110_TrickHouseCorridor/map.bin"
+
+	.align 2
+Route110_TrickHouseCorridor_Layout::
+	.4byte 0xf
+	.4byte 0x18
+	.4byte Route110_TrickHouseCorridor_MapBorder
+	.4byte Route110_TrickHouseCorridor_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/Route110_TrickHouseCorridor/map.bin b/data/layouts/Route110_TrickHouseCorridor/map.bin
index 8981d28bd..8981d28bd 100644
--- a/data/maps/Route110_TrickHouseCorridor/map.bin
+++ b/data/layouts/Route110_TrickHouseCorridor/map.bin
diff --git a/data/maps/Route112_CableCarStation/border.bin b/data/layouts/Route110_TrickHouseEnd/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route112_CableCarStation/border.bin
+++ b/data/layouts/Route110_TrickHouseEnd/border.bin
diff --git a/data/layouts/Route110_TrickHouseEnd/layout.inc b/data/layouts/Route110_TrickHouseEnd/layout.inc
new file mode 100644
index 000000000..dd9474aee
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseEnd/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHouseEnd_MapBorder::
+	.incbin "data/layouts/Route110_TrickHouseEnd/border.bin"
+
+Route110_TrickHouseEnd_MapBlockdata::
+	.incbin "data/layouts/Route110_TrickHouseEnd/map.bin"
+
+	.align 2
+Route110_TrickHouseEnd_Layout::
+	.4byte 0xc
+	.4byte 0x8
+	.4byte Route110_TrickHouseEnd_MapBorder
+	.4byte Route110_TrickHouseEnd_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/Route110_TrickHouseEnd/map.bin b/data/layouts/Route110_TrickHouseEnd/map.bin
index 506fdb644..506fdb644 100644
--- a/data/maps/Route110_TrickHouseEnd/map.bin
+++ b/data/layouts/Route110_TrickHouseEnd/map.bin
diff --git a/data/maps/Route114_FossilManiacsHouse/border.bin b/data/layouts/Route110_TrickHouseEntrance/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route114_FossilManiacsHouse/border.bin
+++ b/data/layouts/Route110_TrickHouseEntrance/border.bin
diff --git a/data/layouts/Route110_TrickHouseEntrance/layout.inc b/data/layouts/Route110_TrickHouseEntrance/layout.inc
new file mode 100644
index 000000000..97f3abe24
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseEntrance/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHouseEntrance_MapBorder::
+	.incbin "data/layouts/Route110_TrickHouseEntrance/border.bin"
+
+Route110_TrickHouseEntrance_MapBlockdata::
+	.incbin "data/layouts/Route110_TrickHouseEntrance/map.bin"
+
+	.align 2
+Route110_TrickHouseEntrance_Layout::
+	.4byte 0xc
+	.4byte 0x8
+	.4byte Route110_TrickHouseEntrance_MapBorder
+	.4byte Route110_TrickHouseEntrance_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/Route110_TrickHouseEntrance/map.bin b/data/layouts/Route110_TrickHouseEntrance/map.bin
index 1306bb9b5..1306bb9b5 100644
--- a/data/maps/Route110_TrickHouseEntrance/map.bin
+++ b/data/layouts/Route110_TrickHouseEntrance/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle1/border.bin b/data/layouts/Route110_TrickHousePuzzle1/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle1/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle1/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle1/layout.inc b/data/layouts/Route110_TrickHousePuzzle1/layout.inc
new file mode 100644
index 000000000..546876ab0
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle1/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle1_MapBorder::
+	.incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin"
+
+Route110_TrickHousePuzzle1_MapBlockdata::
+	.incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle1_Layout::
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle1_MapBorder
+	.4byte Route110_TrickHousePuzzle1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
+
diff --git a/data/maps/Route110_TrickHousePuzzle1/map.bin b/data/layouts/Route110_TrickHousePuzzle1/map.bin
index 2bf5b392c..2bf5b392c 100644
--- a/data/maps/Route110_TrickHousePuzzle1/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle1/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle2/border.bin b/data/layouts/Route110_TrickHousePuzzle2/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle2/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle2/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle2/layout.inc b/data/layouts/Route110_TrickHousePuzzle2/layout.inc
new file mode 100644
index 000000000..65caaa734
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle2/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle2_MapBorder::
+	.incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin"
+
+Route110_TrickHousePuzzle2_MapBlockdata::
+	.incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle2_Layout::
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle2_MapBorder
+	.4byte Route110_TrickHousePuzzle2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
+
diff --git a/data/maps/Route110_TrickHousePuzzle2/map.bin b/data/layouts/Route110_TrickHousePuzzle2/map.bin
index cb35a063e..cb35a063e 100644
--- a/data/maps/Route110_TrickHousePuzzle2/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle2/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle3/border.bin b/data/layouts/Route110_TrickHousePuzzle3/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle3/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle3/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle3/layout.inc b/data/layouts/Route110_TrickHousePuzzle3/layout.inc
new file mode 100644
index 000000000..a03cf9a71
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle3/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle3_MapBorder::
+	.incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin"
+
+Route110_TrickHousePuzzle3_MapBlockdata::
+	.incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle3_Layout::
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle3_MapBorder
+	.4byte Route110_TrickHousePuzzle3_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
+
diff --git a/data/maps/Route110_TrickHousePuzzle3/map.bin b/data/layouts/Route110_TrickHousePuzzle3/map.bin
index ac4f344d9..ac4f344d9 100644
--- a/data/maps/Route110_TrickHousePuzzle3/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle3/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle4/border.bin b/data/layouts/Route110_TrickHousePuzzle4/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle4/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle4/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle4/layout.inc b/data/layouts/Route110_TrickHousePuzzle4/layout.inc
new file mode 100644
index 000000000..581b41a43
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle4/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle4_MapBorder::
+	.incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin"
+
+Route110_TrickHousePuzzle4_MapBlockdata::
+	.incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle4_Layout::
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle4_MapBorder
+	.4byte Route110_TrickHousePuzzle4_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
+
diff --git a/data/maps/Route110_TrickHousePuzzle4/map.bin b/data/layouts/Route110_TrickHousePuzzle4/map.bin
index 2dbcf251b..2dbcf251b 100644
--- a/data/maps/Route110_TrickHousePuzzle4/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle4/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle5/border.bin b/data/layouts/Route110_TrickHousePuzzle5/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle5/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle5/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle5/layout.inc b/data/layouts/Route110_TrickHousePuzzle5/layout.inc
new file mode 100644
index 000000000..5e06ac31e
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle5/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle5_MapBorder::
+	.incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin"
+
+Route110_TrickHousePuzzle5_MapBlockdata::
+	.incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle5_Layout::
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle5_MapBorder
+	.4byte Route110_TrickHousePuzzle5_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
+
diff --git a/data/maps/Route110_TrickHousePuzzle5/map.bin b/data/layouts/Route110_TrickHousePuzzle5/map.bin
index 470e3eba3..470e3eba3 100644
--- a/data/maps/Route110_TrickHousePuzzle5/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle5/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle6/border.bin b/data/layouts/Route110_TrickHousePuzzle6/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle6/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle6/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle6/layout.inc b/data/layouts/Route110_TrickHousePuzzle6/layout.inc
new file mode 100644
index 000000000..398c17951
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle6/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle6_MapBorder::
+	.incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin"
+
+Route110_TrickHousePuzzle6_MapBlockdata::
+	.incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle6_Layout::
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle6_MapBorder
+	.4byte Route110_TrickHousePuzzle6_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
+
diff --git a/data/maps/Route110_TrickHousePuzzle6/map.bin b/data/layouts/Route110_TrickHousePuzzle6/map.bin
index 45dc20ba1..45dc20ba1 100644
--- a/data/maps/Route110_TrickHousePuzzle6/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle6/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle7/border.bin b/data/layouts/Route110_TrickHousePuzzle7/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle7/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle7/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle7/layout.inc b/data/layouts/Route110_TrickHousePuzzle7/layout.inc
new file mode 100644
index 000000000..1612ec41b
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle7/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle7_MapBorder::
+	.incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin"
+
+Route110_TrickHousePuzzle7_MapBlockdata::
+	.incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle7_Layout::
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle7_MapBorder
+	.4byte Route110_TrickHousePuzzle7_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
+
diff --git a/data/maps/Route110_TrickHousePuzzle7/map.bin b/data/layouts/Route110_TrickHousePuzzle7/map.bin
index 68ac73547..68ac73547 100644
--- a/data/maps/Route110_TrickHousePuzzle7/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle7/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle8/border.bin b/data/layouts/Route110_TrickHousePuzzle8/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle8/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle8/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle8/layout.inc b/data/layouts/Route110_TrickHousePuzzle8/layout.inc
new file mode 100644
index 000000000..3520b503f
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle8/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle8_MapBorder::
+	.incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin"
+
+Route110_TrickHousePuzzle8_MapBlockdata::
+	.incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle8_Layout::
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle8_MapBorder
+	.4byte Route110_TrickHousePuzzle8_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
+
diff --git a/data/maps/Route110_TrickHousePuzzle8/map.bin b/data/layouts/Route110_TrickHousePuzzle8/map.bin
index b59b0f606..b59b0f606 100644
--- a/data/maps/Route110_TrickHousePuzzle8/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle8/map.bin
diff --git a/data/maps/Route111/border.bin b/data/layouts/Route111/border.bin
index 4531975c7..4531975c7 100644
--- a/data/maps/Route111/border.bin
+++ b/data/layouts/Route111/border.bin
diff --git a/data/layouts/Route111/layout.inc b/data/layouts/Route111/layout.inc
new file mode 100644
index 000000000..2966c06c5
--- /dev/null
+++ b/data/layouts/Route111/layout.inc
@@ -0,0 +1,15 @@
+Route111_MapBorder::
+	.incbin "data/layouts/Route111/border.bin"
+
+Route111_MapBlockdata::
+	.incbin "data/layouts/Route111/map.bin"
+
+	.align 2
+Route111_Layout::
+	.4byte 0x28
+	.4byte 0x8c
+	.4byte Route111_MapBorder
+	.4byte Route111_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
+
diff --git a/data/maps/Route111/map.bin b/data/layouts/Route111/map.bin
index 4ce11a8a9..4ce11a8a9 100644
--- a/data/maps/Route111/map.bin
+++ b/data/layouts/Route111/map.bin
diff --git a/data/maps/Route112/border.bin b/data/layouts/Route112/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/Route112/border.bin
+++ b/data/layouts/Route112/border.bin
diff --git a/data/layouts/Route112/layout.inc b/data/layouts/Route112/layout.inc
new file mode 100644
index 000000000..72a0c428c
--- /dev/null
+++ b/data/layouts/Route112/layout.inc
@@ -0,0 +1,15 @@
+Route112_MapBorder::
+	.incbin "data/layouts/Route112/border.bin"
+
+Route112_MapBlockdata::
+	.incbin "data/layouts/Route112/map.bin"
+
+	.align 2
+Route112_Layout::
+	.4byte 0x28
+	.4byte 0x3c
+	.4byte Route112_MapBorder
+	.4byte Route112_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
+
diff --git a/data/maps/Route112/map.bin b/data/layouts/Route112/map.bin
index ef3fd5f10..ef3fd5f10 100644
--- a/data/maps/Route112/map.bin
+++ b/data/layouts/Route112/map.bin
diff --git a/data/maps/Route113/border.bin b/data/layouts/Route113/border.bin
index 73e1e3c60..73e1e3c60 100644
--- a/data/maps/Route113/border.bin
+++ b/data/layouts/Route113/border.bin
diff --git a/data/layouts/Route113/layout.inc b/data/layouts/Route113/layout.inc
new file mode 100644
index 000000000..0c1d76b58
--- /dev/null
+++ b/data/layouts/Route113/layout.inc
@@ -0,0 +1,15 @@
+Route113_MapBorder::
+	.incbin "data/layouts/Route113/border.bin"
+
+Route113_MapBlockdata::
+	.incbin "data/layouts/Route113/map.bin"
+
+	.align 2
+Route113_Layout::
+	.4byte 0x64
+	.4byte 0x14
+	.4byte Route113_MapBorder
+	.4byte Route113_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
+
diff --git a/data/maps/Route113/map.bin b/data/layouts/Route113/map.bin
index 609690de2..609690de2 100644
--- a/data/maps/Route113/map.bin
+++ b/data/layouts/Route113/map.bin
diff --git a/data/maps/Route114/border.bin b/data/layouts/Route114/border.bin
index 23e2a92e5..23e2a92e5 100644
--- a/data/maps/Route114/border.bin
+++ b/data/layouts/Route114/border.bin
diff --git a/data/layouts/Route114/layout.inc b/data/layouts/Route114/layout.inc
new file mode 100644
index 000000000..071f9e1b6
--- /dev/null
+++ b/data/layouts/Route114/layout.inc
@@ -0,0 +1,15 @@
+Route114_MapBorder::
+	.incbin "data/layouts/Route114/border.bin"
+
+Route114_MapBlockdata::
+	.incbin "data/layouts/Route114/map.bin"
+
+	.align 2
+Route114_Layout::
+	.4byte 0x28
+	.4byte 0x50
+	.4byte Route114_MapBorder
+	.4byte Route114_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
+
diff --git a/data/maps/Route114/map.bin b/data/layouts/Route114/map.bin
index 3bad45e04..3bad45e04 100644
--- a/data/maps/Route114/map.bin
+++ b/data/layouts/Route114/map.bin
diff --git a/data/maps/Route114_LanettesHouse/border.bin b/data/layouts/Route114_FossilManiacsHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route114_LanettesHouse/border.bin
+++ b/data/layouts/Route114_FossilManiacsHouse/border.bin
diff --git a/data/layouts/Route114_FossilManiacsHouse/layout.inc b/data/layouts/Route114_FossilManiacsHouse/layout.inc
new file mode 100644
index 000000000..f915e572a
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsHouse/layout.inc
@@ -0,0 +1,15 @@
+Route114_FossilManiacsHouse_MapBorder::
+	.incbin "data/layouts/Route114_FossilManiacsHouse/border.bin"
+
+Route114_FossilManiacsHouse_MapBlockdata::
+	.incbin "data/layouts/Route114_FossilManiacsHouse/map.bin"
+
+	.align 2
+Route114_FossilManiacsHouse_Layout::
+	.4byte 0xa
+	.4byte 0x8
+	.4byte Route114_FossilManiacsHouse_MapBorder
+	.4byte Route114_FossilManiacsHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/Route114_FossilManiacsHouse/map.bin b/data/layouts/Route114_FossilManiacsHouse/map.bin
index ea2d94fda..ea2d94fda 100644
--- a/data/maps/Route114_FossilManiacsHouse/map.bin
+++ b/data/layouts/Route114_FossilManiacsHouse/map.bin
diff --git a/data/maps/Route114_FossilManiacsTunnel/border.bin b/data/layouts/Route114_FossilManiacsTunnel/border.bin
index 580a207f4..580a207f4 100644
--- a/data/maps/Route114_FossilManiacsTunnel/border.bin
+++ b/data/layouts/Route114_FossilManiacsTunnel/border.bin
diff --git a/data/layouts/Route114_FossilManiacsTunnel/layout.inc b/data/layouts/Route114_FossilManiacsTunnel/layout.inc
new file mode 100644
index 000000000..c2392ff01
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsTunnel/layout.inc
@@ -0,0 +1,15 @@
+Route114_FossilManiacsTunnel_MapBorder::
+	.incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin"
+
+Route114_FossilManiacsTunnel_MapBlockdata::
+	.incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin"
+
+	.align 2
+Route114_FossilManiacsTunnel_Layout::
+	.4byte 0xd
+	.4byte 0x1a
+	.4byte Route114_FossilManiacsTunnel_MapBorder
+	.4byte Route114_FossilManiacsTunnel_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
+
diff --git a/data/maps/Route114_FossilManiacsTunnel/map.bin b/data/layouts/Route114_FossilManiacsTunnel/map.bin
index 61838bff2..61838bff2 100644
--- a/data/maps/Route114_FossilManiacsTunnel/map.bin
+++ b/data/layouts/Route114_FossilManiacsTunnel/map.bin
diff --git a/data/maps/Route116_TunnelersRestHouse/border.bin b/data/layouts/Route114_LanettesHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route116_TunnelersRestHouse/border.bin
+++ b/data/layouts/Route114_LanettesHouse/border.bin
diff --git a/data/layouts/Route114_LanettesHouse/layout.inc b/data/layouts/Route114_LanettesHouse/layout.inc
new file mode 100644
index 000000000..be9689ae3
--- /dev/null
+++ b/data/layouts/Route114_LanettesHouse/layout.inc
@@ -0,0 +1,15 @@
+Route114_LanettesHouse_MapBorder::
+	.incbin "data/layouts/Route114_LanettesHouse/border.bin"
+
+Route114_LanettesHouse_MapBlockdata::
+	.incbin "data/layouts/Route114_LanettesHouse/map.bin"
+
+	.align 2
+Route114_LanettesHouse_Layout::
+	.4byte 0xb
+	.4byte 0x8
+	.4byte Route114_LanettesHouse_MapBorder
+	.4byte Route114_LanettesHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
+
diff --git a/data/maps/Route114_LanettesHouse/map.bin b/data/layouts/Route114_LanettesHouse/map.bin
index de1858be4..de1858be4 100644
--- a/data/maps/Route114_LanettesHouse/map.bin
+++ b/data/layouts/Route114_LanettesHouse/map.bin
diff --git a/data/maps/Route115/border.bin b/data/layouts/Route115/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route115/border.bin
+++ b/data/layouts/Route115/border.bin
diff --git a/data/layouts/Route115/layout.inc b/data/layouts/Route115/layout.inc
new file mode 100644
index 000000000..9d6c3c969
--- /dev/null
+++ b/data/layouts/Route115/layout.inc
@@ -0,0 +1,15 @@
+Route115_MapBorder::
+	.incbin "data/layouts/Route115/border.bin"
+
+Route115_MapBlockdata::
+	.incbin "data/layouts/Route115/map.bin"
+
+	.align 2
+Route115_Layout::
+	.4byte 0x28
+	.4byte 0x50
+	.4byte Route115_MapBorder
+	.4byte Route115_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
+
diff --git a/data/maps/Route115/map.bin b/data/layouts/Route115/map.bin
index 64a58e691..64a58e691 100644
--- a/data/maps/Route115/map.bin
+++ b/data/layouts/Route115/map.bin
diff --git a/data/maps/Route116/border.bin b/data/layouts/Route116/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route116/border.bin
+++ b/data/layouts/Route116/border.bin
diff --git a/data/layouts/Route116/layout.inc b/data/layouts/Route116/layout.inc
new file mode 100644
index 000000000..232cc41f8
--- /dev/null
+++ b/data/layouts/Route116/layout.inc
@@ -0,0 +1,15 @@
+Route116_MapBorder::
+	.incbin "data/layouts/Route116/border.bin"
+
+Route116_MapBlockdata::
+	.incbin "data/layouts/Route116/map.bin"
+
+	.align 2
+Route116_Layout::
+	.4byte 0x64
+	.4byte 0x14
+	.4byte Route116_MapBorder
+	.4byte Route116_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
+
diff --git a/data/maps/Route116/map.bin b/data/layouts/Route116/map.bin
index a6e9d8843..a6e9d8843 100644
--- a/data/maps/Route116/map.bin
+++ b/data/layouts/Route116/map.bin
diff --git a/data/maps/Route119_WeatherInstitute_1F/border.bin b/data/layouts/Route116_TunnelersRestHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route119_WeatherInstitute_1F/border.bin
+++ b/data/layouts/Route116_TunnelersRestHouse/border.bin
diff --git a/data/layouts/Route116_TunnelersRestHouse/layout.inc b/data/layouts/Route116_TunnelersRestHouse/layout.inc
new file mode 100644
index 000000000..1bd42eafc
--- /dev/null
+++ b/data/layouts/Route116_TunnelersRestHouse/layout.inc
@@ -0,0 +1,15 @@
+Route116_TunnelersRestHouse_MapBorder::
+	.incbin "data/layouts/Route116_TunnelersRestHouse/border.bin"
+
+Route116_TunnelersRestHouse_MapBlockdata::
+	.incbin "data/layouts/Route116_TunnelersRestHouse/map.bin"
+
+	.align 2
+Route116_TunnelersRestHouse_Layout::
+	.4byte 0xa
+	.4byte 0x9
+	.4byte Route116_TunnelersRestHouse_MapBorder
+	.4byte Route116_TunnelersRestHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/Route116_TunnelersRestHouse/map.bin b/data/layouts/Route116_TunnelersRestHouse/map.bin
index 91e2c2019..91e2c2019 100644
--- a/data/maps/Route116_TunnelersRestHouse/map.bin
+++ b/data/layouts/Route116_TunnelersRestHouse/map.bin
diff --git a/data/maps/Route117/border.bin b/data/layouts/Route117/border.bin
index addb5d6ce..addb5d6ce 100644
--- a/data/maps/Route117/border.bin
+++ b/data/layouts/Route117/border.bin
diff --git a/data/layouts/Route117/layout.inc b/data/layouts/Route117/layout.inc
new file mode 100644
index 000000000..25e133f28
--- /dev/null
+++ b/data/layouts/Route117/layout.inc
@@ -0,0 +1,15 @@
+Route117_MapBorder::
+	.incbin "data/layouts/Route117/border.bin"
+
+Route117_MapBlockdata::
+	.incbin "data/layouts/Route117/map.bin"
+
+	.align 2
+Route117_Layout::
+	.4byte 0x3c
+	.4byte 0x14
+	.4byte Route117_MapBorder
+	.4byte Route117_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
+
diff --git a/data/maps/Route117/map.bin b/data/layouts/Route117/map.bin
index bdeda9cd4..bdeda9cd4 100644
--- a/data/maps/Route117/map.bin
+++ b/data/layouts/Route117/map.bin
diff --git a/data/maps/Route117_PokemonDayCare/border.bin b/data/layouts/Route117_PokemonDayCare/border.bin
index 7f603e844..7f603e844 100644
--- a/data/maps/Route117_PokemonDayCare/border.bin
+++ b/data/layouts/Route117_PokemonDayCare/border.bin
diff --git a/data/layouts/Route117_PokemonDayCare/layout.inc b/data/layouts/Route117_PokemonDayCare/layout.inc
new file mode 100644
index 000000000..403881bfe
--- /dev/null
+++ b/data/layouts/Route117_PokemonDayCare/layout.inc
@@ -0,0 +1,15 @@
+Route117_PokemonDayCare_MapBorder::
+	.incbin "data/layouts/Route117_PokemonDayCare/border.bin"
+
+Route117_PokemonDayCare_MapBlockdata::
+	.incbin "data/layouts/Route117_PokemonDayCare/map.bin"
+
+	.align 2
+Route117_PokemonDayCare_Layout::
+	.4byte 0xc
+	.4byte 0x9
+	.4byte Route117_PokemonDayCare_MapBorder
+	.4byte Route117_PokemonDayCare_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonDayCare
+
diff --git a/data/maps/Route117_PokemonDayCare/map.bin b/data/layouts/Route117_PokemonDayCare/map.bin
index bd4b64e13..bd4b64e13 100644
--- a/data/maps/Route117_PokemonDayCare/map.bin
+++ b/data/layouts/Route117_PokemonDayCare/map.bin
diff --git a/data/maps/Route118/border.bin b/data/layouts/Route118/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route118/border.bin
+++ b/data/layouts/Route118/border.bin
diff --git a/data/layouts/Route118/layout.inc b/data/layouts/Route118/layout.inc
new file mode 100644
index 000000000..cb87f8414
--- /dev/null
+++ b/data/layouts/Route118/layout.inc
@@ -0,0 +1,15 @@
+Route118_MapBorder::
+	.incbin "data/layouts/Route118/border.bin"
+
+Route118_MapBlockdata::
+	.incbin "data/layouts/Route118/map.bin"
+
+	.align 2
+Route118_Layout::
+	.4byte 0x50
+	.4byte 0x14
+	.4byte Route118_MapBorder
+	.4byte Route118_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
+
diff --git a/data/maps/Route118/map.bin b/data/layouts/Route118/map.bin
index dfd8a293d..dfd8a293d 100644
--- a/data/maps/Route118/map.bin
+++ b/data/layouts/Route118/map.bin
diff --git a/data/maps/Route119/border.bin b/data/layouts/Route119/border.bin
index 864ac15fa..864ac15fa 100644
--- a/data/maps/Route119/border.bin
+++ b/data/layouts/Route119/border.bin
diff --git a/data/layouts/Route119/layout.inc b/data/layouts/Route119/layout.inc
new file mode 100644
index 000000000..66502fb15
--- /dev/null
+++ b/data/layouts/Route119/layout.inc
@@ -0,0 +1,15 @@
+Route119_MapBorder::
+	.incbin "data/layouts/Route119/border.bin"
+
+Route119_MapBlockdata::
+	.incbin "data/layouts/Route119/map.bin"
+
+	.align 2
+Route119_Layout::
+	.4byte 0x28
+	.4byte 0x8c
+	.4byte Route119_MapBorder
+	.4byte Route119_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fortree
+
diff --git a/data/maps/Route119/map.bin b/data/layouts/Route119/map.bin
index 1126455a2..1126455a2 100644
--- a/data/maps/Route119/map.bin
+++ b/data/layouts/Route119/map.bin
diff --git a/data/maps/Route119_WeatherInstitute_2F/border.bin b/data/layouts/Route119_WeatherInstitute_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route119_WeatherInstitute_2F/border.bin
+++ b/data/layouts/Route119_WeatherInstitute_1F/border.bin
diff --git a/data/layouts/Route119_WeatherInstitute_1F/layout.inc b/data/layouts/Route119_WeatherInstitute_1F/layout.inc
new file mode 100644
index 000000000..9637beea5
--- /dev/null
+++ b/data/layouts/Route119_WeatherInstitute_1F/layout.inc
@@ -0,0 +1,15 @@
+Route119_WeatherInstitute_1F_MapBorder::
+	.incbin "data/layouts/Route119_WeatherInstitute_1F/border.bin"
+
+Route119_WeatherInstitute_1F_MapBlockdata::
+	.incbin "data/layouts/Route119_WeatherInstitute_1F/map.bin"
+
+	.align 2
+Route119_WeatherInstitute_1F_Layout::
+	.4byte 0x14
+	.4byte 0xd
+	.4byte Route119_WeatherInstitute_1F_MapBorder
+	.4byte Route119_WeatherInstitute_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
+
diff --git a/data/maps/Route119_WeatherInstitute_1F/map.bin b/data/layouts/Route119_WeatherInstitute_1F/map.bin
index 07a4e7ebb..07a4e7ebb 100644
--- a/data/maps/Route119_WeatherInstitute_1F/map.bin
+++ b/data/layouts/Route119_WeatherInstitute_1F/map.bin
diff --git a/data/maps/RustboroCity_CuttersHouse/border.bin b/data/layouts/Route119_WeatherInstitute_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_CuttersHouse/border.bin
+++ b/data/layouts/Route119_WeatherInstitute_2F/border.bin
diff --git a/data/layouts/Route119_WeatherInstitute_2F/layout.inc b/data/layouts/Route119_WeatherInstitute_2F/layout.inc
new file mode 100644
index 000000000..4f0948f7b
--- /dev/null
+++ b/data/layouts/Route119_WeatherInstitute_2F/layout.inc
@@ -0,0 +1,15 @@
+Route119_WeatherInstitute_2F_MapBorder::
+	.incbin "data/layouts/Route119_WeatherInstitute_2F/border.bin"
+
+Route119_WeatherInstitute_2F_MapBlockdata::
+	.incbin "data/layouts/Route119_WeatherInstitute_2F/map.bin"
+
+	.align 2
+Route119_WeatherInstitute_2F_Layout::
+	.4byte 0x14
+	.4byte 0xb
+	.4byte Route119_WeatherInstitute_2F_MapBorder
+	.4byte Route119_WeatherInstitute_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
+
diff --git a/data/maps/Route119_WeatherInstitute_2F/map.bin b/data/layouts/Route119_WeatherInstitute_2F/map.bin
index 97953f463..97953f463 100644
--- a/data/maps/Route119_WeatherInstitute_2F/map.bin
+++ b/data/layouts/Route119_WeatherInstitute_2F/map.bin
diff --git a/data/maps/Route120/border.bin b/data/layouts/Route120/border.bin
index 864ac15fa..864ac15fa 100644
--- a/data/maps/Route120/border.bin
+++ b/data/layouts/Route120/border.bin
diff --git a/data/layouts/Route120/layout.inc b/data/layouts/Route120/layout.inc
new file mode 100644
index 000000000..f9e9255a0
--- /dev/null
+++ b/data/layouts/Route120/layout.inc
@@ -0,0 +1,15 @@
+Route120_MapBorder::
+	.incbin "data/layouts/Route120/border.bin"
+
+Route120_MapBlockdata::
+	.incbin "data/layouts/Route120/map.bin"
+
+	.align 2
+Route120_Layout::
+	.4byte 0x28
+	.4byte 0x64
+	.4byte Route120_MapBorder
+	.4byte Route120_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fortree
+
diff --git a/data/maps/Route120/map.bin b/data/layouts/Route120/map.bin
index 599e6014d..599e6014d 100644
--- a/data/maps/Route120/map.bin
+++ b/data/layouts/Route120/map.bin
diff --git a/data/maps/Route121/border.bin b/data/layouts/Route121/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route121/border.bin
+++ b/data/layouts/Route121/border.bin
diff --git a/data/layouts/Route121/layout.inc b/data/layouts/Route121/layout.inc
new file mode 100644
index 000000000..4d2c9744a
--- /dev/null
+++ b/data/layouts/Route121/layout.inc
@@ -0,0 +1,15 @@
+Route121_MapBorder::
+	.incbin "data/layouts/Route121/border.bin"
+
+Route121_MapBlockdata::
+	.incbin "data/layouts/Route121/map.bin"
+
+	.align 2
+Route121_Layout::
+	.4byte 0x50
+	.4byte 0x14
+	.4byte Route121_MapBorder
+	.4byte Route121_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
+
diff --git a/data/maps/Route121/map.bin b/data/layouts/Route121/map.bin
index cfee98f2a..cfee98f2a 100644
--- a/data/maps/Route121/map.bin
+++ b/data/layouts/Route121/map.bin
diff --git a/data/maps/Route121_SafariZoneEntrance/border.bin b/data/layouts/Route121_SafariZoneEntrance/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route121_SafariZoneEntrance/border.bin
+++ b/data/layouts/Route121_SafariZoneEntrance/border.bin
diff --git a/data/layouts/Route121_SafariZoneEntrance/layout.inc b/data/layouts/Route121_SafariZoneEntrance/layout.inc
new file mode 100644
index 000000000..38ad9e97e
--- /dev/null
+++ b/data/layouts/Route121_SafariZoneEntrance/layout.inc
@@ -0,0 +1,15 @@
+Route121_SafariZoneEntrance_MapBorder::
+	.incbin "data/layouts/Route121_SafariZoneEntrance/border.bin"
+
+Route121_SafariZoneEntrance_MapBlockdata::
+	.incbin "data/layouts/Route121_SafariZoneEntrance/map.bin"
+
+	.align 2
+Route121_SafariZoneEntrance_Layout::
+	.4byte 0x12
+	.4byte 0xe
+	.4byte Route121_SafariZoneEntrance_MapBorder
+	.4byte Route121_SafariZoneEntrance_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
+
diff --git a/data/maps/Route121_SafariZoneEntrance/map.bin b/data/layouts/Route121_SafariZoneEntrance/map.bin
index 35c1badac..35c1badac 100644
--- a/data/maps/Route121_SafariZoneEntrance/map.bin
+++ b/data/layouts/Route121_SafariZoneEntrance/map.bin
diff --git a/data/maps/Route122/border.bin b/data/layouts/Route122/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route122/border.bin
+++ b/data/layouts/Route122/border.bin
diff --git a/data/layouts/Route122/layout.inc b/data/layouts/Route122/layout.inc
new file mode 100644
index 000000000..7f0baac20
--- /dev/null
+++ b/data/layouts/Route122/layout.inc
@@ -0,0 +1,15 @@
+Route122_MapBorder::
+	.incbin "data/layouts/Route122/border.bin"
+
+Route122_MapBlockdata::
+	.incbin "data/layouts/Route122/map.bin"
+
+	.align 2
+Route122_Layout::
+	.4byte 0x28
+	.4byte 0x28
+	.4byte Route122_MapBorder
+	.4byte Route122_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
+
diff --git a/data/maps/Route122/map.bin b/data/layouts/Route122/map.bin
index 1c76b0b0a..1c76b0b0a 100644
--- a/data/maps/Route122/map.bin
+++ b/data/layouts/Route122/map.bin
diff --git a/data/maps/Route123/border.bin b/data/layouts/Route123/border.bin
index 864ac15fa..864ac15fa 100644
--- a/data/maps/Route123/border.bin
+++ b/data/layouts/Route123/border.bin
diff --git a/data/layouts/Route123/layout.inc b/data/layouts/Route123/layout.inc
new file mode 100644
index 000000000..0c76c2b7b
--- /dev/null
+++ b/data/layouts/Route123/layout.inc
@@ -0,0 +1,15 @@
+Route123_MapBorder::
+	.incbin "data/layouts/Route123/border.bin"
+
+Route123_MapBlockdata::
+	.incbin "data/layouts/Route123/map.bin"
+
+	.align 2
+Route123_Layout::
+	.4byte 0x8c
+	.4byte 0x14
+	.4byte Route123_MapBorder
+	.4byte Route123_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
+
diff --git a/data/maps/Route123/map.bin b/data/layouts/Route123/map.bin
index e1ab62bd7..e1ab62bd7 100644
--- a/data/maps/Route123/map.bin
+++ b/data/layouts/Route123/map.bin
diff --git a/data/maps/Route124/border.bin b/data/layouts/Route124/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route124/border.bin
+++ b/data/layouts/Route124/border.bin
diff --git a/data/layouts/Route124/layout.inc b/data/layouts/Route124/layout.inc
new file mode 100644
index 000000000..d27ed902a
--- /dev/null
+++ b/data/layouts/Route124/layout.inc
@@ -0,0 +1,15 @@
+Route124_MapBorder::
+	.incbin "data/layouts/Route124/border.bin"
+
+Route124_MapBlockdata::
+	.incbin "data/layouts/Route124/map.bin"
+
+	.align 2
+Route124_Layout::
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Route124_MapBorder
+	.4byte Route124_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
+
diff --git a/data/maps/Route124/map.bin b/data/layouts/Route124/map.bin
index acd4a65fb..acd4a65fb 100644
--- a/data/maps/Route124/map.bin
+++ b/data/layouts/Route124/map.bin
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin
+++ b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin
diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc
new file mode 100644
index 000000000..263571235
--- /dev/null
+++ b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc
@@ -0,0 +1,15 @@
+Route124_DivingTreasureHuntersHouse_MapBorder::
+	.incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin"
+
+Route124_DivingTreasureHuntersHouse_MapBlockdata::
+	.incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin"
+
+	.align 2
+Route124_DivingTreasureHuntersHouse_Layout::
+	.4byte 0xa
+	.4byte 0x9
+	.4byte Route124_DivingTreasureHuntersHouse_MapBorder
+	.4byte Route124_DivingTreasureHuntersHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin
index 8f1f6cbef..8f1f6cbef 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin
+++ b/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin
diff --git a/data/maps/Route125/border.bin b/data/layouts/Route125/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route125/border.bin
+++ b/data/layouts/Route125/border.bin
diff --git a/data/layouts/Route125/layout.inc b/data/layouts/Route125/layout.inc
new file mode 100644
index 000000000..f0d4e13b7
--- /dev/null
+++ b/data/layouts/Route125/layout.inc
@@ -0,0 +1,15 @@
+Route125_MapBorder::
+	.incbin "data/layouts/Route125/border.bin"
+
+Route125_MapBlockdata::
+	.incbin "data/layouts/Route125/map.bin"
+
+	.align 2
+Route125_Layout::
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route125_MapBorder
+	.4byte Route125_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
+
diff --git a/data/maps/Route125/map.bin b/data/layouts/Route125/map.bin
index 078f2713d..078f2713d 100644
--- a/data/maps/Route125/map.bin
+++ b/data/layouts/Route125/map.bin
diff --git a/data/maps/Route126/border.bin b/data/layouts/Route126/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route126/border.bin
+++ b/data/layouts/Route126/border.bin
diff --git a/data/layouts/Route126/layout.inc b/data/layouts/Route126/layout.inc
new file mode 100644
index 000000000..859d025a5
--- /dev/null
+++ b/data/layouts/Route126/layout.inc
@@ -0,0 +1,15 @@
+Route126_MapBorder::
+	.incbin "data/layouts/Route126/border.bin"
+
+Route126_MapBlockdata::
+	.incbin "data/layouts/Route126/map.bin"
+
+	.align 2
+Route126_Layout::
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Route126_MapBorder
+	.4byte Route126_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
+
diff --git a/data/maps/Route126/map.bin b/data/layouts/Route126/map.bin
index 2d684cf64..2d684cf64 100644
--- a/data/maps/Route126/map.bin
+++ b/data/layouts/Route126/map.bin
diff --git a/data/maps/Route127/border.bin b/data/layouts/Route127/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route127/border.bin
+++ b/data/layouts/Route127/border.bin
diff --git a/data/layouts/Route127/layout.inc b/data/layouts/Route127/layout.inc
new file mode 100644
index 000000000..767330aff
--- /dev/null
+++ b/data/layouts/Route127/layout.inc
@@ -0,0 +1,15 @@
+Route127_MapBorder::
+	.incbin "data/layouts/Route127/border.bin"
+
+Route127_MapBlockdata::
+	.incbin "data/layouts/Route127/map.bin"
+
+	.align 2
+Route127_Layout::
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Route127_MapBorder
+	.4byte Route127_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
+
diff --git a/data/maps/Route127/map.bin b/data/layouts/Route127/map.bin
index fa44f9960..fa44f9960 100644
--- a/data/maps/Route127/map.bin
+++ b/data/layouts/Route127/map.bin
diff --git a/data/maps/Route128/border.bin b/data/layouts/Route128/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route128/border.bin
+++ b/data/layouts/Route128/border.bin
diff --git a/data/layouts/Route128/layout.inc b/data/layouts/Route128/layout.inc
new file mode 100644
index 000000000..16624fa02
--- /dev/null
+++ b/data/layouts/Route128/layout.inc
@@ -0,0 +1,15 @@
+Route128_MapBorder::
+	.incbin "data/layouts/Route128/border.bin"
+
+Route128_MapBlockdata::
+	.incbin "data/layouts/Route128/map.bin"
+
+	.align 2
+Route128_Layout::
+	.4byte 0x78
+	.4byte 0x28
+	.4byte Route128_MapBorder
+	.4byte Route128_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
+
diff --git a/data/maps/Route128/map.bin b/data/layouts/Route128/map.bin
index fae8a373e..fae8a373e 100644
--- a/data/maps/Route128/map.bin
+++ b/data/layouts/Route128/map.bin
diff --git a/data/maps/Route129/border.bin b/data/layouts/Route129/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route129/border.bin
+++ b/data/layouts/Route129/border.bin
diff --git a/data/layouts/Route129/layout.inc b/data/layouts/Route129/layout.inc
new file mode 100644
index 000000000..9b7d6af1d
--- /dev/null
+++ b/data/layouts/Route129/layout.inc
@@ -0,0 +1,15 @@
+Route129_MapBorder::
+	.incbin "data/layouts/Route129/border.bin"
+
+Route129_MapBlockdata::
+	.incbin "data/layouts/Route129/map.bin"
+
+	.align 2
+Route129_Layout::
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route129_MapBorder
+	.4byte Route129_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
+
diff --git a/data/maps/Route129/map.bin b/data/layouts/Route129/map.bin
index 8d09787fd..8d09787fd 100644
--- a/data/maps/Route129/map.bin
+++ b/data/layouts/Route129/map.bin
diff --git a/data/maps/Route130/border.bin b/data/layouts/Route130/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route130/border.bin
+++ b/data/layouts/Route130/border.bin
diff --git a/data/layouts/Route130/layout.inc b/data/layouts/Route130/layout.inc
new file mode 100644
index 000000000..41db11cb4
--- /dev/null
+++ b/data/layouts/Route130/layout.inc
@@ -0,0 +1,15 @@
+Route130_MapBorder::
+	.incbin "data/layouts/Route130/border.bin"
+
+Route130_MapBlockdata::
+	.incbin "data/layouts/Route130/map.bin"
+
+	.align 2
+Route130_Layout::
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route130_MapBorder
+	.4byte Route130_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/Route130/map.bin b/data/layouts/Route130/map.bin
index b06fa74dc..b06fa74dc 100644
--- a/data/maps/Route130/map.bin
+++ b/data/layouts/Route130/map.bin
diff --git a/data/maps/Route131/border.bin b/data/layouts/Route131/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route131/border.bin
+++ b/data/layouts/Route131/border.bin
diff --git a/data/layouts/Route131/layout.inc b/data/layouts/Route131/layout.inc
new file mode 100644
index 000000000..7fae261cc
--- /dev/null
+++ b/data/layouts/Route131/layout.inc
@@ -0,0 +1,15 @@
+Route131_MapBorder::
+	.incbin "data/layouts/Route131/border.bin"
+
+Route131_MapBlockdata::
+	.incbin "data/layouts/Route131/map.bin"
+
+	.align 2
+Route131_Layout::
+	.4byte 0x3c
+	.4byte 0x28
+	.4byte Route131_MapBorder
+	.4byte Route131_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/Route131/map.bin b/data/layouts/Route131/map.bin
index 096d6e116..096d6e116 100644
--- a/data/maps/Route131/map.bin
+++ b/data/layouts/Route131/map.bin
diff --git a/data/maps/Route132/border.bin b/data/layouts/Route132/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route132/border.bin
+++ b/data/layouts/Route132/border.bin
diff --git a/data/layouts/Route132/layout.inc b/data/layouts/Route132/layout.inc
new file mode 100644
index 000000000..afaa7fb58
--- /dev/null
+++ b/data/layouts/Route132/layout.inc
@@ -0,0 +1,15 @@
+Route132_MapBorder::
+	.incbin "data/layouts/Route132/border.bin"
+
+Route132_MapBlockdata::
+	.incbin "data/layouts/Route132/map.bin"
+
+	.align 2
+Route132_Layout::
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route132_MapBorder
+	.4byte Route132_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/Route132/map.bin b/data/layouts/Route132/map.bin
index 3250c0429..3250c0429 100644
--- a/data/maps/Route132/map.bin
+++ b/data/layouts/Route132/map.bin
diff --git a/data/maps/Route133/border.bin b/data/layouts/Route133/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route133/border.bin
+++ b/data/layouts/Route133/border.bin
diff --git a/data/layouts/Route133/layout.inc b/data/layouts/Route133/layout.inc
new file mode 100644
index 000000000..5ff11108b
--- /dev/null
+++ b/data/layouts/Route133/layout.inc
@@ -0,0 +1,15 @@
+Route133_MapBorder::
+	.incbin "data/layouts/Route133/border.bin"
+
+Route133_MapBlockdata::
+	.incbin "data/layouts/Route133/map.bin"
+
+	.align 2
+Route133_Layout::
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route133_MapBorder
+	.4byte Route133_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/Route133/map.bin b/data/layouts/Route133/map.bin
index 1d4e74f73..1d4e74f73 100644
--- a/data/maps/Route133/map.bin
+++ b/data/layouts/Route133/map.bin
diff --git a/data/maps/Route134/border.bin b/data/layouts/Route134/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route134/border.bin
+++ b/data/layouts/Route134/border.bin
diff --git a/data/layouts/Route134/layout.inc b/data/layouts/Route134/layout.inc
new file mode 100644
index 000000000..9eeca6cc9
--- /dev/null
+++ b/data/layouts/Route134/layout.inc
@@ -0,0 +1,15 @@
+Route134_MapBorder::
+	.incbin "data/layouts/Route134/border.bin"
+
+Route134_MapBlockdata::
+	.incbin "data/layouts/Route134/map.bin"
+
+	.align 2
+Route134_Layout::
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route134_MapBorder
+	.4byte Route134_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/Route134/map.bin b/data/layouts/Route134/map.bin
index 7b78a2d3c..7b78a2d3c 100644
--- a/data/maps/Route134/map.bin
+++ b/data/layouts/Route134/map.bin
diff --git a/data/maps/RustboroCity/border.bin b/data/layouts/RustboroCity/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/RustboroCity/border.bin
+++ b/data/layouts/RustboroCity/border.bin
diff --git a/data/layouts/RustboroCity/layout.inc b/data/layouts/RustboroCity/layout.inc
new file mode 100644
index 000000000..00c45dcc2
--- /dev/null
+++ b/data/layouts/RustboroCity/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_MapBorder::
+	.incbin "data/layouts/RustboroCity/border.bin"
+
+RustboroCity_MapBlockdata::
+	.incbin "data/layouts/RustboroCity/map.bin"
+
+	.align 2
+RustboroCity_Layout::
+	.4byte 0x28
+	.4byte 0x3c
+	.4byte RustboroCity_MapBorder
+	.4byte RustboroCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
+
diff --git a/data/maps/RustboroCity/map.bin b/data/layouts/RustboroCity/map.bin
index 06736e47e..06736e47e 100644
--- a/data/maps/RustboroCity/map.bin
+++ b/data/layouts/RustboroCity/map.bin
diff --git a/data/maps/RustboroCity_DevonCorp_1F/border.bin b/data/layouts/RustboroCity_CuttersHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/border.bin
+++ b/data/layouts/RustboroCity_CuttersHouse/border.bin
diff --git a/data/layouts/RustboroCity_CuttersHouse/layout.inc b/data/layouts/RustboroCity_CuttersHouse/layout.inc
new file mode 100644
index 000000000..0c86dede9
--- /dev/null
+++ b/data/layouts/RustboroCity_CuttersHouse/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_CuttersHouse_MapBorder::
+	.incbin "data/layouts/RustboroCity_CuttersHouse/border.bin"
+
+RustboroCity_CuttersHouse_MapBlockdata::
+	.incbin "data/layouts/RustboroCity_CuttersHouse/map.bin"
+
+	.align 2
+RustboroCity_CuttersHouse_Layout::
+	.4byte 0xb
+	.4byte 0x9
+	.4byte RustboroCity_CuttersHouse_MapBorder
+	.4byte RustboroCity_CuttersHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/RustboroCity_CuttersHouse/map.bin b/data/layouts/RustboroCity_CuttersHouse/map.bin
index 5515d00cf..5515d00cf 100644
--- a/data/maps/RustboroCity_CuttersHouse/map.bin
+++ b/data/layouts/RustboroCity_CuttersHouse/map.bin
diff --git a/data/maps/RustboroCity_DevonCorp_2F/border.bin b/data/layouts/RustboroCity_DevonCorp_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/border.bin
+++ b/data/layouts/RustboroCity_DevonCorp_1F/border.bin
diff --git a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc
new file mode 100644
index 000000000..dbf6b388e
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_DevonCorp_1F_MapBorder::
+	.incbin "data/layouts/RustboroCity_DevonCorp_1F/border.bin"
+
+RustboroCity_DevonCorp_1F_MapBlockdata::
+	.incbin "data/layouts/RustboroCity_DevonCorp_1F/map.bin"
+
+	.align 2
+RustboroCity_DevonCorp_1F_Layout::
+	.4byte 0x13
+	.4byte 0x9
+	.4byte RustboroCity_DevonCorp_1F_MapBorder
+	.4byte RustboroCity_DevonCorp_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Facility
+
diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.bin b/data/layouts/RustboroCity_DevonCorp_1F/map.bin
index 09f86a742..09f86a742 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/map.bin
+++ b/data/layouts/RustboroCity_DevonCorp_1F/map.bin
diff --git a/data/maps/RustboroCity_DevonCorp_3F/border.bin b/data/layouts/RustboroCity_DevonCorp_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/border.bin
+++ b/data/layouts/RustboroCity_DevonCorp_2F/border.bin
diff --git a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc
new file mode 100644
index 000000000..34d581ae5
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_DevonCorp_2F_MapBorder::
+	.incbin "data/layouts/RustboroCity_DevonCorp_2F/border.bin"
+
+RustboroCity_DevonCorp_2F_MapBlockdata::
+	.incbin "data/layouts/RustboroCity_DevonCorp_2F/map.bin"
+
+	.align 2
+RustboroCity_DevonCorp_2F_Layout::
+	.4byte 0x13
+	.4byte 0x9
+	.4byte RustboroCity_DevonCorp_2F_MapBorder
+	.4byte RustboroCity_DevonCorp_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.bin b/data/layouts/RustboroCity_DevonCorp_2F/map.bin
index 03985c572..03985c572 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/map.bin
+++ b/data/layouts/RustboroCity_DevonCorp_2F/map.bin
diff --git a/data/maps/RustboroCity_Flat1_1F/border.bin b/data/layouts/RustboroCity_DevonCorp_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat1_1F/border.bin
+++ b/data/layouts/RustboroCity_DevonCorp_3F/border.bin
diff --git a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc
new file mode 100644
index 000000000..64c555be5
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_DevonCorp_3F_MapBorder::
+	.incbin "data/layouts/RustboroCity_DevonCorp_3F/border.bin"
+
+RustboroCity_DevonCorp_3F_MapBlockdata::
+	.incbin "data/layouts/RustboroCity_DevonCorp_3F/map.bin"
+
+	.align 2
+RustboroCity_DevonCorp_3F_Layout::
+	.4byte 0x13
+	.4byte 0x9
+	.4byte RustboroCity_DevonCorp_3F_MapBorder
+	.4byte RustboroCity_DevonCorp_3F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Facility
+
diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.bin b/data/layouts/RustboroCity_DevonCorp_3F/map.bin
index 5a55ee4ab..5a55ee4ab 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/map.bin
+++ b/data/layouts/RustboroCity_DevonCorp_3F/map.bin
diff --git a/data/maps/RustboroCity_Flat1_2F/border.bin b/data/layouts/RustboroCity_Flat1_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat1_2F/border.bin
+++ b/data/layouts/RustboroCity_Flat1_1F/border.bin
diff --git a/data/layouts/RustboroCity_Flat1_1F/layout.inc b/data/layouts/RustboroCity_Flat1_1F/layout.inc
new file mode 100644
index 000000000..b904524a6
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat1_1F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat1_1F_MapBorder::
+	.incbin "data/layouts/RustboroCity_Flat1_1F/border.bin"
+
+RustboroCity_Flat1_1F_MapBlockdata::
+	.incbin "data/layouts/RustboroCity_Flat1_1F/map.bin"
+
+	.align 2
+RustboroCity_Flat1_1F_Layout::
+	.4byte 0xe
+	.4byte 0x8
+	.4byte RustboroCity_Flat1_1F_MapBorder
+	.4byte RustboroCity_Flat1_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/RustboroCity_Flat1_1F/map.bin b/data/layouts/RustboroCity_Flat1_1F/map.bin
index 017298e71..017298e71 100644
--- a/data/maps/RustboroCity_Flat1_1F/map.bin
+++ b/data/layouts/RustboroCity_Flat1_1F/map.bin
diff --git a/data/maps/RustboroCity_Flat2_1F/border.bin b/data/layouts/RustboroCity_Flat1_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat2_1F/border.bin
+++ b/data/layouts/RustboroCity_Flat1_2F/border.bin
diff --git a/data/layouts/RustboroCity_Flat1_2F/layout.inc b/data/layouts/RustboroCity_Flat1_2F/layout.inc
new file mode 100644
index 000000000..aa6e3ebdf
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat1_2F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat1_2F_MapBorder::
+	.incbin "data/layouts/RustboroCity_Flat1_2F/border.bin"
+
+RustboroCity_Flat1_2F_MapBlockdata::
+	.incbin "data/layouts/RustboroCity_Flat1_2F/map.bin"
+
+	.align 2
+RustboroCity_Flat1_2F_Layout::
+	.4byte 0xe
+	.4byte 0x8
+	.4byte RustboroCity_Flat1_2F_MapBorder
+	.4byte RustboroCity_Flat1_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/RustboroCity_Flat1_2F/map.bin b/data/layouts/RustboroCity_Flat1_2F/map.bin
index 936907d32..936907d32 100644
--- a/data/maps/RustboroCity_Flat1_2F/map.bin
+++ b/data/layouts/RustboroCity_Flat1_2F/map.bin
diff --git a/data/maps/RustboroCity_Flat2_2F/border.bin b/data/layouts/RustboroCity_Flat2_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat2_2F/border.bin
+++ b/data/layouts/RustboroCity_Flat2_1F/border.bin
diff --git a/data/layouts/RustboroCity_Flat2_1F/layout.inc b/data/layouts/RustboroCity_Flat2_1F/layout.inc
new file mode 100644
index 000000000..8e44c97b7
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_1F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat2_1F_MapBorder::
+	.incbin "data/layouts/RustboroCity_Flat2_1F/border.bin"
+
+RustboroCity_Flat2_1F_MapBlockdata::
+	.incbin "data/layouts/RustboroCity_Flat2_1F/map.bin"
+
+	.align 2
+RustboroCity_Flat2_1F_Layout::
+	.4byte 0xe
+	.4byte 0x9
+	.4byte RustboroCity_Flat2_1F_MapBorder
+	.4byte RustboroCity_Flat2_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/RustboroCity_Flat2_1F/map.bin b/data/layouts/RustboroCity_Flat2_1F/map.bin
index 0f6829f9c..0f6829f9c 100644
--- a/data/maps/RustboroCity_Flat2_1F/map.bin
+++ b/data/layouts/RustboroCity_Flat2_1F/map.bin
diff --git a/data/maps/RustboroCity_Flat2_3F/border.bin b/data/layouts/RustboroCity_Flat2_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat2_3F/border.bin
+++ b/data/layouts/RustboroCity_Flat2_2F/border.bin
diff --git a/data/layouts/RustboroCity_Flat2_2F/layout.inc b/data/layouts/RustboroCity_Flat2_2F/layout.inc
new file mode 100644
index 000000000..ffcba8d17
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_2F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat2_2F_MapBorder::
+	.incbin "data/layouts/RustboroCity_Flat2_2F/border.bin"
+
+RustboroCity_Flat2_2F_MapBlockdata::
+	.incbin "data/layouts/RustboroCity_Flat2_2F/map.bin"
+
+	.align 2
+RustboroCity_Flat2_2F_Layout::
+	.4byte 0xe
+	.4byte 0x9
+	.4byte RustboroCity_Flat2_2F_MapBorder
+	.4byte RustboroCity_Flat2_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/RustboroCity_Flat2_2F/map.bin b/data/layouts/RustboroCity_Flat2_2F/map.bin
index 9f3750fb4..9f3750fb4 100644
--- a/data/maps/RustboroCity_Flat2_2F/map.bin
+++ b/data/layouts/RustboroCity_Flat2_2F/map.bin
diff --git a/data/maps/RustboroCity_House1/border.bin b/data/layouts/RustboroCity_Flat2_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_House1/border.bin
+++ b/data/layouts/RustboroCity_Flat2_3F/border.bin
diff --git a/data/layouts/RustboroCity_Flat2_3F/layout.inc b/data/layouts/RustboroCity_Flat2_3F/layout.inc
new file mode 100644
index 000000000..77775b4e0
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_3F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat2_3F_MapBorder::
+	.incbin "data/layouts/RustboroCity_Flat2_3F/border.bin"
+
+RustboroCity_Flat2_3F_MapBlockdata::
+	.incbin "data/layouts/RustboroCity_Flat2_3F/map.bin"
+
+	.align 2
+RustboroCity_Flat2_3F_Layout::
+	.4byte 0xe
+	.4byte 0x9
+	.4byte RustboroCity_Flat2_3F_MapBorder
+	.4byte RustboroCity_Flat2_3F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/RustboroCity_Flat2_3F/map.bin b/data/layouts/RustboroCity_Flat2_3F/map.bin
index 2112fe799..2112fe799 100644
--- a/data/maps/RustboroCity_Flat2_3F/map.bin
+++ b/data/layouts/RustboroCity_Flat2_3F/map.bin
diff --git a/data/maps/RustboroCity_Gym/border.bin b/data/layouts/RustboroCity_Gym/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/RustboroCity_Gym/border.bin
+++ b/data/layouts/RustboroCity_Gym/border.bin
diff --git a/data/layouts/RustboroCity_Gym/layout.inc b/data/layouts/RustboroCity_Gym/layout.inc
new file mode 100644
index 000000000..8c064171b
--- /dev/null
+++ b/data/layouts/RustboroCity_Gym/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_Gym_MapBorder::
+	.incbin "data/layouts/RustboroCity_Gym/border.bin"
+
+RustboroCity_Gym_MapBlockdata::
+	.incbin "data/layouts/RustboroCity_Gym/map.bin"
+
+	.align 2
+RustboroCity_Gym_Layout::
+	.4byte 0xb
+	.4byte 0x14
+	.4byte RustboroCity_Gym_MapBorder
+	.4byte RustboroCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_RustboroGym
+
diff --git a/data/maps/RustboroCity_Gym/map.bin b/data/layouts/RustboroCity_Gym/map.bin
index 4451674a7..4451674a7 100644
--- a/data/maps/RustboroCity_Gym/map.bin
+++ b/data/layouts/RustboroCity_Gym/map.bin
diff --git a/data/maps/RustboroCity_House2/border.bin b/data/layouts/RustboroCity_House/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_House2/border.bin
+++ b/data/layouts/RustboroCity_House/border.bin
diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc
new file mode 100644
index 000000000..b1b90daee
--- /dev/null
+++ b/data/layouts/RustboroCity_House/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_House_MapBorder::
+	.incbin "data/layouts/RustboroCity_House/border.bin"
+
+RustboroCity_House_MapBlockdata::
+	.incbin "data/layouts/RustboroCity_House/map.bin"
+
+	.align 2
+RustboroCity_House_Layouts::
+	.4byte 0xc
+	.4byte 0x9
+	.4byte RustboroCity_House_MapBorder
+	.4byte RustboroCity_House_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/RustboroCity_House2/map.bin b/data/layouts/RustboroCity_House/map.bin
index 5a53bbc77..5a53bbc77 100644
--- a/data/maps/RustboroCity_House2/map.bin
+++ b/data/layouts/RustboroCity_House/map.bin
diff --git a/data/maps/SSTidalCorridor/border.bin b/data/layouts/RustboroCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SSTidalCorridor/border.bin
+++ b/data/layouts/RustboroCity_House1/border.bin
diff --git a/data/layouts/RustboroCity_House1/layout.inc b/data/layouts/RustboroCity_House1/layout.inc
new file mode 100644
index 000000000..27893f2fb
--- /dev/null
+++ b/data/layouts/RustboroCity_House1/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_House1_MapBorder::
+	.incbin "data/layouts/RustboroCity_House1/border.bin"
+
+RustboroCity_House1_MapBlockdata::
+	.incbin "data/layouts/RustboroCity_House1/map.bin"
+
+	.align 2
+RustboroCity_House1_Layout::
+	.4byte 0xd
+	.4byte 0x8
+	.4byte RustboroCity_House1_MapBorder
+	.4byte RustboroCity_House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/RustboroCity_House1/map.bin b/data/layouts/RustboroCity_House1/map.bin
index a14fc0405..a14fc0405 100644
--- a/data/maps/RustboroCity_House1/map.bin
+++ b/data/layouts/RustboroCity_House1/map.bin
diff --git a/data/maps/RustboroCity_PokemonSchool/border.bin b/data/layouts/RustboroCity_PokemonSchool/border.bin
index 8f857616b..8f857616b 100644
--- a/data/maps/RustboroCity_PokemonSchool/border.bin
+++ b/data/layouts/RustboroCity_PokemonSchool/border.bin
diff --git a/data/layouts/RustboroCity_PokemonSchool/layout.inc b/data/layouts/RustboroCity_PokemonSchool/layout.inc
new file mode 100644
index 000000000..2c4eb3977
--- /dev/null
+++ b/data/layouts/RustboroCity_PokemonSchool/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_PokemonSchool_MapBorder::
+	.incbin "data/layouts/RustboroCity_PokemonSchool/border.bin"
+
+RustboroCity_PokemonSchool_MapBlockdata::
+	.incbin "data/layouts/RustboroCity_PokemonSchool/map.bin"
+
+	.align 2
+RustboroCity_PokemonSchool_Layout::
+	.4byte 0xc
+	.4byte 0xb
+	.4byte RustboroCity_PokemonSchool_MapBorder
+	.4byte RustboroCity_PokemonSchool_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonSchool
+
diff --git a/data/maps/RustboroCity_PokemonSchool/map.bin b/data/layouts/RustboroCity_PokemonSchool/map.bin
index 3f3b183d3..3f3b183d3 100644
--- a/data/maps/RustboroCity_PokemonSchool/map.bin
+++ b/data/layouts/RustboroCity_PokemonSchool/map.bin
diff --git a/data/maps/RusturfTunnel/border.bin b/data/layouts/RusturfTunnel/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/RusturfTunnel/border.bin
+++ b/data/layouts/RusturfTunnel/border.bin
diff --git a/data/layouts/RusturfTunnel/layout.inc b/data/layouts/RusturfTunnel/layout.inc
new file mode 100644
index 000000000..7a063b922
--- /dev/null
+++ b/data/layouts/RusturfTunnel/layout.inc
@@ -0,0 +1,15 @@
+RusturfTunnel_MapBorder::
+	.incbin "data/layouts/RusturfTunnel/border.bin"
+
+RusturfTunnel_MapBlockdata::
+	.incbin "data/layouts/RusturfTunnel/map.bin"
+
+	.align 2
+RusturfTunnel_Layout::
+	.4byte 0x24
+	.4byte 0x18
+	.4byte RusturfTunnel_MapBorder
+	.4byte RusturfTunnel_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_RusturfTunnel
+
diff --git a/data/maps/RusturfTunnel/map.bin b/data/layouts/RusturfTunnel/map.bin
index 87ce9bc73..87ce9bc73 100644
--- a/data/maps/RusturfTunnel/map.bin
+++ b/data/layouts/RusturfTunnel/map.bin
diff --git a/data/maps/SSTidalLowerDeck/border.bin b/data/layouts/SSTidalCorridor/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SSTidalLowerDeck/border.bin
+++ b/data/layouts/SSTidalCorridor/border.bin
diff --git a/data/layouts/SSTidalCorridor/layout.inc b/data/layouts/SSTidalCorridor/layout.inc
new file mode 100644
index 000000000..bcc034ecd
--- /dev/null
+++ b/data/layouts/SSTidalCorridor/layout.inc
@@ -0,0 +1,15 @@
+SSTidalCorridor_MapBorder::
+	.incbin "data/layouts/SSTidalCorridor/border.bin"
+
+SSTidalCorridor_MapBlockdata::
+	.incbin "data/layouts/SSTidalCorridor/map.bin"
+
+	.align 2
+SSTidalCorridor_Layout::
+	.4byte 0x12
+	.4byte 0xd
+	.4byte SSTidalCorridor_MapBorder
+	.4byte SSTidalCorridor_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+
diff --git a/data/maps/SSTidalCorridor/map.bin b/data/layouts/SSTidalCorridor/map.bin
index f8cf1725d..f8cf1725d 100644
--- a/data/maps/SSTidalCorridor/map.bin
+++ b/data/layouts/SSTidalCorridor/map.bin
diff --git a/data/maps/SSTidalRooms/border.bin b/data/layouts/SSTidalLowerDeck/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SSTidalRooms/border.bin
+++ b/data/layouts/SSTidalLowerDeck/border.bin
diff --git a/data/layouts/SSTidalLowerDeck/layout.inc b/data/layouts/SSTidalLowerDeck/layout.inc
new file mode 100644
index 000000000..807da09a1
--- /dev/null
+++ b/data/layouts/SSTidalLowerDeck/layout.inc
@@ -0,0 +1,15 @@
+SSTidalLowerDeck_MapBorder::
+	.incbin "data/layouts/SSTidalLowerDeck/border.bin"
+
+SSTidalLowerDeck_MapBlockdata::
+	.incbin "data/layouts/SSTidalLowerDeck/map.bin"
+
+	.align 2
+SSTidalLowerDeck_Layout::
+	.4byte 0x11
+	.4byte 0xd
+	.4byte SSTidalLowerDeck_MapBorder
+	.4byte SSTidalLowerDeck_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+
diff --git a/data/maps/SSTidalLowerDeck/map.bin b/data/layouts/SSTidalLowerDeck/map.bin
index 059ce30fe..059ce30fe 100644
--- a/data/maps/SSTidalLowerDeck/map.bin
+++ b/data/layouts/SSTidalLowerDeck/map.bin
diff --git a/data/maps/SingleBattleColosseum/border.bin b/data/layouts/SSTidalRooms/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SingleBattleColosseum/border.bin
+++ b/data/layouts/SSTidalRooms/border.bin
diff --git a/data/layouts/SSTidalRooms/layout.inc b/data/layouts/SSTidalRooms/layout.inc
new file mode 100644
index 000000000..e44aac53c
--- /dev/null
+++ b/data/layouts/SSTidalRooms/layout.inc
@@ -0,0 +1,15 @@
+SSTidalRooms_MapBorder::
+	.incbin "data/layouts/SSTidalRooms/border.bin"
+
+SSTidalRooms_MapBlockdata::
+	.incbin "data/layouts/SSTidalRooms/map.bin"
+
+	.align 2
+SSTidalRooms_Layout::
+	.4byte 0x24
+	.4byte 0x12
+	.4byte SSTidalRooms_MapBorder
+	.4byte SSTidalRooms_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideShip
+
diff --git a/data/maps/SSTidalRooms/map.bin b/data/layouts/SSTidalRooms/map.bin
index 6103ad0c2..6103ad0c2 100644
--- a/data/maps/SSTidalRooms/map.bin
+++ b/data/layouts/SSTidalRooms/map.bin
diff --git a/data/maps/SafariZone_North/border.bin b/data/layouts/SafariZone_North/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SafariZone_North/border.bin
+++ b/data/layouts/SafariZone_North/border.bin
diff --git a/data/layouts/SafariZone_North/layout.inc b/data/layouts/SafariZone_North/layout.inc
new file mode 100644
index 000000000..c6986540f
--- /dev/null
+++ b/data/layouts/SafariZone_North/layout.inc
@@ -0,0 +1,15 @@
+SafariZone_North_MapBorder::
+	.incbin "data/layouts/SafariZone_North/border.bin"
+
+SafariZone_North_MapBlockdata::
+	.incbin "data/layouts/SafariZone_North/map.bin"
+
+	.align 2
+SafariZone_North_Layout::
+	.4byte 0x28
+	.4byte 0x28
+	.4byte SafariZone_North_MapBorder
+	.4byte SafariZone_North_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
+
diff --git a/data/maps/SafariZone_North/map.bin b/data/layouts/SafariZone_North/map.bin
index 4f5296815..4f5296815 100644
--- a/data/maps/SafariZone_North/map.bin
+++ b/data/layouts/SafariZone_North/map.bin
diff --git a/data/maps/SafariZone_Northeast/border.bin b/data/layouts/SafariZone_Northeast/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SafariZone_Northeast/border.bin
+++ b/data/layouts/SafariZone_Northeast/border.bin
diff --git a/data/layouts/SafariZone_Northeast/layout.inc b/data/layouts/SafariZone_Northeast/layout.inc
new file mode 100644
index 000000000..026e4a7c7
--- /dev/null
+++ b/data/layouts/SafariZone_Northeast/layout.inc
@@ -0,0 +1,15 @@
+SafariZone_Northeast_MapBorder::
+	.incbin "data/layouts/SafariZone_Northeast/border.bin"
+
+SafariZone_Northeast_MapBlockdata::
+	.incbin "data/layouts/SafariZone_Northeast/map.bin"
+
+	.align 2
+SafariZone_Northeast_Layout::
+	.4byte 0x28
+	.4byte 0x28
+	.4byte SafariZone_Northeast_MapBorder
+	.4byte SafariZone_Northeast_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
+
diff --git a/data/maps/SafariZone_Northeast/map.bin b/data/layouts/SafariZone_Northeast/map.bin
index 9a8803a6a..9a8803a6a 100644
--- a/data/maps/SafariZone_Northeast/map.bin
+++ b/data/layouts/SafariZone_Northeast/map.bin
diff --git a/data/maps/SafariZone_Northwest/border.bin b/data/layouts/SafariZone_Northwest/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SafariZone_Northwest/border.bin
+++ b/data/layouts/SafariZone_Northwest/border.bin
diff --git a/data/layouts/SafariZone_Northwest/layout.inc b/data/layouts/SafariZone_Northwest/layout.inc
new file mode 100644
index 000000000..09d8bd482
--- /dev/null
+++ b/data/layouts/SafariZone_Northwest/layout.inc
@@ -0,0 +1,15 @@
+SafariZone_Northwest_MapBorder::
+	.incbin "data/layouts/SafariZone_Northwest/border.bin"
+
+SafariZone_Northwest_MapBlockdata::
+	.incbin "data/layouts/SafariZone_Northwest/map.bin"
+
+	.align 2
+SafariZone_Northwest_Layout::
+	.4byte 0x28
+	.4byte 0x28
+	.4byte SafariZone_Northwest_MapBorder
+	.4byte SafariZone_Northwest_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
+
diff --git a/data/maps/SafariZone_Northwest/map.bin b/data/layouts/SafariZone_Northwest/map.bin
index 1825a1c92..1825a1c92 100644
--- a/data/maps/SafariZone_Northwest/map.bin
+++ b/data/layouts/SafariZone_Northwest/map.bin
diff --git a/data/maps/SafariZone_RestHouse/border.bin b/data/layouts/SafariZone_RestHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SafariZone_RestHouse/border.bin
+++ b/data/layouts/SafariZone_RestHouse/border.bin
diff --git a/data/layouts/SafariZone_RestHouse/layout.inc b/data/layouts/SafariZone_RestHouse/layout.inc
new file mode 100644
index 000000000..4176cb370
--- /dev/null
+++ b/data/layouts/SafariZone_RestHouse/layout.inc
@@ -0,0 +1,15 @@
+SafariZone_RestHouse_MapBorder::
+	.incbin "data/layouts/SafariZone_RestHouse/border.bin"
+
+SafariZone_RestHouse_MapBlockdata::
+	.incbin "data/layouts/SafariZone_RestHouse/map.bin"
+
+	.align 2
+SafariZone_RestHouse_Layout::
+	.4byte 0xa
+	.4byte 0x9
+	.4byte SafariZone_RestHouse_MapBorder
+	.4byte SafariZone_RestHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/SafariZone_RestHouse/map.bin b/data/layouts/SafariZone_RestHouse/map.bin
index c57c99c7b..c57c99c7b 100644
--- a/data/maps/SafariZone_RestHouse/map.bin
+++ b/data/layouts/SafariZone_RestHouse/map.bin
diff --git a/data/maps/SafariZone_South/border.bin b/data/layouts/SafariZone_South/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SafariZone_South/border.bin
+++ b/data/layouts/SafariZone_South/border.bin
diff --git a/data/layouts/SafariZone_South/layout.inc b/data/layouts/SafariZone_South/layout.inc
new file mode 100644
index 000000000..ec83ba5b0
--- /dev/null
+++ b/data/layouts/SafariZone_South/layout.inc
@@ -0,0 +1,15 @@
+SafariZone_South_MapBorder::
+	.incbin "data/layouts/SafariZone_South/border.bin"
+
+SafariZone_South_MapBlockdata::
+	.incbin "data/layouts/SafariZone_South/map.bin"
+
+	.align 2
+SafariZone_South_Layout::
+	.4byte 0x28
+	.4byte 0x28
+	.4byte SafariZone_South_MapBorder
+	.4byte SafariZone_South_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
+
diff --git a/data/maps/SafariZone_South/map.bin b/data/layouts/SafariZone_South/map.bin
index 50497b503..50497b503 100644
--- a/data/maps/SafariZone_South/map.bin
+++ b/data/layouts/SafariZone_South/map.bin
diff --git a/data/maps/SafariZone_Southeast/border.bin b/data/layouts/SafariZone_Southeast/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SafariZone_Southeast/border.bin
+++ b/data/layouts/SafariZone_Southeast/border.bin
diff --git a/data/layouts/SafariZone_Southeast/layout.inc b/data/layouts/SafariZone_Southeast/layout.inc
new file mode 100644
index 000000000..e55309b46
--- /dev/null
+++ b/data/layouts/SafariZone_Southeast/layout.inc
@@ -0,0 +1,15 @@
+SafariZone_Southeast_MapBorder::
+	.incbin "data/layouts/SafariZone_Southeast/border.bin"
+
+SafariZone_Southeast_MapBlockdata::
+	.incbin "data/layouts/SafariZone_Southeast/map.bin"
+
+	.align 2
+SafariZone_Southeast_Layout::
+	.4byte 0x28
+	.4byte 0x28
+	.4byte SafariZone_Southeast_MapBorder
+	.4byte SafariZone_Southeast_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
+
diff --git a/data/maps/SafariZone_Southeast/map.bin b/data/layouts/SafariZone_Southeast/map.bin
index a778b8797..a778b8797 100644
--- a/data/maps/SafariZone_Southeast/map.bin
+++ b/data/layouts/SafariZone_Southeast/map.bin
diff --git a/data/maps/SafariZone_Southwest/border.bin b/data/layouts/SafariZone_Southwest/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SafariZone_Southwest/border.bin
+++ b/data/layouts/SafariZone_Southwest/border.bin
diff --git a/data/layouts/SafariZone_Southwest/layout.inc b/data/layouts/SafariZone_Southwest/layout.inc
new file mode 100644
index 000000000..1236d4d4b
--- /dev/null
+++ b/data/layouts/SafariZone_Southwest/layout.inc
@@ -0,0 +1,15 @@
+SafariZone_Southwest_MapBorder::
+	.incbin "data/layouts/SafariZone_Southwest/border.bin"
+
+SafariZone_Southwest_MapBlockdata::
+	.incbin "data/layouts/SafariZone_Southwest/map.bin"
+
+	.align 2
+SafariZone_Southwest_Layout::
+	.4byte 0x28
+	.4byte 0x28
+	.4byte SafariZone_Southwest_MapBorder
+	.4byte SafariZone_Southwest_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
+
diff --git a/data/maps/SafariZone_Southwest/map.bin b/data/layouts/SafariZone_Southwest/map.bin
index 0074b6e55..0074b6e55 100644
--- a/data/maps/SafariZone_Southwest/map.bin
+++ b/data/layouts/SafariZone_Southwest/map.bin
diff --git a/data/maps/ScorchedSlab/border.bin b/data/layouts/ScorchedSlab/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ScorchedSlab/border.bin
+++ b/data/layouts/ScorchedSlab/border.bin
diff --git a/data/layouts/ScorchedSlab/layout.inc b/data/layouts/ScorchedSlab/layout.inc
new file mode 100644
index 000000000..897d873ab
--- /dev/null
+++ b/data/layouts/ScorchedSlab/layout.inc
@@ -0,0 +1,15 @@
+ScorchedSlab_MapBorder::
+	.incbin "data/layouts/ScorchedSlab/border.bin"
+
+ScorchedSlab_MapBlockdata::
+	.incbin "data/layouts/ScorchedSlab/map.bin"
+
+	.align 2
+ScorchedSlab_Layout::
+	.4byte 0xf
+	.4byte 0x14
+	.4byte ScorchedSlab_MapBorder
+	.4byte ScorchedSlab_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/ScorchedSlab/map.bin b/data/layouts/ScorchedSlab/map.bin
index edbd982ee..edbd982ee 100644
--- a/data/maps/ScorchedSlab/map.bin
+++ b/data/layouts/ScorchedSlab/map.bin
diff --git a/data/maps/SeafloorCavern_Entrance/border.bin b/data/layouts/SeafloorCavern_Entrance/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Entrance/border.bin
+++ b/data/layouts/SeafloorCavern_Entrance/border.bin
diff --git a/data/layouts/SeafloorCavern_Entrance/layout.inc b/data/layouts/SeafloorCavern_Entrance/layout.inc
new file mode 100644
index 000000000..1d6ce495b
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Entrance/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Entrance_MapBorder::
+	.incbin "data/layouts/SeafloorCavern_Entrance/border.bin"
+
+SeafloorCavern_Entrance_MapBlockdata::
+	.incbin "data/layouts/SeafloorCavern_Entrance/map.bin"
+
+	.align 2
+SeafloorCavern_Entrance_Layout::
+	.4byte 0x14
+	.4byte 0x14
+	.4byte SeafloorCavern_Entrance_MapBorder
+	.4byte SeafloorCavern_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/SeafloorCavern_Entrance/map.bin b/data/layouts/SeafloorCavern_Entrance/map.bin
index f41e6e77d..f41e6e77d 100644
--- a/data/maps/SeafloorCavern_Entrance/map.bin
+++ b/data/layouts/SeafloorCavern_Entrance/map.bin
diff --git a/data/maps/SeafloorCavern_Room1/border.bin b/data/layouts/SeafloorCavern_Room1/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room1/border.bin
+++ b/data/layouts/SeafloorCavern_Room1/border.bin
diff --git a/data/layouts/SeafloorCavern_Room1/layout.inc b/data/layouts/SeafloorCavern_Room1/layout.inc
new file mode 100644
index 000000000..7f7cf0570
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room1/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room1_MapBorder::
+	.incbin "data/layouts/SeafloorCavern_Room1/border.bin"
+
+SeafloorCavern_Room1_MapBlockdata::
+	.incbin "data/layouts/SeafloorCavern_Room1/map.bin"
+
+	.align 2
+SeafloorCavern_Room1_Layout::
+	.4byte 0x14
+	.4byte 0x15
+	.4byte SeafloorCavern_Room1_MapBorder
+	.4byte SeafloorCavern_Room1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/SeafloorCavern_Room1/map.bin b/data/layouts/SeafloorCavern_Room1/map.bin
index 57cd82f78..57cd82f78 100644
--- a/data/maps/SeafloorCavern_Room1/map.bin
+++ b/data/layouts/SeafloorCavern_Room1/map.bin
diff --git a/data/maps/SeafloorCavern_Room2/border.bin b/data/layouts/SeafloorCavern_Room2/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room2/border.bin
+++ b/data/layouts/SeafloorCavern_Room2/border.bin
diff --git a/data/layouts/SeafloorCavern_Room2/layout.inc b/data/layouts/SeafloorCavern_Room2/layout.inc
new file mode 100644
index 000000000..89f4e6a79
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room2/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room2_MapBorder::
+	.incbin "data/layouts/SeafloorCavern_Room2/border.bin"
+
+SeafloorCavern_Room2_MapBlockdata::
+	.incbin "data/layouts/SeafloorCavern_Room2/map.bin"
+
+	.align 2
+SeafloorCavern_Room2_Layout::
+	.4byte 0x12
+	.4byte 0xc
+	.4byte SeafloorCavern_Room2_MapBorder
+	.4byte SeafloorCavern_Room2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/SeafloorCavern_Room2/map.bin b/data/layouts/SeafloorCavern_Room2/map.bin
index 72a064870..72a064870 100644
--- a/data/maps/SeafloorCavern_Room2/map.bin
+++ b/data/layouts/SeafloorCavern_Room2/map.bin
diff --git a/data/maps/SeafloorCavern_Room3/border.bin b/data/layouts/SeafloorCavern_Room3/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room3/border.bin
+++ b/data/layouts/SeafloorCavern_Room3/border.bin
diff --git a/data/layouts/SeafloorCavern_Room3/layout.inc b/data/layouts/SeafloorCavern_Room3/layout.inc
new file mode 100644
index 000000000..070842a9f
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room3/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room3_MapBorder::
+	.incbin "data/layouts/SeafloorCavern_Room3/border.bin"
+
+SeafloorCavern_Room3_MapBlockdata::
+	.incbin "data/layouts/SeafloorCavern_Room3/map.bin"
+
+	.align 2
+SeafloorCavern_Room3_Layout::
+	.4byte 0x10
+	.4byte 0x11
+	.4byte SeafloorCavern_Room3_MapBorder
+	.4byte SeafloorCavern_Room3_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/SeafloorCavern_Room3/map.bin b/data/layouts/SeafloorCavern_Room3/map.bin
index 01d18c73c..01d18c73c 100644
--- a/data/maps/SeafloorCavern_Room3/map.bin
+++ b/data/layouts/SeafloorCavern_Room3/map.bin
diff --git a/data/maps/SeafloorCavern_Room4/border.bin b/data/layouts/SeafloorCavern_Room4/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room4/border.bin
+++ b/data/layouts/SeafloorCavern_Room4/border.bin
diff --git a/data/layouts/SeafloorCavern_Room4/layout.inc b/data/layouts/SeafloorCavern_Room4/layout.inc
new file mode 100644
index 000000000..6c984109d
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room4/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room4_MapBorder::
+	.incbin "data/layouts/SeafloorCavern_Room4/border.bin"
+
+SeafloorCavern_Room4_MapBlockdata::
+	.incbin "data/layouts/SeafloorCavern_Room4/map.bin"
+
+	.align 2
+SeafloorCavern_Room4_Layout::
+	.4byte 0x12
+	.4byte 0x13
+	.4byte SeafloorCavern_Room4_MapBorder
+	.4byte SeafloorCavern_Room4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/SeafloorCavern_Room4/map.bin b/data/layouts/SeafloorCavern_Room4/map.bin
index 928749c95..928749c95 100644
--- a/data/maps/SeafloorCavern_Room4/map.bin
+++ b/data/layouts/SeafloorCavern_Room4/map.bin
diff --git a/data/maps/SeafloorCavern_Room5/border.bin b/data/layouts/SeafloorCavern_Room5/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room5/border.bin
+++ b/data/layouts/SeafloorCavern_Room5/border.bin
diff --git a/data/layouts/SeafloorCavern_Room5/layout.inc b/data/layouts/SeafloorCavern_Room5/layout.inc
new file mode 100644
index 000000000..c48b00dba
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room5/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room5_MapBorder::
+	.incbin "data/layouts/SeafloorCavern_Room5/border.bin"
+
+SeafloorCavern_Room5_MapBlockdata::
+	.incbin "data/layouts/SeafloorCavern_Room5/map.bin"
+
+	.align 2
+SeafloorCavern_Room5_Layout::
+	.4byte 0x14
+	.4byte 0x14
+	.4byte SeafloorCavern_Room5_MapBorder
+	.4byte SeafloorCavern_Room5_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/SeafloorCavern_Room5/map.bin b/data/layouts/SeafloorCavern_Room5/map.bin
index 386430fe4..386430fe4 100644
--- a/data/maps/SeafloorCavern_Room5/map.bin
+++ b/data/layouts/SeafloorCavern_Room5/map.bin
diff --git a/data/maps/SeafloorCavern_Room6/border.bin b/data/layouts/SeafloorCavern_Room6/border.bin
index a00c39057..a00c39057 100644
--- a/data/maps/SeafloorCavern_Room6/border.bin
+++ b/data/layouts/SeafloorCavern_Room6/border.bin
diff --git a/data/layouts/SeafloorCavern_Room6/layout.inc b/data/layouts/SeafloorCavern_Room6/layout.inc
new file mode 100644
index 000000000..f729d0b1b
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room6/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room6_MapBorder::
+	.incbin "data/layouts/SeafloorCavern_Room6/border.bin"
+
+SeafloorCavern_Room6_MapBlockdata::
+	.incbin "data/layouts/SeafloorCavern_Room6/map.bin"
+
+	.align 2
+SeafloorCavern_Room6_Layout::
+	.4byte 0x18
+	.4byte 0x17
+	.4byte SeafloorCavern_Room6_MapBorder
+	.4byte SeafloorCavern_Room6_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/SeafloorCavern_Room6/map.bin b/data/layouts/SeafloorCavern_Room6/map.bin
index 452263326..452263326 100644
--- a/data/maps/SeafloorCavern_Room6/map.bin
+++ b/data/layouts/SeafloorCavern_Room6/map.bin
diff --git a/data/maps/SeafloorCavern_Room7/border.bin b/data/layouts/SeafloorCavern_Room7/border.bin
index a00c39057..a00c39057 100644
--- a/data/maps/SeafloorCavern_Room7/border.bin
+++ b/data/layouts/SeafloorCavern_Room7/border.bin
diff --git a/data/layouts/SeafloorCavern_Room7/layout.inc b/data/layouts/SeafloorCavern_Room7/layout.inc
new file mode 100644
index 000000000..784b9bbb9
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room7/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room7_MapBorder::
+	.incbin "data/layouts/SeafloorCavern_Room7/border.bin"
+
+SeafloorCavern_Room7_MapBlockdata::
+	.incbin "data/layouts/SeafloorCavern_Room7/map.bin"
+
+	.align 2
+SeafloorCavern_Room7_Layout::
+	.4byte 0x17
+	.4byte 0x19
+	.4byte SeafloorCavern_Room7_MapBorder
+	.4byte SeafloorCavern_Room7_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/SeafloorCavern_Room7/map.bin b/data/layouts/SeafloorCavern_Room7/map.bin
index 7fa1d903d..7fa1d903d 100644
--- a/data/maps/SeafloorCavern_Room7/map.bin
+++ b/data/layouts/SeafloorCavern_Room7/map.bin
diff --git a/data/maps/SeafloorCavern_Room8/border.bin b/data/layouts/SeafloorCavern_Room8/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room8/border.bin
+++ b/data/layouts/SeafloorCavern_Room8/border.bin
diff --git a/data/layouts/SeafloorCavern_Room8/layout.inc b/data/layouts/SeafloorCavern_Room8/layout.inc
new file mode 100644
index 000000000..8f3d826c7
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room8/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room8_MapBorder::
+	.incbin "data/layouts/SeafloorCavern_Room8/border.bin"
+
+SeafloorCavern_Room8_MapBlockdata::
+	.incbin "data/layouts/SeafloorCavern_Room8/map.bin"
+
+	.align 2
+SeafloorCavern_Room8_Layout::
+	.4byte 0xb
+	.4byte 0xe
+	.4byte SeafloorCavern_Room8_MapBorder
+	.4byte SeafloorCavern_Room8_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/SeafloorCavern_Room8/map.bin b/data/layouts/SeafloorCavern_Room8/map.bin
index e70e95b47..e70e95b47 100644
--- a/data/maps/SeafloorCavern_Room8/map.bin
+++ b/data/layouts/SeafloorCavern_Room8/map.bin
diff --git a/data/maps/SeafloorCavern_Room9/border.bin b/data/layouts/SeafloorCavern_Room9/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room9/border.bin
+++ b/data/layouts/SeafloorCavern_Room9/border.bin
diff --git a/data/layouts/SeafloorCavern_Room9/layout.inc b/data/layouts/SeafloorCavern_Room9/layout.inc
new file mode 100644
index 000000000..a5039da8f
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room9/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room9_MapBorder::
+	.incbin "data/layouts/SeafloorCavern_Room9/border.bin"
+
+SeafloorCavern_Room9_MapBlockdata::
+	.incbin "data/layouts/SeafloorCavern_Room9/map.bin"
+
+	.align 2
+SeafloorCavern_Room9_Layout::
+	.4byte 0x1b
+	.4byte 0x2e
+	.4byte SeafloorCavern_Room9_MapBorder
+	.4byte SeafloorCavern_Room9_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/SeafloorCavern_Room9/map.bin b/data/layouts/SeafloorCavern_Room9/map.bin
index 252112ac2..252112ac2 100644
--- a/data/maps/SeafloorCavern_Room9/map.bin
+++ b/data/layouts/SeafloorCavern_Room9/map.bin
diff --git a/data/maps/SealedChamber_InnerRoom/border.bin b/data/layouts/SealedChamber_InnerRoom/border.bin
index 9afd13cdc..9afd13cdc 100644
--- a/data/maps/SealedChamber_InnerRoom/border.bin
+++ b/data/layouts/SealedChamber_InnerRoom/border.bin
diff --git a/data/layouts/SealedChamber_InnerRoom/layout.inc b/data/layouts/SealedChamber_InnerRoom/layout.inc
new file mode 100644
index 000000000..7a064d5f0
--- /dev/null
+++ b/data/layouts/SealedChamber_InnerRoom/layout.inc
@@ -0,0 +1,15 @@
+SealedChamber_InnerRoom_MapBorder::
+	.incbin "data/layouts/SealedChamber_InnerRoom/border.bin"
+
+SealedChamber_InnerRoom_MapBlockdata::
+	.incbin "data/layouts/SealedChamber_InnerRoom/map.bin"
+
+	.align 2
+SealedChamber_InnerRoom_Layout::
+	.4byte 0x15
+	.4byte 0x17
+	.4byte SealedChamber_InnerRoom_MapBorder
+	.4byte SealedChamber_InnerRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/SealedChamber_InnerRoom/map.bin b/data/layouts/SealedChamber_InnerRoom/map.bin
index 823fa5fab..823fa5fab 100644
--- a/data/maps/SealedChamber_InnerRoom/map.bin
+++ b/data/layouts/SealedChamber_InnerRoom/map.bin
diff --git a/data/maps/SealedChamber_OuterRoom/border.bin b/data/layouts/SealedChamber_OuterRoom/border.bin
index 9afd13cdc..9afd13cdc 100644
--- a/data/maps/SealedChamber_OuterRoom/border.bin
+++ b/data/layouts/SealedChamber_OuterRoom/border.bin
diff --git a/data/layouts/SealedChamber_OuterRoom/layout.inc b/data/layouts/SealedChamber_OuterRoom/layout.inc
new file mode 100644
index 000000000..bc6afaf29
--- /dev/null
+++ b/data/layouts/SealedChamber_OuterRoom/layout.inc
@@ -0,0 +1,15 @@
+SealedChamber_OuterRoom_MapBorder::
+	.incbin "data/layouts/SealedChamber_OuterRoom/border.bin"
+
+SealedChamber_OuterRoom_MapBlockdata::
+	.incbin "data/layouts/SealedChamber_OuterRoom/map.bin"
+
+	.align 2
+SealedChamber_OuterRoom_Layout::
+	.4byte 0x15
+	.4byte 0x17
+	.4byte SealedChamber_OuterRoom_MapBorder
+	.4byte SealedChamber_OuterRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/SealedChamber_OuterRoom/map.bin b/data/layouts/SealedChamber_OuterRoom/map.bin
index bf1482f97..bf1482f97 100644
--- a/data/maps/SealedChamber_OuterRoom/map.bin
+++ b/data/layouts/SealedChamber_OuterRoom/map.bin
diff --git a/data/maps/SecretBase_BlueCave1/border.bin b/data/layouts/SecretBase_BlueCave1/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BlueCave1/border.bin
+++ b/data/layouts/SecretBase_BlueCave1/border.bin
diff --git a/data/layouts/SecretBase_BlueCave1/layout.inc b/data/layouts/SecretBase_BlueCave1/layout.inc
new file mode 100644
index 000000000..ec138440a
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave1/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BlueCave1_MapBorder::
+	.incbin "data/layouts/SecretBase_BlueCave1/border.bin"
+
+SecretBase_BlueCave1_MapBlockdata::
+	.incbin "data/layouts/SecretBase_BlueCave1/map.bin"
+
+	.align 2
+SecretBase_BlueCave1_Layout::
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_BlueCave1_MapBorder
+	.4byte SecretBase_BlueCave1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
+
diff --git a/data/maps/SecretBase_BlueCave1/map.bin b/data/layouts/SecretBase_BlueCave1/map.bin
index 371b2a8d5..371b2a8d5 100644
--- a/data/maps/SecretBase_BlueCave1/map.bin
+++ b/data/layouts/SecretBase_BlueCave1/map.bin
diff --git a/data/maps/SecretBase_BlueCave2/border.bin b/data/layouts/SecretBase_BlueCave2/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BlueCave2/border.bin
+++ b/data/layouts/SecretBase_BlueCave2/border.bin
diff --git a/data/layouts/SecretBase_BlueCave2/layout.inc b/data/layouts/SecretBase_BlueCave2/layout.inc
new file mode 100644
index 000000000..8c2b48661
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave2/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BlueCave2_MapBorder::
+	.incbin "data/layouts/SecretBase_BlueCave2/border.bin"
+
+SecretBase_BlueCave2_MapBlockdata::
+	.incbin "data/layouts/SecretBase_BlueCave2/map.bin"
+
+	.align 2
+SecretBase_BlueCave2_Layout::
+	.4byte 0xf
+	.4byte 0x7
+	.4byte SecretBase_BlueCave2_MapBorder
+	.4byte SecretBase_BlueCave2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
+
diff --git a/data/maps/SecretBase_BlueCave2/map.bin b/data/layouts/SecretBase_BlueCave2/map.bin
index 4993e5b65..4993e5b65 100644
--- a/data/maps/SecretBase_BlueCave2/map.bin
+++ b/data/layouts/SecretBase_BlueCave2/map.bin
diff --git a/data/maps/SecretBase_BlueCave3/border.bin b/data/layouts/SecretBase_BlueCave3/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BlueCave3/border.bin
+++ b/data/layouts/SecretBase_BlueCave3/border.bin
diff --git a/data/layouts/SecretBase_BlueCave3/layout.inc b/data/layouts/SecretBase_BlueCave3/layout.inc
new file mode 100644
index 000000000..0ac8bee1b
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave3/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BlueCave3_MapBorder::
+	.incbin "data/layouts/SecretBase_BlueCave3/border.bin"
+
+SecretBase_BlueCave3_MapBlockdata::
+	.incbin "data/layouts/SecretBase_BlueCave3/map.bin"
+
+	.align 2
+SecretBase_BlueCave3_Layout::
+	.4byte 0xa
+	.4byte 0x11
+	.4byte SecretBase_BlueCave3_MapBorder
+	.4byte SecretBase_BlueCave3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
+
diff --git a/data/maps/SecretBase_BlueCave3/map.bin b/data/layouts/SecretBase_BlueCave3/map.bin
index 968aade07..968aade07 100644
--- a/data/maps/SecretBase_BlueCave3/map.bin
+++ b/data/layouts/SecretBase_BlueCave3/map.bin
diff --git a/data/maps/SecretBase_BlueCave4/border.bin b/data/layouts/SecretBase_BlueCave4/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BlueCave4/border.bin
+++ b/data/layouts/SecretBase_BlueCave4/border.bin
diff --git a/data/layouts/SecretBase_BlueCave4/layout.inc b/data/layouts/SecretBase_BlueCave4/layout.inc
new file mode 100644
index 000000000..d0e5ed45f
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave4/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BlueCave4_MapBorder::
+	.incbin "data/layouts/SecretBase_BlueCave4/border.bin"
+
+SecretBase_BlueCave4_MapBlockdata::
+	.incbin "data/layouts/SecretBase_BlueCave4/map.bin"
+
+	.align 2
+SecretBase_BlueCave4_Layout::
+	.4byte 0x9
+	.4byte 0x11
+	.4byte SecretBase_BlueCave4_MapBorder
+	.4byte SecretBase_BlueCave4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
+
diff --git a/data/maps/SecretBase_BlueCave4/map.bin b/data/layouts/SecretBase_BlueCave4/map.bin
index 631ac0f81..631ac0f81 100644
--- a/data/maps/SecretBase_BlueCave4/map.bin
+++ b/data/layouts/SecretBase_BlueCave4/map.bin
diff --git a/data/maps/SecretBase_BrownCave1/border.bin b/data/layouts/SecretBase_BrownCave1/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BrownCave1/border.bin
+++ b/data/layouts/SecretBase_BrownCave1/border.bin
diff --git a/data/layouts/SecretBase_BrownCave1/layout.inc b/data/layouts/SecretBase_BrownCave1/layout.inc
new file mode 100644
index 000000000..9044fd6d1
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave1/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BrownCave1_MapBorder::
+	.incbin "data/layouts/SecretBase_BrownCave1/border.bin"
+
+SecretBase_BrownCave1_MapBlockdata::
+	.incbin "data/layouts/SecretBase_BrownCave1/map.bin"
+
+	.align 2
+SecretBase_BrownCave1_Layout::
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_BrownCave1_MapBorder
+	.4byte SecretBase_BrownCave1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
+
diff --git a/data/maps/SecretBase_BrownCave1/map.bin b/data/layouts/SecretBase_BrownCave1/map.bin
index 56d3436ca..56d3436ca 100644
--- a/data/maps/SecretBase_BrownCave1/map.bin
+++ b/data/layouts/SecretBase_BrownCave1/map.bin
diff --git a/data/maps/SecretBase_BrownCave2/border.bin b/data/layouts/SecretBase_BrownCave2/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BrownCave2/border.bin
+++ b/data/layouts/SecretBase_BrownCave2/border.bin
diff --git a/data/layouts/SecretBase_BrownCave2/layout.inc b/data/layouts/SecretBase_BrownCave2/layout.inc
new file mode 100644
index 000000000..7cfb9573b
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave2/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BrownCave2_MapBorder::
+	.incbin "data/layouts/SecretBase_BrownCave2/border.bin"
+
+SecretBase_BrownCave2_MapBlockdata::
+	.incbin "data/layouts/SecretBase_BrownCave2/map.bin"
+
+	.align 2
+SecretBase_BrownCave2_Layout::
+	.4byte 0xe
+	.4byte 0x9
+	.4byte SecretBase_BrownCave2_MapBorder
+	.4byte SecretBase_BrownCave2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
+
diff --git a/data/maps/SecretBase_BrownCave2/map.bin b/data/layouts/SecretBase_BrownCave2/map.bin
index 184896975..184896975 100644
--- a/data/maps/SecretBase_BrownCave2/map.bin
+++ b/data/layouts/SecretBase_BrownCave2/map.bin
diff --git a/data/maps/SecretBase_BrownCave3/border.bin b/data/layouts/SecretBase_BrownCave3/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BrownCave3/border.bin
+++ b/data/layouts/SecretBase_BrownCave3/border.bin
diff --git a/data/layouts/SecretBase_BrownCave3/layout.inc b/data/layouts/SecretBase_BrownCave3/layout.inc
new file mode 100644
index 000000000..5ad1bf526
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave3/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BrownCave3_MapBorder::
+	.incbin "data/layouts/SecretBase_BrownCave3/border.bin"
+
+SecretBase_BrownCave3_MapBlockdata::
+	.incbin "data/layouts/SecretBase_BrownCave3/map.bin"
+
+	.align 2
+SecretBase_BrownCave3_Layout::
+	.4byte 0xf
+	.4byte 0xb
+	.4byte SecretBase_BrownCave3_MapBorder
+	.4byte SecretBase_BrownCave3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
+
diff --git a/data/maps/SecretBase_BrownCave3/map.bin b/data/layouts/SecretBase_BrownCave3/map.bin
index d9967522a..d9967522a 100644
--- a/data/maps/SecretBase_BrownCave3/map.bin
+++ b/data/layouts/SecretBase_BrownCave3/map.bin
diff --git a/data/maps/SecretBase_BrownCave4/border.bin b/data/layouts/SecretBase_BrownCave4/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BrownCave4/border.bin
+++ b/data/layouts/SecretBase_BrownCave4/border.bin
diff --git a/data/layouts/SecretBase_BrownCave4/layout.inc b/data/layouts/SecretBase_BrownCave4/layout.inc
new file mode 100644
index 000000000..6094a3832
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave4/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BrownCave4_MapBorder::
+	.incbin "data/layouts/SecretBase_BrownCave4/border.bin"
+
+SecretBase_BrownCave4_MapBlockdata::
+	.incbin "data/layouts/SecretBase_BrownCave4/map.bin"
+
+	.align 2
+SecretBase_BrownCave4_Layout::
+	.4byte 0xe
+	.4byte 0xc
+	.4byte SecretBase_BrownCave4_MapBorder
+	.4byte SecretBase_BrownCave4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
+
diff --git a/data/maps/SecretBase_BrownCave4/map.bin b/data/layouts/SecretBase_BrownCave4/map.bin
index 8b5a763c4..8b5a763c4 100644
--- a/data/maps/SecretBase_BrownCave4/map.bin
+++ b/data/layouts/SecretBase_BrownCave4/map.bin
diff --git a/data/maps/SecretBase_RedCave1/border.bin b/data/layouts/SecretBase_RedCave1/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_RedCave1/border.bin
+++ b/data/layouts/SecretBase_RedCave1/border.bin
diff --git a/data/layouts/SecretBase_RedCave1/layout.inc b/data/layouts/SecretBase_RedCave1/layout.inc
new file mode 100644
index 000000000..a4664d509
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave1/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_RedCave1_MapBorder::
+	.incbin "data/layouts/SecretBase_RedCave1/border.bin"
+
+SecretBase_RedCave1_MapBlockdata::
+	.incbin "data/layouts/SecretBase_RedCave1/map.bin"
+
+	.align 2
+SecretBase_RedCave1_Layout::
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_RedCave1_MapBorder
+	.4byte SecretBase_RedCave1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
+
diff --git a/data/maps/SecretBase_RedCave1/map.bin b/data/layouts/SecretBase_RedCave1/map.bin
index ce666b57d..ce666b57d 100644
--- a/data/maps/SecretBase_RedCave1/map.bin
+++ b/data/layouts/SecretBase_RedCave1/map.bin
diff --git a/data/maps/SecretBase_RedCave2/border.bin b/data/layouts/SecretBase_RedCave2/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_RedCave2/border.bin
+++ b/data/layouts/SecretBase_RedCave2/border.bin
diff --git a/data/layouts/SecretBase_RedCave2/layout.inc b/data/layouts/SecretBase_RedCave2/layout.inc
new file mode 100644
index 000000000..7999395d8
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave2/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_RedCave2_MapBorder::
+	.incbin "data/layouts/SecretBase_RedCave2/border.bin"
+
+SecretBase_RedCave2_MapBlockdata::
+	.incbin "data/layouts/SecretBase_RedCave2/map.bin"
+
+	.align 2
+SecretBase_RedCave2_Layout::
+	.4byte 0x7
+	.4byte 0x10
+	.4byte SecretBase_RedCave2_MapBorder
+	.4byte SecretBase_RedCave2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
+
diff --git a/data/maps/SecretBase_RedCave2/map.bin b/data/layouts/SecretBase_RedCave2/map.bin
index 4fa03acfe..4fa03acfe 100644
--- a/data/maps/SecretBase_RedCave2/map.bin
+++ b/data/layouts/SecretBase_RedCave2/map.bin
diff --git a/data/maps/SecretBase_RedCave3/border.bin b/data/layouts/SecretBase_RedCave3/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_RedCave3/border.bin
+++ b/data/layouts/SecretBase_RedCave3/border.bin
diff --git a/data/layouts/SecretBase_RedCave3/layout.inc b/data/layouts/SecretBase_RedCave3/layout.inc
new file mode 100644
index 000000000..6a3cc123b
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave3/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_RedCave3_MapBorder::
+	.incbin "data/layouts/SecretBase_RedCave3/border.bin"
+
+SecretBase_RedCave3_MapBlockdata::
+	.incbin "data/layouts/SecretBase_RedCave3/map.bin"
+
+	.align 2
+SecretBase_RedCave3_Layout::
+	.4byte 0xf
+	.4byte 0x8
+	.4byte SecretBase_RedCave3_MapBorder
+	.4byte SecretBase_RedCave3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
+
diff --git a/data/maps/SecretBase_RedCave3/map.bin b/data/layouts/SecretBase_RedCave3/map.bin
index 0528e565d..0528e565d 100644
--- a/data/maps/SecretBase_RedCave3/map.bin
+++ b/data/layouts/SecretBase_RedCave3/map.bin
diff --git a/data/maps/SecretBase_RedCave4/border.bin b/data/layouts/SecretBase_RedCave4/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_RedCave4/border.bin
+++ b/data/layouts/SecretBase_RedCave4/border.bin
diff --git a/data/layouts/SecretBase_RedCave4/layout.inc b/data/layouts/SecretBase_RedCave4/layout.inc
new file mode 100644
index 000000000..665f44709
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave4/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_RedCave4_MapBorder::
+	.incbin "data/layouts/SecretBase_RedCave4/border.bin"
+
+SecretBase_RedCave4_MapBlockdata::
+	.incbin "data/layouts/SecretBase_RedCave4/map.bin"
+
+	.align 2
+SecretBase_RedCave4_Layout::
+	.4byte 0x9
+	.4byte 0xf
+	.4byte SecretBase_RedCave4_MapBorder
+	.4byte SecretBase_RedCave4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
+
diff --git a/data/maps/SecretBase_RedCave4/map.bin b/data/layouts/SecretBase_RedCave4/map.bin
index 526763290..526763290 100644
--- a/data/maps/SecretBase_RedCave4/map.bin
+++ b/data/layouts/SecretBase_RedCave4/map.bin
diff --git a/data/maps/SecretBase_Shrub1/border.bin b/data/layouts/SecretBase_Shrub1/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Shrub1/border.bin
+++ b/data/layouts/SecretBase_Shrub1/border.bin
diff --git a/data/layouts/SecretBase_Shrub1/layout.inc b/data/layouts/SecretBase_Shrub1/layout.inc
new file mode 100644
index 000000000..2bcc9f58a
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub1/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Shrub1_MapBorder::
+	.incbin "data/layouts/SecretBase_Shrub1/border.bin"
+
+SecretBase_Shrub1_MapBlockdata::
+	.incbin "data/layouts/SecretBase_Shrub1/map.bin"
+
+	.align 2
+SecretBase_Shrub1_Layout::
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_Shrub1_MapBorder
+	.4byte SecretBase_Shrub1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
+
diff --git a/data/maps/SecretBase_Shrub1/map.bin b/data/layouts/SecretBase_Shrub1/map.bin
index 4b566cc1b..4b566cc1b 100644
--- a/data/maps/SecretBase_Shrub1/map.bin
+++ b/data/layouts/SecretBase_Shrub1/map.bin
diff --git a/data/maps/SecretBase_Shrub2/border.bin b/data/layouts/SecretBase_Shrub2/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Shrub2/border.bin
+++ b/data/layouts/SecretBase_Shrub2/border.bin
diff --git a/data/layouts/SecretBase_Shrub2/layout.inc b/data/layouts/SecretBase_Shrub2/layout.inc
new file mode 100644
index 000000000..e94376c3b
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub2/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Shrub2_MapBorder::
+	.incbin "data/layouts/SecretBase_Shrub2/border.bin"
+
+SecretBase_Shrub2_MapBlockdata::
+	.incbin "data/layouts/SecretBase_Shrub2/map.bin"
+
+	.align 2
+SecretBase_Shrub2_Layout::
+	.4byte 0xf
+	.4byte 0x7
+	.4byte SecretBase_Shrub2_MapBorder
+	.4byte SecretBase_Shrub2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
+
diff --git a/data/maps/SecretBase_Shrub2/map.bin b/data/layouts/SecretBase_Shrub2/map.bin
index 8cb88cc44..8cb88cc44 100644
--- a/data/maps/SecretBase_Shrub2/map.bin
+++ b/data/layouts/SecretBase_Shrub2/map.bin
diff --git a/data/maps/SecretBase_Shrub3/border.bin b/data/layouts/SecretBase_Shrub3/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Shrub3/border.bin
+++ b/data/layouts/SecretBase_Shrub3/border.bin
diff --git a/data/layouts/SecretBase_Shrub3/layout.inc b/data/layouts/SecretBase_Shrub3/layout.inc
new file mode 100644
index 000000000..449f1a11f
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub3/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Shrub3_MapBorder::
+	.incbin "data/layouts/SecretBase_Shrub3/border.bin"
+
+SecretBase_Shrub3_MapBlockdata::
+	.incbin "data/layouts/SecretBase_Shrub3/map.bin"
+
+	.align 2
+SecretBase_Shrub3_Layout::
+	.4byte 0xd
+	.4byte 0xb
+	.4byte SecretBase_Shrub3_MapBorder
+	.4byte SecretBase_Shrub3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
+
diff --git a/data/maps/SecretBase_Shrub3/map.bin b/data/layouts/SecretBase_Shrub3/map.bin
index d51aeea21..d51aeea21 100644
--- a/data/maps/SecretBase_Shrub3/map.bin
+++ b/data/layouts/SecretBase_Shrub3/map.bin
diff --git a/data/maps/SecretBase_Shrub4/border.bin b/data/layouts/SecretBase_Shrub4/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Shrub4/border.bin
+++ b/data/layouts/SecretBase_Shrub4/border.bin
diff --git a/data/layouts/SecretBase_Shrub4/layout.inc b/data/layouts/SecretBase_Shrub4/layout.inc
new file mode 100644
index 000000000..139a82050
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub4/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Shrub4_MapBorder::
+	.incbin "data/layouts/SecretBase_Shrub4/border.bin"
+
+SecretBase_Shrub4_MapBlockdata::
+	.incbin "data/layouts/SecretBase_Shrub4/map.bin"
+
+	.align 2
+SecretBase_Shrub4_Layout::
+	.4byte 0xe
+	.4byte 0xb
+	.4byte SecretBase_Shrub4_MapBorder
+	.4byte SecretBase_Shrub4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
+
diff --git a/data/maps/SecretBase_Shrub4/map.bin b/data/layouts/SecretBase_Shrub4/map.bin
index 8a4cf836d..8a4cf836d 100644
--- a/data/maps/SecretBase_Shrub4/map.bin
+++ b/data/layouts/SecretBase_Shrub4/map.bin
diff --git a/data/maps/SecretBase_Tree1/border.bin b/data/layouts/SecretBase_Tree1/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Tree1/border.bin
+++ b/data/layouts/SecretBase_Tree1/border.bin
diff --git a/data/layouts/SecretBase_Tree1/layout.inc b/data/layouts/SecretBase_Tree1/layout.inc
new file mode 100644
index 000000000..73e6e41a6
--- /dev/null
+++ b/data/layouts/SecretBase_Tree1/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Tree1_MapBorder::
+	.incbin "data/layouts/SecretBase_Tree1/border.bin"
+
+SecretBase_Tree1_MapBlockdata::
+	.incbin "data/layouts/SecretBase_Tree1/map.bin"
+
+	.align 2
+SecretBase_Tree1_Layout::
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_Tree1_MapBorder
+	.4byte SecretBase_Tree1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
+
diff --git a/data/maps/SecretBase_Tree1/map.bin b/data/layouts/SecretBase_Tree1/map.bin
index 907f1486a..907f1486a 100644
--- a/data/maps/SecretBase_Tree1/map.bin
+++ b/data/layouts/SecretBase_Tree1/map.bin
diff --git a/data/maps/SecretBase_Tree2/border.bin b/data/layouts/SecretBase_Tree2/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Tree2/border.bin
+++ b/data/layouts/SecretBase_Tree2/border.bin
diff --git a/data/layouts/SecretBase_Tree2/layout.inc b/data/layouts/SecretBase_Tree2/layout.inc
new file mode 100644
index 000000000..95b122220
--- /dev/null
+++ b/data/layouts/SecretBase_Tree2/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Tree2_MapBorder::
+	.incbin "data/layouts/SecretBase_Tree2/border.bin"
+
+SecretBase_Tree2_MapBlockdata::
+	.incbin "data/layouts/SecretBase_Tree2/map.bin"
+
+	.align 2
+SecretBase_Tree2_Layout::
+	.4byte 0x7
+	.4byte 0x10
+	.4byte SecretBase_Tree2_MapBorder
+	.4byte SecretBase_Tree2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
+
diff --git a/data/maps/SecretBase_Tree2/map.bin b/data/layouts/SecretBase_Tree2/map.bin
index c2e5698b0..c2e5698b0 100644
--- a/data/maps/SecretBase_Tree2/map.bin
+++ b/data/layouts/SecretBase_Tree2/map.bin
diff --git a/data/maps/SecretBase_Tree3/border.bin b/data/layouts/SecretBase_Tree3/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Tree3/border.bin
+++ b/data/layouts/SecretBase_Tree3/border.bin
diff --git a/data/layouts/SecretBase_Tree3/layout.inc b/data/layouts/SecretBase_Tree3/layout.inc
new file mode 100644
index 000000000..66716a404
--- /dev/null
+++ b/data/layouts/SecretBase_Tree3/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Tree3_MapBorder::
+	.incbin "data/layouts/SecretBase_Tree3/border.bin"
+
+SecretBase_Tree3_MapBlockdata::
+	.incbin "data/layouts/SecretBase_Tree3/map.bin"
+
+	.align 2
+SecretBase_Tree3_Layout::
+	.4byte 0x11
+	.4byte 0x8
+	.4byte SecretBase_Tree3_MapBorder
+	.4byte SecretBase_Tree3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
+
diff --git a/data/maps/SecretBase_Tree3/map.bin b/data/layouts/SecretBase_Tree3/map.bin
index b6ae04b00..b6ae04b00 100644
--- a/data/maps/SecretBase_Tree3/map.bin
+++ b/data/layouts/SecretBase_Tree3/map.bin
diff --git a/data/maps/SecretBase_Tree4/border.bin b/data/layouts/SecretBase_Tree4/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Tree4/border.bin
+++ b/data/layouts/SecretBase_Tree4/border.bin
diff --git a/data/layouts/SecretBase_Tree4/layout.inc b/data/layouts/SecretBase_Tree4/layout.inc
new file mode 100644
index 000000000..20d4c3e01
--- /dev/null
+++ b/data/layouts/SecretBase_Tree4/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Tree4_MapBorder::
+	.incbin "data/layouts/SecretBase_Tree4/border.bin"
+
+SecretBase_Tree4_MapBlockdata::
+	.incbin "data/layouts/SecretBase_Tree4/map.bin"
+
+	.align 2
+SecretBase_Tree4_Layout::
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SecretBase_Tree4_MapBorder
+	.4byte SecretBase_Tree4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
+
diff --git a/data/maps/SecretBase_Tree4/map.bin b/data/layouts/SecretBase_Tree4/map.bin
index b3b381d9e..b3b381d9e 100644
--- a/data/maps/SecretBase_Tree4/map.bin
+++ b/data/layouts/SecretBase_Tree4/map.bin
diff --git a/data/maps/SecretBase_YellowCave1/border.bin b/data/layouts/SecretBase_YellowCave1/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_YellowCave1/border.bin
+++ b/data/layouts/SecretBase_YellowCave1/border.bin
diff --git a/data/layouts/SecretBase_YellowCave1/layout.inc b/data/layouts/SecretBase_YellowCave1/layout.inc
new file mode 100644
index 000000000..7fa3aa823
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave1/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_YellowCave1_MapBorder::
+	.incbin "data/layouts/SecretBase_YellowCave1/border.bin"
+
+SecretBase_YellowCave1_MapBlockdata::
+	.incbin "data/layouts/SecretBase_YellowCave1/map.bin"
+
+	.align 2
+SecretBase_YellowCave1_Layout::
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_YellowCave1_MapBorder
+	.4byte SecretBase_YellowCave1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
+
diff --git a/data/maps/SecretBase_YellowCave1/map.bin b/data/layouts/SecretBase_YellowCave1/map.bin
index 1301e7317..1301e7317 100644
--- a/data/maps/SecretBase_YellowCave1/map.bin
+++ b/data/layouts/SecretBase_YellowCave1/map.bin
diff --git a/data/maps/SecretBase_YellowCave2/border.bin b/data/layouts/SecretBase_YellowCave2/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_YellowCave2/border.bin
+++ b/data/layouts/SecretBase_YellowCave2/border.bin
diff --git a/data/layouts/SecretBase_YellowCave2/layout.inc b/data/layouts/SecretBase_YellowCave2/layout.inc
new file mode 100644
index 000000000..0ae872e08
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave2/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_YellowCave2_MapBorder::
+	.incbin "data/layouts/SecretBase_YellowCave2/border.bin"
+
+SecretBase_YellowCave2_MapBlockdata::
+	.incbin "data/layouts/SecretBase_YellowCave2/map.bin"
+
+	.align 2
+SecretBase_YellowCave2_Layout::
+	.4byte 0xe
+	.4byte 0x9
+	.4byte SecretBase_YellowCave2_MapBorder
+	.4byte SecretBase_YellowCave2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
+
diff --git a/data/maps/SecretBase_YellowCave2/map.bin b/data/layouts/SecretBase_YellowCave2/map.bin
index e18cb47c6..e18cb47c6 100644
--- a/data/maps/SecretBase_YellowCave2/map.bin
+++ b/data/layouts/SecretBase_YellowCave2/map.bin
diff --git a/data/maps/SecretBase_YellowCave3/border.bin b/data/layouts/SecretBase_YellowCave3/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_YellowCave3/border.bin
+++ b/data/layouts/SecretBase_YellowCave3/border.bin
diff --git a/data/layouts/SecretBase_YellowCave3/layout.inc b/data/layouts/SecretBase_YellowCave3/layout.inc
new file mode 100644
index 000000000..f42d88920
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave3/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_YellowCave3_MapBorder::
+	.incbin "data/layouts/SecretBase_YellowCave3/border.bin"
+
+SecretBase_YellowCave3_MapBlockdata::
+	.incbin "data/layouts/SecretBase_YellowCave3/map.bin"
+
+	.align 2
+SecretBase_YellowCave3_Layout::
+	.4byte 0xc
+	.4byte 0xb
+	.4byte SecretBase_YellowCave3_MapBorder
+	.4byte SecretBase_YellowCave3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
+
diff --git a/data/maps/SecretBase_YellowCave3/map.bin b/data/layouts/SecretBase_YellowCave3/map.bin
index b7d80a0ab..b7d80a0ab 100644
--- a/data/maps/SecretBase_YellowCave3/map.bin
+++ b/data/layouts/SecretBase_YellowCave3/map.bin
diff --git a/data/maps/SecretBase_YellowCave4/border.bin b/data/layouts/SecretBase_YellowCave4/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_YellowCave4/border.bin
+++ b/data/layouts/SecretBase_YellowCave4/border.bin
diff --git a/data/layouts/SecretBase_YellowCave4/layout.inc b/data/layouts/SecretBase_YellowCave4/layout.inc
new file mode 100644
index 000000000..b7a11df5a
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave4/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_YellowCave4_MapBorder::
+	.incbin "data/layouts/SecretBase_YellowCave4/border.bin"
+
+SecretBase_YellowCave4_MapBlockdata::
+	.incbin "data/layouts/SecretBase_YellowCave4/map.bin"
+
+	.align 2
+SecretBase_YellowCave4_Layout::
+	.4byte 0xd
+	.4byte 0xe
+	.4byte SecretBase_YellowCave4_MapBorder
+	.4byte SecretBase_YellowCave4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
+
diff --git a/data/maps/SecretBase_YellowCave4/map.bin b/data/layouts/SecretBase_YellowCave4/map.bin
index d3c3e0204..d3c3e0204 100644
--- a/data/maps/SecretBase_YellowCave4/map.bin
+++ b/data/layouts/SecretBase_YellowCave4/map.bin
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin
+++ b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin
diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc
new file mode 100644
index 000000000..a52425e15
--- /dev/null
+++ b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc
@@ -0,0 +1,15 @@
+ShoalCave_HighTideEntranceRoom_MapBorder::
+	.incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin"
+
+ShoalCave_HighTideEntranceRoom_MapBlockdata::
+	.incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin"
+
+	.align 2
+ShoalCave_HighTideEntranceRoom_Layout::
+	.4byte 0x23
+	.4byte 0x23
+	.4byte ShoalCave_HighTideEntranceRoom_MapBorder
+	.4byte ShoalCave_HighTideEntranceRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin
index 0e4b88c8f..0e4b88c8f 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin
+++ b/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/border.bin b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/border.bin
+++ b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin
diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc
new file mode 100644
index 000000000..2d323b9e0
--- /dev/null
+++ b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc
@@ -0,0 +1,15 @@
+ShoalCave_HighTideInnerRoom_MapBorder::
+	.incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin"
+
+ShoalCave_HighTideInnerRoom_MapBlockdata::
+	.incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin"
+
+	.align 2
+ShoalCave_HighTideInnerRoom_Layout::
+	.4byte 0x2e
+	.4byte 0x26
+	.4byte ShoalCave_HighTideInnerRoom_MapBorder
+	.4byte ShoalCave_HighTideInnerRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.bin b/data/layouts/ShoalCave_HighTideInnerRoom/map.bin
index c540a4008..c540a4008 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/map.bin
+++ b/data/layouts/ShoalCave_HighTideInnerRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin b/data/layouts/ShoalCave_LowTideEntranceRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideEntranceRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc
new file mode 100644
index 000000000..0a1eee113
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideEntranceRoom_MapBorder::
+	.incbin "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin"
+
+ShoalCave_LowTideEntranceRoom_MapBlockdata::
+	.incbin "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideEntranceRoom_Layout::
+	.4byte 0x23
+	.4byte 0x23
+	.4byte ShoalCave_LowTideEntranceRoom_MapBorder
+	.4byte ShoalCave_LowTideEntranceRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin b/data/layouts/ShoalCave_LowTideEntranceRoom/map.bin
index 1cf7c87f2..1cf7c87f2 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideEntranceRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideIceRoom/border.bin b/data/layouts/ShoalCave_LowTideIceRoom/border.bin
index 206bd63f8..206bd63f8 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideIceRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc
new file mode 100644
index 000000000..6d7a51575
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideIceRoom_MapBorder::
+	.incbin "data/layouts/ShoalCave_LowTideIceRoom/border.bin"
+
+ShoalCave_LowTideIceRoom_MapBlockdata::
+	.incbin "data/layouts/ShoalCave_LowTideIceRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideIceRoom_Layout::
+	.4byte 0x14
+	.4byte 0x1e
+	.4byte ShoalCave_LowTideIceRoom_MapBorder
+	.4byte ShoalCave_LowTideIceRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.bin b/data/layouts/ShoalCave_LowTideIceRoom/map.bin
index 222f1f26c..222f1f26c 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideIceRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/border.bin b/data/layouts/ShoalCave_LowTideInnerRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideInnerRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc
new file mode 100644
index 000000000..f66fc9723
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideInnerRoom_MapBorder::
+	.incbin "data/layouts/ShoalCave_LowTideInnerRoom/border.bin"
+
+ShoalCave_LowTideInnerRoom_MapBlockdata::
+	.incbin "data/layouts/ShoalCave_LowTideInnerRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideInnerRoom_Layout::
+	.4byte 0x2e
+	.4byte 0x26
+	.4byte ShoalCave_LowTideInnerRoom_MapBorder
+	.4byte ShoalCave_LowTideInnerRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.bin b/data/layouts/ShoalCave_LowTideInnerRoom/map.bin
index 87df28cf4..87df28cf4 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideInnerRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/border.bin b/data/layouts/ShoalCave_LowTideLowerRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideLowerRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc
new file mode 100644
index 000000000..79cc82e8c
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideLowerRoom_MapBorder::
+	.incbin "data/layouts/ShoalCave_LowTideLowerRoom/border.bin"
+
+ShoalCave_LowTideLowerRoom_MapBlockdata::
+	.incbin "data/layouts/ShoalCave_LowTideLowerRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideLowerRoom_Layout::
+	.4byte 0x1f
+	.4byte 0xe
+	.4byte ShoalCave_LowTideLowerRoom_MapBorder
+	.4byte ShoalCave_LowTideLowerRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.bin b/data/layouts/ShoalCave_LowTideLowerRoom/map.bin
index 04bf2baf3..04bf2baf3 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideLowerRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/border.bin b/data/layouts/ShoalCave_LowTideStairsRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideStairsRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc
new file mode 100644
index 000000000..62dbff40e
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideStairsRoom_MapBorder::
+	.incbin "data/layouts/ShoalCave_LowTideStairsRoom/border.bin"
+
+ShoalCave_LowTideStairsRoom_MapBlockdata::
+	.incbin "data/layouts/ShoalCave_LowTideStairsRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideStairsRoom_Layout::
+	.4byte 0x15
+	.4byte 0xf
+	.4byte ShoalCave_LowTideStairsRoom_MapBorder
+	.4byte ShoalCave_LowTideStairsRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.bin b/data/layouts/ShoalCave_LowTideStairsRoom/map.bin
index f2b56644d..f2b56644d 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideStairsRoom/map.bin
diff --git a/data/maps/SkyPillar_1F/border.bin b/data/layouts/SingleBattleColosseum/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_1F/border.bin
+++ b/data/layouts/SingleBattleColosseum/border.bin
diff --git a/data/layouts/SingleBattleColosseum/layout.inc b/data/layouts/SingleBattleColosseum/layout.inc
new file mode 100644
index 000000000..f42855de8
--- /dev/null
+++ b/data/layouts/SingleBattleColosseum/layout.inc
@@ -0,0 +1,15 @@
+SingleBattleColosseum_MapBorder::
+	.incbin "data/layouts/SingleBattleColosseum/border.bin"
+
+SingleBattleColosseum_MapBlockdata::
+	.incbin "data/layouts/SingleBattleColosseum/map.bin"
+
+	.align 2
+SingleBattleColosseum_Layout::
+	.4byte 0xe
+	.4byte 0x9
+	.4byte SingleBattleColosseum_MapBorder
+	.4byte SingleBattleColosseum_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
+
diff --git a/data/maps/SingleBattleColosseum/map.bin b/data/layouts/SingleBattleColosseum/map.bin
index 1f66ab707..1f66ab707 100644
--- a/data/maps/SingleBattleColosseum/map.bin
+++ b/data/layouts/SingleBattleColosseum/map.bin
diff --git a/data/maps/SkyPillar_2F/border.bin b/data/layouts/SkyPillar_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_2F/border.bin
+++ b/data/layouts/SkyPillar_1F/border.bin
diff --git a/data/layouts/SkyPillar_1F/layout.inc b/data/layouts/SkyPillar_1F/layout.inc
new file mode 100644
index 000000000..235f04935
--- /dev/null
+++ b/data/layouts/SkyPillar_1F/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_1F_MapBorder::
+	.incbin "data/layouts/SkyPillar_1F/border.bin"
+
+SkyPillar_1F_MapBlockdata::
+	.incbin "data/layouts/SkyPillar_1F/map.bin"
+
+	.align 2
+SkyPillar_1F_Layout::
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_1F_MapBorder
+	.4byte SkyPillar_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/SkyPillar_1F/map.bin b/data/layouts/SkyPillar_1F/map.bin
index 1eb299c49..1eb299c49 100644
--- a/data/maps/SkyPillar_1F/map.bin
+++ b/data/layouts/SkyPillar_1F/map.bin
diff --git a/data/maps/SkyPillar_3F/border.bin b/data/layouts/SkyPillar_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_3F/border.bin
+++ b/data/layouts/SkyPillar_2F/border.bin
diff --git a/data/layouts/SkyPillar_2F/layout.inc b/data/layouts/SkyPillar_2F/layout.inc
new file mode 100644
index 000000000..368fcd518
--- /dev/null
+++ b/data/layouts/SkyPillar_2F/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_2F_MapBorder::
+	.incbin "data/layouts/SkyPillar_2F/border.bin"
+
+SkyPillar_2F_MapBlockdata::
+	.incbin "data/layouts/SkyPillar_2F/map.bin"
+
+	.align 2
+SkyPillar_2F_Layout::
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_2F_MapBorder
+	.4byte SkyPillar_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/SkyPillar_2F/map.bin b/data/layouts/SkyPillar_2F/map.bin
index 8ec9bf213..8ec9bf213 100644
--- a/data/maps/SkyPillar_2F/map.bin
+++ b/data/layouts/SkyPillar_2F/map.bin
diff --git a/data/maps/SkyPillar_4F/border.bin b/data/layouts/SkyPillar_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_4F/border.bin
+++ b/data/layouts/SkyPillar_3F/border.bin
diff --git a/data/layouts/SkyPillar_3F/layout.inc b/data/layouts/SkyPillar_3F/layout.inc
new file mode 100644
index 000000000..32ac95143
--- /dev/null
+++ b/data/layouts/SkyPillar_3F/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_3F_MapBorder::
+	.incbin "data/layouts/SkyPillar_3F/border.bin"
+
+SkyPillar_3F_MapBlockdata::
+	.incbin "data/layouts/SkyPillar_3F/map.bin"
+
+	.align 2
+SkyPillar_3F_Layout::
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_3F_MapBorder
+	.4byte SkyPillar_3F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/SkyPillar_3F/map.bin b/data/layouts/SkyPillar_3F/map.bin
index d6c76d48c..d6c76d48c 100644
--- a/data/maps/SkyPillar_3F/map.bin
+++ b/data/layouts/SkyPillar_3F/map.bin
diff --git a/data/maps/SkyPillar_5F/border.bin b/data/layouts/SkyPillar_4F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_5F/border.bin
+++ b/data/layouts/SkyPillar_4F/border.bin
diff --git a/data/layouts/SkyPillar_4F/layout.inc b/data/layouts/SkyPillar_4F/layout.inc
new file mode 100644
index 000000000..055abf133
--- /dev/null
+++ b/data/layouts/SkyPillar_4F/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_4F_MapBorder::
+	.incbin "data/layouts/SkyPillar_4F/border.bin"
+
+SkyPillar_4F_MapBlockdata::
+	.incbin "data/layouts/SkyPillar_4F/map.bin"
+
+	.align 2
+SkyPillar_4F_Layout::
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_4F_MapBorder
+	.4byte SkyPillar_4F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/SkyPillar_4F/map.bin b/data/layouts/SkyPillar_4F/map.bin
index 02e82bb4f..02e82bb4f 100644
--- a/data/maps/SkyPillar_4F/map.bin
+++ b/data/layouts/SkyPillar_4F/map.bin
diff --git a/data/maps/SlateportCity_Harbor/border.bin b/data/layouts/SkyPillar_5F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SlateportCity_Harbor/border.bin
+++ b/data/layouts/SkyPillar_5F/border.bin
diff --git a/data/layouts/SkyPillar_5F/layout.inc b/data/layouts/SkyPillar_5F/layout.inc
new file mode 100644
index 000000000..3f3bb5bc1
--- /dev/null
+++ b/data/layouts/SkyPillar_5F/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_5F_MapBorder::
+	.incbin "data/layouts/SkyPillar_5F/border.bin"
+
+SkyPillar_5F_MapBlockdata::
+	.incbin "data/layouts/SkyPillar_5F/map.bin"
+
+	.align 2
+SkyPillar_5F_Layout::
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_5F_MapBorder
+	.4byte SkyPillar_5F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/SkyPillar_5F/map.bin b/data/layouts/SkyPillar_5F/map.bin
index b8cd541d5..b8cd541d5 100644
--- a/data/maps/SkyPillar_5F/map.bin
+++ b/data/layouts/SkyPillar_5F/map.bin
diff --git a/data/maps/SkyPillar_Entrance/border.bin b/data/layouts/SkyPillar_Entrance/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/SkyPillar_Entrance/border.bin
+++ b/data/layouts/SkyPillar_Entrance/border.bin
diff --git a/data/layouts/SkyPillar_Entrance/layout.inc b/data/layouts/SkyPillar_Entrance/layout.inc
new file mode 100644
index 000000000..1313bd196
--- /dev/null
+++ b/data/layouts/SkyPillar_Entrance/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_Entrance_MapBorder::
+	.incbin "data/layouts/SkyPillar_Entrance/border.bin"
+
+SkyPillar_Entrance_MapBlockdata::
+	.incbin "data/layouts/SkyPillar_Entrance/map.bin"
+
+	.align 2
+SkyPillar_Entrance_Layout::
+	.4byte 0x12
+	.4byte 0x12
+	.4byte SkyPillar_Entrance_MapBorder
+	.4byte SkyPillar_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/SkyPillar_Entrance/map.bin b/data/layouts/SkyPillar_Entrance/map.bin
index b215b86ef..b215b86ef 100644
--- a/data/maps/SkyPillar_Entrance/map.bin
+++ b/data/layouts/SkyPillar_Entrance/map.bin
diff --git a/data/maps/SkyPillar_Outside/border.bin b/data/layouts/SkyPillar_Outside/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/SkyPillar_Outside/border.bin
+++ b/data/layouts/SkyPillar_Outside/border.bin
diff --git a/data/layouts/SkyPillar_Outside/layout.inc b/data/layouts/SkyPillar_Outside/layout.inc
new file mode 100644
index 000000000..5eb9df563
--- /dev/null
+++ b/data/layouts/SkyPillar_Outside/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_Outside_MapBorder::
+	.incbin "data/layouts/SkyPillar_Outside/border.bin"
+
+SkyPillar_Outside_MapBlockdata::
+	.incbin "data/layouts/SkyPillar_Outside/map.bin"
+
+	.align 2
+SkyPillar_Outside_Layout::
+	.4byte 0x1c
+	.4byte 0x17
+	.4byte SkyPillar_Outside_MapBorder
+	.4byte SkyPillar_Outside_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/SkyPillar_Outside/map.bin b/data/layouts/SkyPillar_Outside/map.bin
index 01b78d554..01b78d554 100644
--- a/data/maps/SkyPillar_Outside/map.bin
+++ b/data/layouts/SkyPillar_Outside/map.bin
diff --git a/data/maps/SkyPillar_Top/border.bin b/data/layouts/SkyPillar_Top/border.bin
index e9d1c658c..e9d1c658c 100644
--- a/data/maps/SkyPillar_Top/border.bin
+++ b/data/layouts/SkyPillar_Top/border.bin
diff --git a/data/layouts/SkyPillar_Top/layout.inc b/data/layouts/SkyPillar_Top/layout.inc
new file mode 100644
index 000000000..646c6f95f
--- /dev/null
+++ b/data/layouts/SkyPillar_Top/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_Top_MapBorder::
+	.incbin "data/layouts/SkyPillar_Top/border.bin"
+
+SkyPillar_Top_MapBlockdata::
+	.incbin "data/layouts/SkyPillar_Top/map.bin"
+
+	.align 2
+SkyPillar_Top_Layout::
+	.4byte 0x1b
+	.4byte 0x18
+	.4byte SkyPillar_Top_MapBorder
+	.4byte SkyPillar_Top_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/SkyPillar_Top/map.bin b/data/layouts/SkyPillar_Top/map.bin
index d87f50f30..d87f50f30 100644
--- a/data/maps/SkyPillar_Top/map.bin
+++ b/data/layouts/SkyPillar_Top/map.bin
diff --git a/data/maps/SlateportCity/border.bin b/data/layouts/SlateportCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/SlateportCity/border.bin
+++ b/data/layouts/SlateportCity/border.bin
diff --git a/data/layouts/SlateportCity/layout.inc b/data/layouts/SlateportCity/layout.inc
new file mode 100644
index 000000000..dfa184764
--- /dev/null
+++ b/data/layouts/SlateportCity/layout.inc
@@ -0,0 +1,15 @@
+SlateportCity_MapBorder::
+	.incbin "data/layouts/SlateportCity/border.bin"
+
+SlateportCity_MapBlockdata::
+	.incbin "data/layouts/SlateportCity/map.bin"
+
+	.align 2
+SlateportCity_Layout::
+	.4byte 0x28
+	.4byte 0x3c
+	.4byte SlateportCity_MapBorder
+	.4byte SlateportCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Slateport
+
diff --git a/data/maps/SlateportCity/map.bin b/data/layouts/SlateportCity/map.bin
index 163beb4e8..163beb4e8 100644
--- a/data/maps/SlateportCity/map.bin
+++ b/data/layouts/SlateportCity/map.bin
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin b/data/layouts/SlateportCity_OceanicMuseum_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin
+++ b/data/layouts/SlateportCity_OceanicMuseum_1F/border.bin
diff --git a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc
new file mode 100644
index 000000000..f921eb5fc
--- /dev/null
+++ b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc
@@ -0,0 +1,15 @@
+SlateportCity_OceanicMuseum_1F_MapBorder::
+	.incbin "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin"
+
+SlateportCity_OceanicMuseum_1F_MapBlockdata::
+	.incbin "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin"
+
+	.align 2
+SlateportCity_OceanicMuseum_1F_Layout::
+	.4byte 0x14
+	.4byte 0x9
+	.4byte SlateportCity_OceanicMuseum_1F_MapBorder
+	.4byte SlateportCity_OceanicMuseum_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_OceanicMuseum
+
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin b/data/layouts/SlateportCity_OceanicMuseum_1F/map.bin
index f18b01e49..f18b01e49 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin
+++ b/data/layouts/SlateportCity_OceanicMuseum_1F/map.bin
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin b/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin
+++ b/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin
diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc
new file mode 100644
index 000000000..7a6998987
--- /dev/null
+++ b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc
@@ -0,0 +1,15 @@
+SlateportCity_OceanicMuseum_2F_MapBorder::
+	.incbin "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin"
+
+SlateportCity_OceanicMuseum_2F_MapBlockdata::
+	.incbin "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin"
+
+	.align 2
+SlateportCity_OceanicMuseum_2F_Layout::
+	.4byte 0x14
+	.4byte 0x9
+	.4byte SlateportCity_OceanicMuseum_2F_MapBorder
+	.4byte SlateportCity_OceanicMuseum_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_OceanicMuseum
+
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin b/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin
index 1fa2cdc18..1fa2cdc18 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin
+++ b/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin
diff --git a/data/maps/SlateportCity_PokemonFanClub/border.bin b/data/layouts/SlateportCity_PokemonFanClub/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SlateportCity_PokemonFanClub/border.bin
+++ b/data/layouts/SlateportCity_PokemonFanClub/border.bin
diff --git a/data/layouts/SlateportCity_PokemonFanClub/layout.inc b/data/layouts/SlateportCity_PokemonFanClub/layout.inc
new file mode 100644
index 000000000..44f9a559f
--- /dev/null
+++ b/data/layouts/SlateportCity_PokemonFanClub/layout.inc
@@ -0,0 +1,15 @@
+SlateportCity_PokemonFanClub_MapBorder::
+	.incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin"
+
+SlateportCity_PokemonFanClub_MapBlockdata::
+	.incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin"
+
+	.align 2
+SlateportCity_PokemonFanClub_Layout::
+	.4byte 0xe
+	.4byte 0xb
+	.4byte SlateportCity_PokemonFanClub_MapBorder
+	.4byte SlateportCity_PokemonFanClub_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonFanClub
+
diff --git a/data/maps/SlateportCity_PokemonFanClub/map.bin b/data/layouts/SlateportCity_PokemonFanClub/map.bin
index effff6653..effff6653 100644
--- a/data/maps/SlateportCity_PokemonFanClub/map.bin
+++ b/data/layouts/SlateportCity_PokemonFanClub/map.bin
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/border.bin b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/border.bin
+++ b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin
diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc
new file mode 100644
index 000000000..00d5840c6
--- /dev/null
+++ b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc
@@ -0,0 +1,15 @@
+SlateportCity_SternsShipyard_1F_MapBorder::
+	.incbin "data/layouts/SlateportCity_SternsShipyard_1F/border.bin"
+
+SlateportCity_SternsShipyard_1F_MapBlockdata::
+	.incbin "data/layouts/SlateportCity_SternsShipyard_1F/map.bin"
+
+	.align 2
+SlateportCity_SternsShipyard_1F_Layout::
+	.4byte 0x15
+	.4byte 0xf
+	.4byte SlateportCity_SternsShipyard_1F_MapBorder
+	.4byte SlateportCity_SternsShipyard_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.bin b/data/layouts/SlateportCity_SternsShipyard_1F/map.bin
index 036f5ce26..036f5ce26 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/map.bin
+++ b/data/layouts/SlateportCity_SternsShipyard_1F/map.bin
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/border.bin b/data/layouts/SlateportCity_SternsShipyard_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/border.bin
+++ b/data/layouts/SlateportCity_SternsShipyard_2F/border.bin
diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc
new file mode 100644
index 000000000..01a969a3a
--- /dev/null
+++ b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc
@@ -0,0 +1,15 @@
+SlateportCity_SternsShipyard_2F_MapBorder::
+	.incbin "data/layouts/SlateportCity_SternsShipyard_2F/border.bin"
+
+SlateportCity_SternsShipyard_2F_MapBlockdata::
+	.incbin "data/layouts/SlateportCity_SternsShipyard_2F/map.bin"
+
+	.align 2
+SlateportCity_SternsShipyard_2F_Layout::
+	.4byte 0x11
+	.4byte 0xf
+	.4byte SlateportCity_SternsShipyard_2F_MapBorder
+	.4byte SlateportCity_SternsShipyard_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
+
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.bin b/data/layouts/SlateportCity_SternsShipyard_2F/map.bin
index d10ed2ac2..d10ed2ac2 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/map.bin
+++ b/data/layouts/SlateportCity_SternsShipyard_2F/map.bin
diff --git a/data/maps/SootopolisCity/border.bin b/data/layouts/SootopolisCity/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/maps/SootopolisCity/border.bin
+++ b/data/layouts/SootopolisCity/border.bin
diff --git a/data/layouts/SootopolisCity/layout.inc b/data/layouts/SootopolisCity/layout.inc
new file mode 100644
index 000000000..400a29cbd
--- /dev/null
+++ b/data/layouts/SootopolisCity/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_MapBorder::
+	.incbin "data/layouts/SootopolisCity/border.bin"
+
+SootopolisCity_MapBlockdata::
+	.incbin "data/layouts/SootopolisCity/map.bin"
+
+	.align 2
+SootopolisCity_Layout::
+	.4byte 0x3c
+	.4byte 0x3c
+	.4byte SootopolisCity_MapBorder
+	.4byte SootopolisCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Sootopolis
+
diff --git a/data/maps/SootopolisCity/map.bin b/data/layouts/SootopolisCity/map.bin
index ff03ebc3b..ff03ebc3b 100644
--- a/data/maps/SootopolisCity/map.bin
+++ b/data/layouts/SootopolisCity/map.bin
diff --git a/data/maps/SootopolisCity_Gym_1F/border.bin b/data/layouts/SootopolisCity_Gym_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SootopolisCity_Gym_1F/border.bin
+++ b/data/layouts/SootopolisCity_Gym_1F/border.bin
diff --git a/data/layouts/SootopolisCity_Gym_1F/layout.inc b/data/layouts/SootopolisCity_Gym_1F/layout.inc
new file mode 100644
index 000000000..4c6a6eeef
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_1F/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_Gym_1F_MapBorder::
+	.incbin "data/layouts/SootopolisCity_Gym_1F/border.bin"
+
+SootopolisCity_Gym_1F_MapBlockdata::
+	.incbin "data/layouts/SootopolisCity_Gym_1F/map.bin"
+
+	.align 2
+SootopolisCity_Gym_1F_Layout::
+	.4byte 0x11
+	.4byte 0x1a
+	.4byte SootopolisCity_Gym_1F_MapBorder
+	.4byte SootopolisCity_Gym_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_SootopolisGym
+
diff --git a/data/maps/SootopolisCity_Gym_1F/map.bin b/data/layouts/SootopolisCity_Gym_1F/map.bin
index dd52448c9..dd52448c9 100644
--- a/data/maps/SootopolisCity_Gym_1F/map.bin
+++ b/data/layouts/SootopolisCity_Gym_1F/map.bin
diff --git a/data/maps/SootopolisCity_Gym_B1F/border.bin b/data/layouts/SootopolisCity_Gym_B1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SootopolisCity_Gym_B1F/border.bin
+++ b/data/layouts/SootopolisCity_Gym_B1F/border.bin
diff --git a/data/layouts/SootopolisCity_Gym_B1F/layout.inc b/data/layouts/SootopolisCity_Gym_B1F/layout.inc
new file mode 100644
index 000000000..7eb90fb71
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_B1F/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_Gym_B1F_MapBorder::
+	.incbin "data/layouts/SootopolisCity_Gym_B1F/border.bin"
+
+SootopolisCity_Gym_B1F_MapBlockdata::
+	.incbin "data/layouts/SootopolisCity_Gym_B1F/map.bin"
+
+	.align 2
+SootopolisCity_Gym_B1F_Layout::
+	.4byte 0x11
+	.4byte 0x1a
+	.4byte SootopolisCity_Gym_B1F_MapBorder
+	.4byte SootopolisCity_Gym_B1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_SootopolisGym
+
diff --git a/data/maps/SootopolisCity_Gym_B1F/map.bin b/data/layouts/SootopolisCity_Gym_B1F/map.bin
index 58410408f..58410408f 100644
--- a/data/maps/SootopolisCity_Gym_B1F/map.bin
+++ b/data/layouts/SootopolisCity_Gym_B1F/map.bin
diff --git a/data/maps/SootopolisCity_House1/border.bin b/data/layouts/SootopolisCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SootopolisCity_House1/border.bin
+++ b/data/layouts/SootopolisCity_House1/border.bin
diff --git a/data/layouts/SootopolisCity_House1/layout.inc b/data/layouts/SootopolisCity_House1/layout.inc
new file mode 100644
index 000000000..1ad9cc41c
--- /dev/null
+++ b/data/layouts/SootopolisCity_House1/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_House1_MapBorder::
+	.incbin "data/layouts/SootopolisCity_House1/border.bin"
+
+SootopolisCity_House1_MapBlockdata::
+	.incbin "data/layouts/SootopolisCity_House1/map.bin"
+
+	.align 2
+SootopolisCity_House1_Layout::
+	.4byte 0x8
+	.4byte 0x7
+	.4byte SootopolisCity_House1_MapBorder
+	.4byte SootopolisCity_House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/SootopolisCity_House1/map.bin b/data/layouts/SootopolisCity_House1/map.bin
index 43f11b194..43f11b194 100644
--- a/data/maps/SootopolisCity_House1/map.bin
+++ b/data/layouts/SootopolisCity_House1/map.bin
diff --git a/data/maps/SootopolisCity_House2/border.bin b/data/layouts/SootopolisCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SootopolisCity_House2/border.bin
+++ b/data/layouts/SootopolisCity_House2/border.bin
diff --git a/data/layouts/SootopolisCity_House2/layout.inc b/data/layouts/SootopolisCity_House2/layout.inc
new file mode 100644
index 000000000..9007d584b
--- /dev/null
+++ b/data/layouts/SootopolisCity_House2/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_House2_MapBorder::
+	.incbin "data/layouts/SootopolisCity_House2/border.bin"
+
+SootopolisCity_House2_MapBlockdata::
+	.incbin "data/layouts/SootopolisCity_House2/map.bin"
+
+	.align 2
+SootopolisCity_House2_Layout::
+	.4byte 0x8
+	.4byte 0x7
+	.4byte SootopolisCity_House2_MapBorder
+	.4byte SootopolisCity_House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/SootopolisCity_House2/map.bin b/data/layouts/SootopolisCity_House2/map.bin
index 632e1e36a..632e1e36a 100644
--- a/data/maps/SootopolisCity_House2/map.bin
+++ b/data/layouts/SootopolisCity_House2/map.bin
diff --git a/data/maps/SootopolisCity_House3/border.bin b/data/layouts/SootopolisCity_House3/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SootopolisCity_House3/border.bin
+++ b/data/layouts/SootopolisCity_House3/border.bin
diff --git a/data/layouts/SootopolisCity_House3/layout.inc b/data/layouts/SootopolisCity_House3/layout.inc
new file mode 100644
index 000000000..540f4306c
--- /dev/null
+++ b/data/layouts/SootopolisCity_House3/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_House3_MapBorder::
+	.incbin "data/layouts/SootopolisCity_House3/border.bin"
+
+SootopolisCity_House3_MapBlockdata::
+	.incbin "data/layouts/SootopolisCity_House3/map.bin"
+
+	.align 2
+SootopolisCity_House3_Layout::
+	.4byte 0x8
+	.4byte 0x7
+	.4byte SootopolisCity_House3_MapBorder
+	.4byte SootopolisCity_House3_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/SootopolisCity_House3/map.bin b/data/layouts/SootopolisCity_House3/map.bin
index 8bbd6c517..8bbd6c517 100644
--- a/data/maps/SootopolisCity_House3/map.bin
+++ b/data/layouts/SootopolisCity_House3/map.bin
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin b/data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin
+++ b/data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin
diff --git a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc
new file mode 100644
index 000000000..152563eb6
--- /dev/null
+++ b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_LotadAndSeedotHouse_MapBorder::
+	.incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin"
+
+SootopolisCity_LotadAndSeedotHouse_MapBlockdata::
+	.incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin"
+
+	.align 2
+SootopolisCity_LotadAndSeedotHouse_Layout::
+	.4byte 0x8
+	.4byte 0x7
+	.4byte SootopolisCity_LotadAndSeedotHouse_MapBorder
+	.4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin b/data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin
index ffeea7269..ffeea7269 100644
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin
+++ b/data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin
diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc
new file mode 100644
index 000000000..0b846950e
--- /dev/null
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_MysteryEventsHouse_1F_MapBorder::
+	.incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin"
+
+SootopolisCity_MysteryEventsHouse_1F_MapBlockdata::
+	.incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin"
+
+	.align 2
+SootopolisCity_MysteryEventsHouse_1F_Layout::
+	.4byte 0xb
+	.4byte 0x8
+	.4byte SootopolisCity_MysteryEventsHouse_1F_MapBorder
+	.4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_MysteryEventsHouse
+
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin
index a9b17a746..a9b17a746 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin
diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc
new file mode 100644
index 000000000..1bb92b933
--- /dev/null
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_MysteryEventsHouse_B1F_MapBorder::
+	.incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin"
+
+SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata::
+	.incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin"
+
+	.align 2
+SootopolisCity_MysteryEventsHouse_B1F_Layout::
+	.4byte 0xc
+	.4byte 0x9
+	.4byte SootopolisCity_MysteryEventsHouse_B1F_MapBorder
+	.4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_MysteryEventsHouse
+
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin
index 558e1584e..558e1584e 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin
diff --git a/data/maps/SouthernIsland_Exterior/border.bin b/data/layouts/SouthernIsland_Exterior/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/SouthernIsland_Exterior/border.bin
+++ b/data/layouts/SouthernIsland_Exterior/border.bin
diff --git a/data/layouts/SouthernIsland_Exterior/layout.inc b/data/layouts/SouthernIsland_Exterior/layout.inc
new file mode 100644
index 000000000..4a62cd3f5
--- /dev/null
+++ b/data/layouts/SouthernIsland_Exterior/layout.inc
@@ -0,0 +1,15 @@
+SouthernIsland_Exterior_MapBorder::
+	.incbin "data/layouts/SouthernIsland_Exterior/border.bin"
+
+SouthernIsland_Exterior_MapBlockdata::
+	.incbin "data/layouts/SouthernIsland_Exterior/map.bin"
+
+	.align 2
+SouthernIsland_Exterior_Layout::
+	.4byte 0x21
+	.4byte 0x1e
+	.4byte SouthernIsland_Exterior_MapBorder
+	.4byte SouthernIsland_Exterior_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
+
diff --git a/data/maps/SouthernIsland_Exterior/map.bin b/data/layouts/SouthernIsland_Exterior/map.bin
index 8c2c2df4a..8c2c2df4a 100644
--- a/data/maps/SouthernIsland_Exterior/map.bin
+++ b/data/layouts/SouthernIsland_Exterior/map.bin
diff --git a/data/maps/SouthernIsland_Interior/border.bin b/data/layouts/SouthernIsland_Interior/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SouthernIsland_Interior/border.bin
+++ b/data/layouts/SouthernIsland_Interior/border.bin
diff --git a/data/layouts/SouthernIsland_Interior/layout.inc b/data/layouts/SouthernIsland_Interior/layout.inc
new file mode 100644
index 000000000..b4d9a35d2
--- /dev/null
+++ b/data/layouts/SouthernIsland_Interior/layout.inc
@@ -0,0 +1,15 @@
+SouthernIsland_Interior_MapBorder::
+	.incbin "data/layouts/SouthernIsland_Interior/border.bin"
+
+SouthernIsland_Interior_MapBlockdata::
+	.incbin "data/layouts/SouthernIsland_Interior/map.bin"
+
+	.align 2
+SouthernIsland_Interior_Layout::
+	.4byte 0x1b
+	.4byte 0x18
+	.4byte SouthernIsland_Interior_MapBorder
+	.4byte SouthernIsland_Interior_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
+
diff --git a/data/maps/SouthernIsland_Interior/map.bin b/data/layouts/SouthernIsland_Interior/map.bin
index db1e4b153..db1e4b153 100644
--- a/data/maps/SouthernIsland_Interior/map.bin
+++ b/data/layouts/SouthernIsland_Interior/map.bin
diff --git a/data/maps/TerraCave_End/border.bin b/data/layouts/TerraCave_End/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/TerraCave_End/border.bin
+++ b/data/layouts/TerraCave_End/border.bin
diff --git a/data/layouts/TerraCave_End/layout.inc b/data/layouts/TerraCave_End/layout.inc
new file mode 100644
index 000000000..0865a8e5b
--- /dev/null
+++ b/data/layouts/TerraCave_End/layout.inc
@@ -0,0 +1,15 @@
+TerraCave_End_MapBorder::
+	.incbin "data/layouts/TerraCave_End/border.bin"
+
+TerraCave_End_MapBlockdata::
+	.incbin "data/layouts/TerraCave_End/map.bin"
+
+	.align 2
+TerraCave_End_Layout::
+	.4byte 0x1b
+	.4byte 0x1e
+	.4byte TerraCave_End_MapBorder
+	.4byte TerraCave_End_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/TerraCave_End/map.bin b/data/layouts/TerraCave_End/map.bin
index 93121190d..93121190d 100644
--- a/data/maps/TerraCave_End/map.bin
+++ b/data/layouts/TerraCave_End/map.bin
diff --git a/data/maps/TerraCave_Entrance/border.bin b/data/layouts/TerraCave_Entrance/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/TerraCave_Entrance/border.bin
+++ b/data/layouts/TerraCave_Entrance/border.bin
diff --git a/data/layouts/TerraCave_Entrance/layout.inc b/data/layouts/TerraCave_Entrance/layout.inc
new file mode 100644
index 000000000..19d50ef44
--- /dev/null
+++ b/data/layouts/TerraCave_Entrance/layout.inc
@@ -0,0 +1,15 @@
+TerraCave_Entrance_MapBorder::
+	.incbin "data/layouts/TerraCave_Entrance/border.bin"
+
+TerraCave_Entrance_MapBlockdata::
+	.incbin "data/layouts/TerraCave_Entrance/map.bin"
+
+	.align 2
+TerraCave_Entrance_Layout::
+	.4byte 0x14
+	.4byte 0x14
+	.4byte TerraCave_Entrance_MapBorder
+	.4byte TerraCave_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/TerraCave_Entrance/map.bin b/data/layouts/TerraCave_Entrance/map.bin
index a8108c2ca..a8108c2ca 100644
--- a/data/maps/TerraCave_Entrance/map.bin
+++ b/data/layouts/TerraCave_Entrance/map.bin
diff --git a/data/maps/TradeCenter/border.bin b/data/layouts/TradeCenter/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/TradeCenter/border.bin
+++ b/data/layouts/TradeCenter/border.bin
diff --git a/data/layouts/TradeCenter/layout.inc b/data/layouts/TradeCenter/layout.inc
new file mode 100644
index 000000000..5e0297e7a
--- /dev/null
+++ b/data/layouts/TradeCenter/layout.inc
@@ -0,0 +1,15 @@
+TradeCenter_MapBorder::
+	.incbin "data/layouts/TradeCenter/border.bin"
+
+TradeCenter_MapBlockdata::
+	.incbin "data/layouts/TradeCenter/map.bin"
+
+	.align 2
+TradeCenter_Layout::
+	.4byte 0xc
+	.4byte 0x9
+	.4byte TradeCenter_MapBorder
+	.4byte TradeCenter_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
+
diff --git a/data/maps/TradeCenter/map.bin b/data/layouts/TradeCenter/map.bin
index 7e592dbe6..7e592dbe6 100644
--- a/data/maps/TradeCenter/map.bin
+++ b/data/layouts/TradeCenter/map.bin
diff --git a/data/maps/TrainerHill_1F/border.bin b/data/layouts/TrainerHill_1F/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/TrainerHill_1F/border.bin
+++ b/data/layouts/TrainerHill_1F/border.bin
diff --git a/data/layouts/TrainerHill_1F/layout.inc b/data/layouts/TrainerHill_1F/layout.inc
new file mode 100644
index 000000000..2009cd49e
--- /dev/null
+++ b/data/layouts/TrainerHill_1F/layout.inc
@@ -0,0 +1,15 @@
+TrainerHill_1F_MapBorder::
+	.incbin "data/layouts/TrainerHill_1F/border.bin"
+
+TrainerHill_1F_MapBlockdata::
+	.incbin "data/layouts/TrainerHill_1F/map.bin"
+
+	.align 2
+TrainerHill_1F_Layout::
+	.4byte 0x10
+	.4byte 0x15
+	.4byte TrainerHill_1F_MapBorder
+	.4byte TrainerHill_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrainerHill
+
diff --git a/data/maps/TrainerHill_1F/map.bin b/data/layouts/TrainerHill_1F/map.bin
index d72e84a5c..d72e84a5c 100644
--- a/data/maps/TrainerHill_1F/map.bin
+++ b/data/layouts/TrainerHill_1F/map.bin
diff --git a/data/maps/TrainerHill_2F/border.bin b/data/layouts/TrainerHill_2F/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/TrainerHill_2F/border.bin
+++ b/data/layouts/TrainerHill_2F/border.bin
diff --git a/data/layouts/TrainerHill_2F/layout.inc b/data/layouts/TrainerHill_2F/layout.inc
new file mode 100644
index 000000000..f67b54bf1
--- /dev/null
+++ b/data/layouts/TrainerHill_2F/layout.inc
@@ -0,0 +1,15 @@
+TrainerHill_2F_MapBorder::
+	.incbin "data/layouts/TrainerHill_2F/border.bin"
+
+TrainerHill_2F_MapBlockdata::
+	.incbin "data/layouts/TrainerHill_2F/map.bin"
+
+	.align 2
+TrainerHill_2F_Layout::
+	.4byte 0x10
+	.4byte 0x15
+	.4byte TrainerHill_2F_MapBorder
+	.4byte TrainerHill_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrainerHill
+
diff --git a/data/maps/TrainerHill_2F/map.bin b/data/layouts/TrainerHill_2F/map.bin
index 8b78fd0b4..8b78fd0b4 100644
--- a/data/maps/TrainerHill_2F/map.bin
+++ b/data/layouts/TrainerHill_2F/map.bin
diff --git a/data/maps/TrainerHill_3F/border.bin b/data/layouts/TrainerHill_3F/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/TrainerHill_3F/border.bin
+++ b/data/layouts/TrainerHill_3F/border.bin
diff --git a/data/layouts/TrainerHill_3F/layout.inc b/data/layouts/TrainerHill_3F/layout.inc
new file mode 100644
index 000000000..280517f41
--- /dev/null
+++ b/data/layouts/TrainerHill_3F/layout.inc
@@ -0,0 +1,15 @@
+TrainerHill_3F_MapBorder::
+	.incbin "data/layouts/TrainerHill_3F/border.bin"
+
+TrainerHill_3F_MapBlockdata::
+	.incbin "data/layouts/TrainerHill_3F/map.bin"
+
+	.align 2
+TrainerHill_3F_Layout::
+	.4byte 0x10
+	.4byte 0x15
+	.4byte TrainerHill_3F_MapBorder
+	.4byte TrainerHill_3F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrainerHill
+
diff --git a/data/maps/TrainerHill_3F/map.bin b/data/layouts/TrainerHill_3F/map.bin
index 5280752f4..5280752f4 100644
--- a/data/maps/TrainerHill_3F/map.bin
+++ b/data/layouts/TrainerHill_3F/map.bin
diff --git a/data/maps/TrainerHill_4F/border.bin b/data/layouts/TrainerHill_4F/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/TrainerHill_4F/border.bin
+++ b/data/layouts/TrainerHill_4F/border.bin
diff --git a/data/layouts/TrainerHill_4F/layout.inc b/data/layouts/TrainerHill_4F/layout.inc
new file mode 100644
index 000000000..eed0b0120
--- /dev/null
+++ b/data/layouts/TrainerHill_4F/layout.inc
@@ -0,0 +1,15 @@
+TrainerHill_4F_MapBorder::
+	.incbin "data/layouts/TrainerHill_4F/border.bin"
+
+TrainerHill_4F_MapBlockdata::
+	.incbin "data/layouts/TrainerHill_4F/map.bin"
+
+	.align 2
+TrainerHill_4F_Layout::
+	.4byte 0x10
+	.4byte 0x15
+	.4byte TrainerHill_4F_MapBorder
+	.4byte TrainerHill_4F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrainerHill
+
diff --git a/data/maps/TrainerHill_4F/map.bin b/data/layouts/TrainerHill_4F/map.bin
index 3a285b7f8..3a285b7f8 100644
--- a/data/maps/TrainerHill_4F/map.bin
+++ b/data/layouts/TrainerHill_4F/map.bin
diff --git a/data/maps/TrainerHill_Entrance/border.bin b/data/layouts/TrainerHill_Entrance/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/TrainerHill_Entrance/border.bin
+++ b/data/layouts/TrainerHill_Entrance/border.bin
diff --git a/data/layouts/TrainerHill_Entrance/layout.inc b/data/layouts/TrainerHill_Entrance/layout.inc
new file mode 100644
index 000000000..896f43e0d
--- /dev/null
+++ b/data/layouts/TrainerHill_Entrance/layout.inc
@@ -0,0 +1,15 @@
+TrainerHill_Entrance_MapBorder::
+	.incbin "data/layouts/TrainerHill_Entrance/border.bin"
+
+TrainerHill_Entrance_MapBlockdata::
+	.incbin "data/layouts/TrainerHill_Entrance/map.bin"
+
+	.align 2
+TrainerHill_Entrance_Layout::
+	.4byte 0x13
+	.4byte 0x11
+	.4byte TrainerHill_Entrance_MapBorder
+	.4byte TrainerHill_Entrance_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrainerHill
+
diff --git a/data/maps/TrainerHill_Entrance/map.bin b/data/layouts/TrainerHill_Entrance/map.bin
index fc00c0a5f..fc00c0a5f 100644
--- a/data/maps/TrainerHill_Entrance/map.bin
+++ b/data/layouts/TrainerHill_Entrance/map.bin
diff --git a/data/maps/TrainerHill_Roof/border.bin b/data/layouts/TrainerHill_Roof/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/TrainerHill_Roof/border.bin
+++ b/data/layouts/TrainerHill_Roof/border.bin
diff --git a/data/layouts/TrainerHill_Roof/layout.inc b/data/layouts/TrainerHill_Roof/layout.inc
new file mode 100644
index 000000000..9477dceda
--- /dev/null
+++ b/data/layouts/TrainerHill_Roof/layout.inc
@@ -0,0 +1,15 @@
+TrainerHill_Roof_MapBorder::
+	.incbin "data/layouts/TrainerHill_Roof/border.bin"
+
+TrainerHill_Roof_MapBlockdata::
+	.incbin "data/layouts/TrainerHill_Roof/map.bin"
+
+	.align 2
+TrainerHill_Roof_Layout::
+	.4byte 0x19
+	.4byte 0x10
+	.4byte TrainerHill_Roof_MapBorder
+	.4byte TrainerHill_Roof_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrainerHill
+
diff --git a/data/maps/TrainerHill_Roof/map.bin b/data/layouts/TrainerHill_Roof/map.bin
index 815ec1067..815ec1067 100644
--- a/data/maps/TrainerHill_Roof/map.bin
+++ b/data/layouts/TrainerHill_Roof/map.bin
diff --git a/data/maps/Underwater1/border.bin b/data/layouts/Underwater1/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater1/border.bin
+++ b/data/layouts/Underwater1/border.bin
diff --git a/data/layouts/Underwater1/layout.inc b/data/layouts/Underwater1/layout.inc
new file mode 100644
index 000000000..8e027bbd2
--- /dev/null
+++ b/data/layouts/Underwater1/layout.inc
@@ -0,0 +1,15 @@
+Underwater1_MapBorder::
+	.incbin "data/layouts/Underwater1/border.bin"
+
+Underwater1_MapBlockdata::
+	.incbin "data/layouts/Underwater1/map.bin"
+
+	.align 2
+Underwater1_Layout::
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Underwater1_MapBorder
+	.4byte Underwater1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
+
diff --git a/data/maps/Underwater1/map.bin b/data/layouts/Underwater1/map.bin
index 230e3dcd2..230e3dcd2 100644
--- a/data/maps/Underwater1/map.bin
+++ b/data/layouts/Underwater1/map.bin
diff --git a/data/maps/Underwater2/border.bin b/data/layouts/Underwater2/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater2/border.bin
+++ b/data/layouts/Underwater2/border.bin
diff --git a/data/layouts/Underwater2/layout.inc b/data/layouts/Underwater2/layout.inc
new file mode 100644
index 000000000..ac6350d47
--- /dev/null
+++ b/data/layouts/Underwater2/layout.inc
@@ -0,0 +1,15 @@
+Underwater2_MapBorder::
+	.incbin "data/layouts/Underwater2/border.bin"
+
+Underwater2_MapBlockdata::
+	.incbin "data/layouts/Underwater2/map.bin"
+
+	.align 2
+Underwater2_Layout::
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Underwater2_MapBorder
+	.4byte Underwater2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
+
diff --git a/data/maps/Underwater2/map.bin b/data/layouts/Underwater2/map.bin
index 0c6377c30..0c6377c30 100644
--- a/data/maps/Underwater2/map.bin
+++ b/data/layouts/Underwater2/map.bin
diff --git a/data/maps/Underwater3/border.bin b/data/layouts/Underwater3/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater3/border.bin
+++ b/data/layouts/Underwater3/border.bin
diff --git a/data/layouts/Underwater3/layout.inc b/data/layouts/Underwater3/layout.inc
new file mode 100644
index 000000000..c365b6b8f
--- /dev/null
+++ b/data/layouts/Underwater3/layout.inc
@@ -0,0 +1,15 @@
+Underwater3_MapBorder::
+	.incbin "data/layouts/Underwater3/border.bin"
+
+Underwater3_MapBlockdata::
+	.incbin "data/layouts/Underwater3/map.bin"
+
+	.align 2
+Underwater3_Layout::
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Underwater3_MapBorder
+	.4byte Underwater3_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
+
diff --git a/data/maps/Underwater3/map.bin b/data/layouts/Underwater3/map.bin
index fc5c331a5..fc5c331a5 100644
--- a/data/maps/Underwater3/map.bin
+++ b/data/layouts/Underwater3/map.bin
diff --git a/data/maps/Underwater4/border.bin b/data/layouts/Underwater4/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater4/border.bin
+++ b/data/layouts/Underwater4/border.bin
diff --git a/data/layouts/Underwater4/layout.inc b/data/layouts/Underwater4/layout.inc
new file mode 100644
index 000000000..9e22e4e40
--- /dev/null
+++ b/data/layouts/Underwater4/layout.inc
@@ -0,0 +1,15 @@
+Underwater4_MapBorder::
+	.incbin "data/layouts/Underwater4/border.bin"
+
+Underwater4_MapBlockdata::
+	.incbin "data/layouts/Underwater4/map.bin"
+
+	.align 2
+Underwater4_Layout::
+	.4byte 0x78
+	.4byte 0x28
+	.4byte Underwater4_MapBorder
+	.4byte Underwater4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
+
diff --git a/data/maps/Underwater4/map.bin b/data/layouts/Underwater4/map.bin
index 23f987681..23f987681 100644
--- a/data/maps/Underwater4/map.bin
+++ b/data/layouts/Underwater4/map.bin
diff --git a/data/maps/Underwater5/border.bin b/data/layouts/Underwater5/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater5/border.bin
+++ b/data/layouts/Underwater5/border.bin
diff --git a/data/layouts/Underwater5/layout.inc b/data/layouts/Underwater5/layout.inc
new file mode 100644
index 000000000..6394eec54
--- /dev/null
+++ b/data/layouts/Underwater5/layout.inc
@@ -0,0 +1,15 @@
+Underwater5_MapBorder::
+	.incbin "data/layouts/Underwater5/border.bin"
+
+Underwater5_MapBlockdata::
+	.incbin "data/layouts/Underwater5/map.bin"
+
+	.align 2
+Underwater5_Layout::
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Underwater5_MapBorder
+	.4byte Underwater5_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
+
diff --git a/data/maps/Underwater5/map.bin b/data/layouts/Underwater5/map.bin
index 902f0dbdc..902f0dbdc 100644
--- a/data/maps/Underwater5/map.bin
+++ b/data/layouts/Underwater5/map.bin
diff --git a/data/maps/Underwater6/border.bin b/data/layouts/Underwater6/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater6/border.bin
+++ b/data/layouts/Underwater6/border.bin
diff --git a/data/layouts/Underwater6/layout.inc b/data/layouts/Underwater6/layout.inc
new file mode 100644
index 000000000..247af44bd
--- /dev/null
+++ b/data/layouts/Underwater6/layout.inc
@@ -0,0 +1,15 @@
+Underwater6_MapBorder::
+	.incbin "data/layouts/Underwater6/border.bin"
+
+Underwater6_MapBlockdata::
+	.incbin "data/layouts/Underwater6/map.bin"
+
+	.align 2
+Underwater6_Layout::
+	.4byte 0x28
+	.4byte 0x50
+	.4byte Underwater6_MapBorder
+	.4byte Underwater6_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
+
diff --git a/data/maps/Underwater6/map.bin b/data/layouts/Underwater6/map.bin
index 92bd56031..92bd56031 100644
--- a/data/maps/Underwater6/map.bin
+++ b/data/layouts/Underwater6/map.bin
diff --git a/data/maps/Underwater7/border.bin b/data/layouts/Underwater7/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater7/border.bin
+++ b/data/layouts/Underwater7/border.bin
diff --git a/data/layouts/Underwater7/layout.inc b/data/layouts/Underwater7/layout.inc
new file mode 100644
index 000000000..5c2670b11
--- /dev/null
+++ b/data/layouts/Underwater7/layout.inc
@@ -0,0 +1,15 @@
+Underwater7_MapBorder::
+	.incbin "data/layouts/Underwater7/border.bin"
+
+Underwater7_MapBlockdata::
+	.incbin "data/layouts/Underwater7/map.bin"
+
+	.align 2
+Underwater7_Layout::
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Underwater7_MapBorder
+	.4byte Underwater7_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
+
diff --git a/data/maps/Underwater7/map.bin b/data/layouts/Underwater7/map.bin
index 660f585ae..660f585ae 100644
--- a/data/maps/Underwater7/map.bin
+++ b/data/layouts/Underwater7/map.bin
diff --git a/data/maps/Underwater_MarineCave/border.bin b/data/layouts/Underwater_MarineCave/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater_MarineCave/border.bin
+++ b/data/layouts/Underwater_MarineCave/border.bin
diff --git a/data/layouts/Underwater_MarineCave/layout.inc b/data/layouts/Underwater_MarineCave/layout.inc
new file mode 100644
index 000000000..52a3a7851
--- /dev/null
+++ b/data/layouts/Underwater_MarineCave/layout.inc
@@ -0,0 +1,15 @@
+Underwater_MarineCave_MapBorder::
+	.incbin "data/layouts/Underwater_MarineCave/border.bin"
+
+Underwater_MarineCave_MapBlockdata::
+	.incbin "data/layouts/Underwater_MarineCave/map.bin"
+
+	.align 2
+Underwater_MarineCave_Layout::
+	.4byte 0x14
+	.4byte 0xa
+	.4byte Underwater_MarineCave_MapBorder
+	.4byte Underwater_MarineCave_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
+
diff --git a/data/maps/Underwater_MarineCave/map.bin b/data/layouts/Underwater_MarineCave/map.bin
index 1904f4757..1904f4757 100644
--- a/data/maps/Underwater_MarineCave/map.bin
+++ b/data/layouts/Underwater_MarineCave/map.bin
diff --git a/data/maps/Underwater_Route134/border.bin b/data/layouts/Underwater_Route134/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater_Route134/border.bin
+++ b/data/layouts/Underwater_Route134/border.bin
diff --git a/data/layouts/Underwater_Route134/layout.inc b/data/layouts/Underwater_Route134/layout.inc
new file mode 100644
index 000000000..1534564a4
--- /dev/null
+++ b/data/layouts/Underwater_Route134/layout.inc
@@ -0,0 +1,15 @@
+Underwater_Route134_MapBorder::
+	.incbin "data/layouts/Underwater_Route134/border.bin"
+
+Underwater_Route134_MapBlockdata::
+	.incbin "data/layouts/Underwater_Route134/map.bin"
+
+	.align 2
+Underwater_Route134_Layout::
+	.4byte 0x12
+	.4byte 0xa
+	.4byte Underwater_Route134_MapBorder
+	.4byte Underwater_Route134_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
+
diff --git a/data/maps/Underwater_Route134/map.bin b/data/layouts/Underwater_Route134/map.bin
index 77bdd37aa..77bdd37aa 100644
--- a/data/maps/Underwater_Route134/map.bin
+++ b/data/layouts/Underwater_Route134/map.bin
diff --git a/data/maps/Underwater_SeafloorCavern/border.bin b/data/layouts/Underwater_SeafloorCavern/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater_SeafloorCavern/border.bin
+++ b/data/layouts/Underwater_SeafloorCavern/border.bin
diff --git a/data/layouts/Underwater_SeafloorCavern/layout.inc b/data/layouts/Underwater_SeafloorCavern/layout.inc
new file mode 100644
index 000000000..5bce06a6b
--- /dev/null
+++ b/data/layouts/Underwater_SeafloorCavern/layout.inc
@@ -0,0 +1,15 @@
+Underwater_SeafloorCavern_MapBorder::
+	.incbin "data/layouts/Underwater_SeafloorCavern/border.bin"
+
+Underwater_SeafloorCavern_MapBlockdata::
+	.incbin "data/layouts/Underwater_SeafloorCavern/map.bin"
+
+	.align 2
+Underwater_SeafloorCavern_Layout::
+	.4byte 0xe
+	.4byte 0x9
+	.4byte Underwater_SeafloorCavern_MapBorder
+	.4byte Underwater_SeafloorCavern_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
+
diff --git a/data/maps/Underwater_SeafloorCavern/map.bin b/data/layouts/Underwater_SeafloorCavern/map.bin
index 4cacc495e..4cacc495e 100644
--- a/data/maps/Underwater_SeafloorCavern/map.bin
+++ b/data/layouts/Underwater_SeafloorCavern/map.bin
diff --git a/data/maps/Underwater_SealedChamber/border.bin b/data/layouts/Underwater_SealedChamber/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater_SealedChamber/border.bin
+++ b/data/layouts/Underwater_SealedChamber/border.bin
diff --git a/data/layouts/Underwater_SealedChamber/layout.inc b/data/layouts/Underwater_SealedChamber/layout.inc
new file mode 100644
index 000000000..5baf5dde8
--- /dev/null
+++ b/data/layouts/Underwater_SealedChamber/layout.inc
@@ -0,0 +1,15 @@
+Underwater_SealedChamber_MapBorder::
+	.incbin "data/layouts/Underwater_SealedChamber/border.bin"
+
+Underwater_SealedChamber_MapBlockdata::
+	.incbin "data/layouts/Underwater_SealedChamber/map.bin"
+
+	.align 2
+Underwater_SealedChamber_Layout::
+	.4byte 0x16
+	.4byte 0x30
+	.4byte Underwater_SealedChamber_MapBorder
+	.4byte Underwater_SealedChamber_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
+
diff --git a/data/maps/Underwater_SealedChamber/map.bin b/data/layouts/Underwater_SealedChamber/map.bin
index 5ac0b4a73..5ac0b4a73 100644
--- a/data/maps/Underwater_SealedChamber/map.bin
+++ b/data/layouts/Underwater_SealedChamber/map.bin
diff --git a/data/maps/Underwater_SootopolisCity/border.bin b/data/layouts/Underwater_SootopolisCity/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater_SootopolisCity/border.bin
+++ b/data/layouts/Underwater_SootopolisCity/border.bin
diff --git a/data/layouts/Underwater_SootopolisCity/layout.inc b/data/layouts/Underwater_SootopolisCity/layout.inc
new file mode 100644
index 000000000..4a1b0aa02
--- /dev/null
+++ b/data/layouts/Underwater_SootopolisCity/layout.inc
@@ -0,0 +1,15 @@
+Underwater_SootopolisCity_MapBorder::
+	.incbin "data/layouts/Underwater_SootopolisCity/border.bin"
+
+Underwater_SootopolisCity_MapBlockdata::
+	.incbin "data/layouts/Underwater_SootopolisCity/map.bin"
+
+	.align 2
+Underwater_SootopolisCity_Layout::
+	.4byte 0x14
+	.4byte 0xa
+	.4byte Underwater_SootopolisCity_MapBorder
+	.4byte Underwater_SootopolisCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
+
diff --git a/data/maps/Underwater_SootopolisCity/map.bin b/data/layouts/Underwater_SootopolisCity/map.bin
index 71346ab72..71346ab72 100644
--- a/data/maps/Underwater_SootopolisCity/map.bin
+++ b/data/layouts/Underwater_SootopolisCity/map.bin
diff --git a/data/maps/UnionRoom/border.bin b/data/layouts/UnionRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/UnionRoom/border.bin
+++ b/data/layouts/UnionRoom/border.bin
diff --git a/data/layouts/UnionRoom/layout.inc b/data/layouts/UnionRoom/layout.inc
new file mode 100644
index 000000000..0c2a065a5
--- /dev/null
+++ b/data/layouts/UnionRoom/layout.inc
@@ -0,0 +1,15 @@
+UnionRoom_MapBorder::
+	.incbin "data/layouts/UnionRoom/border.bin"
+
+UnionRoom_MapBlockdata::
+	.incbin "data/layouts/UnionRoom/map.bin"
+
+	.align 2
+UnionRoom_Layout::
+	.4byte 0xf
+	.4byte 0xc
+	.4byte UnionRoom_MapBorder
+	.4byte UnionRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_UnionRoom
+
diff --git a/data/maps/UnionRoom/map.bin b/data/layouts/UnionRoom/map.bin
index cb1b009c3..cb1b009c3 100644
--- a/data/maps/UnionRoom/map.bin
+++ b/data/layouts/UnionRoom/map.bin
diff --git a/data/maps/UnknownMap_08417FC4/border.bin b/data/layouts/UnknownMap_08417FC4/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/UnknownMap_08417FC4/border.bin
+++ b/data/layouts/UnknownMap_08417FC4/border.bin
diff --git a/data/layouts/UnknownMap_08417FC4/layout.inc b/data/layouts/UnknownMap_08417FC4/layout.inc
new file mode 100644
index 000000000..41e954b4e
--- /dev/null
+++ b/data/layouts/UnknownMap_08417FC4/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08417FC4_MapBorder::
+	.incbin "data/layouts/UnknownMap_08417FC4/border.bin"
+
+UnknownMap_08417FC4_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_08417FC4/map.bin"
+
+	.align 2
+UnknownMap_08417FC4_Layout::
+	.4byte 0x50
+	.4byte 0x28
+	.4byte UnknownMap_08417FC4_MapBorder
+	.4byte UnknownMap_08417FC4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_08417FC4/map.bin b/data/layouts/UnknownMap_08417FC4/map.bin
index 17a14a8d5..17a14a8d5 100644
--- a/data/maps/UnknownMap_08417FC4/map.bin
+++ b/data/layouts/UnknownMap_08417FC4/map.bin
diff --git a/data/maps/UnknownMap_08428450/border.bin b/data/layouts/UnknownMap_08428450/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_08428450/border.bin
+++ b/data/layouts/UnknownMap_08428450/border.bin
diff --git a/data/layouts/UnknownMap_08428450/layout.inc b/data/layouts/UnknownMap_08428450/layout.inc
new file mode 100644
index 000000000..f1695ec66
--- /dev/null
+++ b/data/layouts/UnknownMap_08428450/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08428450_MapBorder::
+	.incbin "data/layouts/UnknownMap_08428450/border.bin"
+
+UnknownMap_08428450_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_08428450/map.bin"
+
+	.align 2
+UnknownMap_08428450_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_08428450_MapBorder
+	.4byte UnknownMap_08428450_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
+
diff --git a/data/maps/UnknownMap_08428450/map.bin b/data/layouts/UnknownMap_08428450/map.bin
index ca93fa0e2..ca93fa0e2 100644
--- a/data/maps/UnknownMap_08428450/map.bin
+++ b/data/layouts/UnknownMap_08428450/map.bin
diff --git a/data/maps/UnknownMap_084294C4/border.bin b/data/layouts/UnknownMap_084294C4/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_084294C4/border.bin
+++ b/data/layouts/UnknownMap_084294C4/border.bin
diff --git a/data/layouts/UnknownMap_084294C4/layout.inc b/data/layouts/UnknownMap_084294C4/layout.inc
new file mode 100644
index 000000000..f19bd682d
--- /dev/null
+++ b/data/layouts/UnknownMap_084294C4/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_084294C4_MapBorder::
+	.incbin "data/layouts/UnknownMap_084294C4/border.bin"
+
+UnknownMap_084294C4_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_084294C4/map.bin"
+
+	.align 2
+UnknownMap_084294C4_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_084294C4_MapBorder
+	.4byte UnknownMap_084294C4_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
+
diff --git a/data/maps/UnknownMap_084294C4/map.bin b/data/layouts/UnknownMap_084294C4/map.bin
index 37f05b971..37f05b971 100644
--- a/data/maps/UnknownMap_084294C4/map.bin
+++ b/data/layouts/UnknownMap_084294C4/map.bin
diff --git a/data/maps/UnknownMap_084294E8/border.bin b/data/layouts/UnknownMap_084294E8/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_084294E8/border.bin
+++ b/data/layouts/UnknownMap_084294E8/border.bin
diff --git a/data/layouts/UnknownMap_084294E8/layout.inc b/data/layouts/UnknownMap_084294E8/layout.inc
new file mode 100644
index 000000000..e351524e1
--- /dev/null
+++ b/data/layouts/UnknownMap_084294E8/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_084294E8_MapBorder::
+	.incbin "data/layouts/UnknownMap_084294E8/border.bin"
+
+UnknownMap_084294E8_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_084294E8/map.bin"
+
+	.align 2
+UnknownMap_084294E8_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_084294E8_MapBorder
+	.4byte UnknownMap_084294E8_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
+
diff --git a/data/maps/UnknownMap_084294E8/map.bin b/data/layouts/UnknownMap_084294E8/map.bin
index ca93fa0e2..ca93fa0e2 100644
--- a/data/maps/UnknownMap_084294E8/map.bin
+++ b/data/layouts/UnknownMap_084294E8/map.bin
diff --git a/data/maps/UnknownMap_0843E6C0/border.bin b/data/layouts/UnknownMap_0843E6C0/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_0843E6C0/border.bin
+++ b/data/layouts/UnknownMap_0843E6C0/border.bin
diff --git a/data/layouts/UnknownMap_0843E6C0/layout.inc b/data/layouts/UnknownMap_0843E6C0/layout.inc
new file mode 100644
index 000000000..fd01ddc10
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E6C0/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E6C0_MapBorder::
+	.incbin "data/layouts/UnknownMap_0843E6C0/border.bin"
+
+UnknownMap_0843E6C0_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0843E6C0/map.bin"
+
+	.align 2
+UnknownMap_0843E6C0_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_0843E6C0_MapBorder
+	.4byte UnknownMap_0843E6C0_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0843E6C0/map.bin b/data/layouts/UnknownMap_0843E6C0/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_0843E6C0/map.bin
+++ b/data/layouts/UnknownMap_0843E6C0/map.bin
diff --git a/data/maps/UnknownMap_0843E6E4/border.bin b/data/layouts/UnknownMap_0843E6E4/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_0843E6E4/border.bin
+++ b/data/layouts/UnknownMap_0843E6E4/border.bin
diff --git a/data/layouts/UnknownMap_0843E6E4/layout.inc b/data/layouts/UnknownMap_0843E6E4/layout.inc
new file mode 100644
index 000000000..80ad93127
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E6E4/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E6E4_MapBorder::
+	.incbin "data/layouts/UnknownMap_0843E6E4/border.bin"
+
+UnknownMap_0843E6E4_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0843E6E4/map.bin"
+
+	.align 2
+UnknownMap_0843E6E4_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_0843E6E4_MapBorder
+	.4byte UnknownMap_0843E6E4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0843E6E4/map.bin b/data/layouts/UnknownMap_0843E6E4/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_0843E6E4/map.bin
+++ b/data/layouts/UnknownMap_0843E6E4/map.bin
diff --git a/data/maps/UnknownMap_0843E708/border.bin b/data/layouts/UnknownMap_0843E708/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_0843E708/border.bin
+++ b/data/layouts/UnknownMap_0843E708/border.bin
diff --git a/data/layouts/UnknownMap_0843E708/layout.inc b/data/layouts/UnknownMap_0843E708/layout.inc
new file mode 100644
index 000000000..16d4e400c
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E708/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E708_MapBorder::
+	.incbin "data/layouts/UnknownMap_0843E708/border.bin"
+
+UnknownMap_0843E708_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0843E708/map.bin"
+
+	.align 2
+UnknownMap_0843E708_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_0843E708_MapBorder
+	.4byte UnknownMap_0843E708_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0843E708/map.bin b/data/layouts/UnknownMap_0843E708/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_0843E708/map.bin
+++ b/data/layouts/UnknownMap_0843E708/map.bin
diff --git a/data/maps/UnknownMap_0843E72C/border.bin b/data/layouts/UnknownMap_0843E72C/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_0843E72C/border.bin
+++ b/data/layouts/UnknownMap_0843E72C/border.bin
diff --git a/data/layouts/UnknownMap_0843E72C/layout.inc b/data/layouts/UnknownMap_0843E72C/layout.inc
new file mode 100644
index 000000000..c6541b3ea
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E72C/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E72C_MapBorder::
+	.incbin "data/layouts/UnknownMap_0843E72C/border.bin"
+
+UnknownMap_0843E72C_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0843E72C/map.bin"
+
+	.align 2
+UnknownMap_0843E72C_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_0843E72C_MapBorder
+	.4byte UnknownMap_0843E72C_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0843E72C/map.bin b/data/layouts/UnknownMap_0843E72C/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_0843E72C/map.bin
+++ b/data/layouts/UnknownMap_0843E72C/map.bin
diff --git a/data/maps/UnknownMap_0843E750/border.bin b/data/layouts/UnknownMap_0843E750/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_0843E750/border.bin
+++ b/data/layouts/UnknownMap_0843E750/border.bin
diff --git a/data/layouts/UnknownMap_0843E750/layout.inc b/data/layouts/UnknownMap_0843E750/layout.inc
new file mode 100644
index 000000000..e566a93b7
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E750/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E750_MapBorder::
+	.incbin "data/layouts/UnknownMap_0843E750/border.bin"
+
+UnknownMap_0843E750_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0843E750/map.bin"
+
+	.align 2
+UnknownMap_0843E750_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_0843E750_MapBorder
+	.4byte UnknownMap_0843E750_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0843E750/map.bin b/data/layouts/UnknownMap_0843E750/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_0843E750/map.bin
+++ b/data/layouts/UnknownMap_0843E750/map.bin
diff --git a/data/maps/UnknownMap_0843E774/border.bin b/data/layouts/UnknownMap_0843E774/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_0843E774/border.bin
+++ b/data/layouts/UnknownMap_0843E774/border.bin
diff --git a/data/layouts/UnknownMap_0843E774/layout.inc b/data/layouts/UnknownMap_0843E774/layout.inc
new file mode 100644
index 000000000..ce1a438eb
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E774/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E774_MapBorder::
+	.incbin "data/layouts/UnknownMap_0843E774/border.bin"
+
+UnknownMap_0843E774_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0843E774/map.bin"
+
+	.align 2
+UnknownMap_0843E774_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_0843E774_MapBorder
+	.4byte UnknownMap_0843E774_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0843E774/map.bin b/data/layouts/UnknownMap_0843E774/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_0843E774/map.bin
+++ b/data/layouts/UnknownMap_0843E774/map.bin
diff --git a/data/maps/UnknownMap_0843E798/border.bin b/data/layouts/UnknownMap_0843E798/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_0843E798/border.bin
+++ b/data/layouts/UnknownMap_0843E798/border.bin
diff --git a/data/layouts/UnknownMap_0843E798/layout.inc b/data/layouts/UnknownMap_0843E798/layout.inc
new file mode 100644
index 000000000..179e0d881
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E798/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E798_MapBorder::
+	.incbin "data/layouts/UnknownMap_0843E798/border.bin"
+
+UnknownMap_0843E798_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0843E798/map.bin"
+
+	.align 2
+UnknownMap_0843E798_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_0843E798_MapBorder
+	.4byte UnknownMap_0843E798_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0843E798/map.bin b/data/layouts/UnknownMap_0843E798/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_0843E798/map.bin
+++ b/data/layouts/UnknownMap_0843E798/map.bin
diff --git a/data/maps/UnknownMap_0843E7BC/border.bin b/data/layouts/UnknownMap_0843E7BC/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_0843E7BC/border.bin
+++ b/data/layouts/UnknownMap_0843E7BC/border.bin
diff --git a/data/layouts/UnknownMap_0843E7BC/layout.inc b/data/layouts/UnknownMap_0843E7BC/layout.inc
new file mode 100644
index 000000000..907ec6266
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E7BC/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E7BC_MapBorder::
+	.incbin "data/layouts/UnknownMap_0843E7BC/border.bin"
+
+UnknownMap_0843E7BC_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0843E7BC/map.bin"
+
+	.align 2
+UnknownMap_0843E7BC_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_0843E7BC_MapBorder
+	.4byte UnknownMap_0843E7BC_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0843E7BC/map.bin b/data/layouts/UnknownMap_0843E7BC/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_0843E7BC/map.bin
+++ b/data/layouts/UnknownMap_0843E7BC/map.bin
diff --git a/data/maps/UnknownMap_0843E7E0/border.bin b/data/layouts/UnknownMap_0843E7E0/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_0843E7E0/border.bin
+++ b/data/layouts/UnknownMap_0843E7E0/border.bin
diff --git a/data/layouts/UnknownMap_0843E7E0/layout.inc b/data/layouts/UnknownMap_0843E7E0/layout.inc
new file mode 100644
index 000000000..c56046ef1
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E7E0/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E7E0_MapBorder::
+	.incbin "data/layouts/UnknownMap_0843E7E0/border.bin"
+
+UnknownMap_0843E7E0_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0843E7E0/map.bin"
+
+	.align 2
+UnknownMap_0843E7E0_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_0843E7E0_MapBorder
+	.4byte UnknownMap_0843E7E0_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0843E7E0/map.bin b/data/layouts/UnknownMap_0843E7E0/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_0843E7E0/map.bin
+++ b/data/layouts/UnknownMap_0843E7E0/map.bin
diff --git a/data/maps/UnknownMap_0843E804/border.bin b/data/layouts/UnknownMap_0843E804/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_0843E804/border.bin
+++ b/data/layouts/UnknownMap_0843E804/border.bin
diff --git a/data/layouts/UnknownMap_0843E804/layout.inc b/data/layouts/UnknownMap_0843E804/layout.inc
new file mode 100644
index 000000000..49e32dbc7
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E804/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E804_MapBorder::
+	.incbin "data/layouts/UnknownMap_0843E804/border.bin"
+
+UnknownMap_0843E804_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0843E804/map.bin"
+
+	.align 2
+UnknownMap_0843E804_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_0843E804_MapBorder
+	.4byte UnknownMap_0843E804_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0843E804/map.bin b/data/layouts/UnknownMap_0843E804/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_0843E804/map.bin
+++ b/data/layouts/UnknownMap_0843E804/map.bin
diff --git a/data/maps/UnknownMap_0843E828/border.bin b/data/layouts/UnknownMap_0843E828/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_0843E828/border.bin
+++ b/data/layouts/UnknownMap_0843E828/border.bin
diff --git a/data/layouts/UnknownMap_0843E828/layout.inc b/data/layouts/UnknownMap_0843E828/layout.inc
new file mode 100644
index 000000000..3cbe67299
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E828/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E828_MapBorder::
+	.incbin "data/layouts/UnknownMap_0843E828/border.bin"
+
+UnknownMap_0843E828_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0843E828/map.bin"
+
+	.align 2
+UnknownMap_0843E828_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_0843E828_MapBorder
+	.4byte UnknownMap_0843E828_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0843E828/map.bin b/data/layouts/UnknownMap_0843E828/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_0843E828/map.bin
+++ b/data/layouts/UnknownMap_0843E828/map.bin
diff --git a/data/maps/UnknownMap_0843E84C/border.bin b/data/layouts/UnknownMap_0843E84C/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_0843E84C/border.bin
+++ b/data/layouts/UnknownMap_0843E84C/border.bin
diff --git a/data/layouts/UnknownMap_0843E84C/layout.inc b/data/layouts/UnknownMap_0843E84C/layout.inc
new file mode 100644
index 000000000..7449536bf
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E84C/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E84C_MapBorder::
+	.incbin "data/layouts/UnknownMap_0843E84C/border.bin"
+
+UnknownMap_0843E84C_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0843E84C/map.bin"
+
+	.align 2
+UnknownMap_0843E84C_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_0843E84C_MapBorder
+	.4byte UnknownMap_0843E84C_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0843E84C/map.bin b/data/layouts/UnknownMap_0843E84C/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_0843E84C/map.bin
+++ b/data/layouts/UnknownMap_0843E84C/map.bin
diff --git a/data/maps/UnknownMap_0843E870/border.bin b/data/layouts/UnknownMap_0843E870/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_0843E870/border.bin
+++ b/data/layouts/UnknownMap_0843E870/border.bin
diff --git a/data/layouts/UnknownMap_0843E870/layout.inc b/data/layouts/UnknownMap_0843E870/layout.inc
new file mode 100644
index 000000000..23880a79c
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E870/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E870_MapBorder::
+	.incbin "data/layouts/UnknownMap_0843E870/border.bin"
+
+UnknownMap_0843E870_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0843E870/map.bin"
+
+	.align 2
+UnknownMap_0843E870_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_0843E870_MapBorder
+	.4byte UnknownMap_0843E870_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0843E870/map.bin b/data/layouts/UnknownMap_0843E870/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_0843E870/map.bin
+++ b/data/layouts/UnknownMap_0843E870/map.bin
diff --git a/data/maps/UnknownMap_0843E894/border.bin b/data/layouts/UnknownMap_0843E894/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_0843E894/border.bin
+++ b/data/layouts/UnknownMap_0843E894/border.bin
diff --git a/data/layouts/UnknownMap_0843E894/layout.inc b/data/layouts/UnknownMap_0843E894/layout.inc
new file mode 100755
index 000000000..e42bfcdd9
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E894/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E894_MapBorder::
+	.incbin "data/layouts/UnknownMap_0843E894/border.bin"
+
+UnknownMap_0843E894_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0843E894/map.bin"
+
+	.align 2
+UnknownMap_0843E894_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_0843E894_MapBorder
+	.4byte UnknownMap_0843E894_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0843E894/map.bin b/data/layouts/UnknownMap_0843E894/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_0843E894/map.bin
+++ b/data/layouts/UnknownMap_0843E894/map.bin
diff --git a/data/maps/UnknownMap_08447028/border.bin b/data/layouts/UnknownMap_08447028/border.bin
index 9e4b3fb7a..9e4b3fb7a 100644
--- a/data/maps/UnknownMap_08447028/border.bin
+++ b/data/layouts/UnknownMap_08447028/border.bin
diff --git a/data/layouts/UnknownMap_08447028/layout.inc b/data/layouts/UnknownMap_08447028/layout.inc
new file mode 100644
index 000000000..39d7bb18a
--- /dev/null
+++ b/data/layouts/UnknownMap_08447028/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08447028_MapBorder::
+	.incbin "data/layouts/UnknownMap_08447028/border.bin"
+
+UnknownMap_08447028_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_08447028/map.bin"
+
+	.align 2
+UnknownMap_08447028_Layout::
+	.4byte 0x3A
+	.4byte 0x1A
+	.4byte UnknownMap_08447028_MapBorder
+	.4byte UnknownMap_08447028_MapBlockdata
+	.4byte gTileset_General
+	.4byte 0
+
diff --git a/data/maps/UnknownMap_08447028/map.bin b/data/layouts/UnknownMap_08447028/map.bin
index 028da0526..028da0526 100644
--- a/data/maps/UnknownMap_08447028/map.bin
+++ b/data/layouts/UnknownMap_08447028/map.bin
diff --git a/data/maps/UnknownMap_0845A394/border.bin b/data/layouts/UnknownMap_0845A394/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/UnknownMap_0845A394/border.bin
+++ b/data/layouts/UnknownMap_0845A394/border.bin
diff --git a/data/layouts/UnknownMap_0845A394/layout.inc b/data/layouts/UnknownMap_0845A394/layout.inc
new file mode 100644
index 000000000..a180340f8
--- /dev/null
+++ b/data/layouts/UnknownMap_0845A394/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0845A394_MapBorder::
+	.incbin "data/layouts/UnknownMap_0845A394/border.bin"
+
+UnknownMap_0845A394_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0845A394/map.bin"
+
+	.align 2
+UnknownMap_0845A394_Layout::
+	.4byte 0x13
+	.4byte 0x13
+	.4byte UnknownMap_0845A394_MapBorder
+	.4byte UnknownMap_0845A394_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0845A394/map.bin b/data/layouts/UnknownMap_0845A394/map.bin
index fd294d9b6..fd294d9b6 100644
--- a/data/maps/UnknownMap_0845A394/map.bin
+++ b/data/layouts/UnknownMap_0845A394/map.bin
diff --git a/data/maps/UnknownMap_0845D470/border.bin b/data/layouts/UnknownMap_0845D470/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/UnknownMap_0845D470/border.bin
+++ b/data/layouts/UnknownMap_0845D470/border.bin
diff --git a/data/layouts/UnknownMap_0845D470/layout.inc b/data/layouts/UnknownMap_0845D470/layout.inc
new file mode 100644
index 000000000..ce6a4c819
--- /dev/null
+++ b/data/layouts/UnknownMap_0845D470/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0845D470_MapBorder::
+	.incbin "data/layouts/UnknownMap_0845D470/border.bin"
+
+UnknownMap_0845D470_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0845D470/map.bin"
+
+	.align 2
+UnknownMap_0845D470_Layout::
+	.4byte 0x3C
+	.4byte 0x28
+	.4byte UnknownMap_0845D470_MapBorder
+	.4byte UnknownMap_0845D470_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/UnknownMap_0845D470/map.bin b/data/layouts/UnknownMap_0845D470/map.bin
index cd136de41..cd136de41 100644
--- a/data/maps/UnknownMap_0845D470/map.bin
+++ b/data/layouts/UnknownMap_0845D470/map.bin
diff --git a/data/maps/UnknownMap_0845ECB4/border.bin b/data/layouts/UnknownMap_0845ECB4/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/UnknownMap_0845ECB4/border.bin
+++ b/data/layouts/UnknownMap_0845ECB4/border.bin
diff --git a/data/layouts/UnknownMap_0845ECB4/layout.inc b/data/layouts/UnknownMap_0845ECB4/layout.inc
new file mode 100644
index 000000000..535c4a6e9
--- /dev/null
+++ b/data/layouts/UnknownMap_0845ECB4/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0845ECB4_MapBorder::
+	.incbin "data/layouts/UnknownMap_0845ECB4/border.bin"
+
+UnknownMap_0845ECB4_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0845ECB4/map.bin"
+
+	.align 2
+UnknownMap_0845ECB4_Layout::
+	.4byte 0x1B
+	.4byte 0x2E
+	.4byte UnknownMap_0845ECB4_MapBorder
+	.4byte UnknownMap_0845ECB4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/UnknownMap_0845ECB4/map.bin b/data/layouts/UnknownMap_0845ECB4/map.bin
index ec344933f..ec344933f 100644
--- a/data/maps/UnknownMap_0845ECB4/map.bin
+++ b/data/layouts/UnknownMap_0845ECB4/map.bin
diff --git a/data/maps/UnknownMap_08469200/border.bin b/data/layouts/UnknownMap_08469200/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/maps/UnknownMap_08469200/border.bin
+++ b/data/layouts/UnknownMap_08469200/border.bin
diff --git a/data/layouts/UnknownMap_08469200/layout.inc b/data/layouts/UnknownMap_08469200/layout.inc
new file mode 100644
index 000000000..22191c61c
--- /dev/null
+++ b/data/layouts/UnknownMap_08469200/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08469200_MapBorder::
+	.incbin "data/layouts/UnknownMap_08469200/border.bin"
+
+UnknownMap_08469200_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_08469200/map.bin"
+
+	.align 2
+UnknownMap_08469200_Layout::
+	.4byte 0x3C
+	.4byte 0x3C
+	.4byte UnknownMap_08469200_MapBorder
+	.4byte UnknownMap_08469200_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Sootopolis
+
diff --git a/data/maps/UnknownMap_08469200/map.bin b/data/layouts/UnknownMap_08469200/map.bin
index 67085fd37..67085fd37 100644
--- a/data/maps/UnknownMap_08469200/map.bin
+++ b/data/layouts/UnknownMap_08469200/map.bin
diff --git a/data/maps/UnknownMap_084693AC/border.bin b/data/layouts/UnknownMap_084693AC/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/UnknownMap_084693AC/border.bin
+++ b/data/layouts/UnknownMap_084693AC/border.bin
diff --git a/data/layouts/UnknownMap_084693AC/layout.inc b/data/layouts/UnknownMap_084693AC/layout.inc
new file mode 100644
index 000000000..0106c666a
--- /dev/null
+++ b/data/layouts/UnknownMap_084693AC/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_084693AC_MapBorder::
+	.incbin "data/layouts/UnknownMap_084693AC/border.bin"
+
+UnknownMap_084693AC_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_084693AC/map.bin"
+
+	.align 2
+UnknownMap_084693AC_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_084693AC_MapBorder
+	.4byte UnknownMap_084693AC_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattlePike
+
diff --git a/data/maps/UnknownMap_084693AC/map.bin b/data/layouts/UnknownMap_084693AC/map.bin
index a179d8997..a179d8997 100644
--- a/data/maps/UnknownMap_084693AC/map.bin
+++ b/data/layouts/UnknownMap_084693AC/map.bin
diff --git a/data/maps/UnknownMap_08470BD8/border.bin b/data/layouts/UnknownMap_08470BD8/border.bin
index 4531975c7..4531975c7 100644
--- a/data/maps/UnknownMap_08470BD8/border.bin
+++ b/data/layouts/UnknownMap_08470BD8/border.bin
diff --git a/data/layouts/UnknownMap_08470BD8/layout.inc b/data/layouts/UnknownMap_08470BD8/layout.inc
new file mode 100644
index 000000000..671127587
--- /dev/null
+++ b/data/layouts/UnknownMap_08470BD8/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08470BD8_MapBorder::
+	.incbin "data/layouts/UnknownMap_08470BD8/border.bin"
+
+UnknownMap_08470BD8_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_08470BD8/map.bin"
+
+	.align 2
+UnknownMap_08470BD8_Layout::
+	.4byte 0x28
+	.4byte 0x8C
+	.4byte UnknownMap_08470BD8_MapBorder
+	.4byte UnknownMap_08470BD8_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
+
diff --git a/data/maps/UnknownMap_08470BD8/map.bin b/data/layouts/UnknownMap_08470BD8/map.bin
index 0f7bbb958..0f7bbb958 100644
--- a/data/maps/UnknownMap_08470BD8/map.bin
+++ b/data/layouts/UnknownMap_08470BD8/map.bin
diff --git a/data/maps/UnknownMap_08480DAC/border.bin b/data/layouts/UnknownMap_08480DAC/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_08480DAC/border.bin
+++ b/data/layouts/UnknownMap_08480DAC/border.bin
diff --git a/data/layouts/UnknownMap_08480DAC/layout.inc b/data/layouts/UnknownMap_08480DAC/layout.inc
new file mode 100644
index 000000000..b44036239
--- /dev/null
+++ b/data/layouts/UnknownMap_08480DAC/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08480DAC_MapBorder::
+	.incbin "data/layouts/UnknownMap_08480DAC/border.bin"
+
+UnknownMap_08480DAC_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_08480DAC/map.bin"
+
+	.align 2
+UnknownMap_08480DAC_Layout::
+	.4byte 0xD
+	.4byte 0xD
+	.4byte UnknownMap_08480DAC_MapBorder
+	.4byte UnknownMap_08480DAC_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
+
diff --git a/data/maps/UnknownMap_08480DAC/map.bin b/data/layouts/UnknownMap_08480DAC/map.bin
index d1277f280..d1277f280 100644
--- a/data/maps/UnknownMap_08480DAC/map.bin
+++ b/data/layouts/UnknownMap_08480DAC/map.bin
diff --git a/data/maps/UnknownMap_08480F54/border.bin b/data/layouts/UnknownMap_08480F54/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_08480F54/border.bin
+++ b/data/layouts/UnknownMap_08480F54/border.bin
diff --git a/data/layouts/UnknownMap_08480F54/layout.inc b/data/layouts/UnknownMap_08480F54/layout.inc
new file mode 100644
index 000000000..4593a8ba4
--- /dev/null
+++ b/data/layouts/UnknownMap_08480F54/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08480F54_MapBorder::
+	.incbin "data/layouts/UnknownMap_08480F54/border.bin"
+
+UnknownMap_08480F54_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_08480F54/map.bin"
+
+	.align 2
+UnknownMap_08480F54_Layout::
+	.4byte 0xE
+	.4byte 0xE
+	.4byte UnknownMap_08480F54_MapBorder
+	.4byte UnknownMap_08480F54_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/UnknownMap_08480F54/map.bin b/data/layouts/UnknownMap_08480F54/map.bin
index f0d9c299c..f0d9c299c 100644
--- a/data/maps/UnknownMap_08480F54/map.bin
+++ b/data/layouts/UnknownMap_08480F54/map.bin
diff --git a/data/maps/UnknownMap_084810FC/border.bin b/data/layouts/UnknownMap_084810FC/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_084810FC/border.bin
+++ b/data/layouts/UnknownMap_084810FC/border.bin
diff --git a/data/layouts/UnknownMap_084810FC/layout.inc b/data/layouts/UnknownMap_084810FC/layout.inc
new file mode 100644
index 000000000..6b73bfdce
--- /dev/null
+++ b/data/layouts/UnknownMap_084810FC/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_084810FC_MapBorder::
+	.incbin "data/layouts/UnknownMap_084810FC/border.bin"
+
+UnknownMap_084810FC_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_084810FC/map.bin"
+
+	.align 2
+UnknownMap_084810FC_Layout::
+	.4byte 0xE
+	.4byte 0xE
+	.4byte UnknownMap_084810FC_MapBorder
+	.4byte UnknownMap_084810FC_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/UnknownMap_084810FC/map.bin b/data/layouts/UnknownMap_084810FC/map.bin
index 908158cf4..908158cf4 100644
--- a/data/maps/UnknownMap_084810FC/map.bin
+++ b/data/layouts/UnknownMap_084810FC/map.bin
diff --git a/data/maps/UnknownMap_084812A4/border.bin b/data/layouts/UnknownMap_084812A4/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_084812A4/border.bin
+++ b/data/layouts/UnknownMap_084812A4/border.bin
diff --git a/data/layouts/UnknownMap_084812A4/layout.inc b/data/layouts/UnknownMap_084812A4/layout.inc
new file mode 100644
index 000000000..a394c8ef3
--- /dev/null
+++ b/data/layouts/UnknownMap_084812A4/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_084812A4_MapBorder::
+	.incbin "data/layouts/UnknownMap_084812A4/border.bin"
+
+UnknownMap_084812A4_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_084812A4/map.bin"
+
+	.align 2
+UnknownMap_084812A4_Layout::
+	.4byte 0xE
+	.4byte 0xE
+	.4byte UnknownMap_084812A4_MapBorder
+	.4byte UnknownMap_084812A4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/UnknownMap_084812A4/map.bin b/data/layouts/UnknownMap_084812A4/map.bin
index d033bc4d2..d033bc4d2 100644
--- a/data/maps/UnknownMap_084812A4/map.bin
+++ b/data/layouts/UnknownMap_084812A4/map.bin
diff --git a/data/maps/UnknownMap_0848144C/border.bin b/data/layouts/UnknownMap_0848144C/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_0848144C/border.bin
+++ b/data/layouts/UnknownMap_0848144C/border.bin
diff --git a/data/layouts/UnknownMap_0848144C/layout.inc b/data/layouts/UnknownMap_0848144C/layout.inc
new file mode 100644
index 000000000..cabe0b25b
--- /dev/null
+++ b/data/layouts/UnknownMap_0848144C/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0848144C_MapBorder::
+	.incbin "data/layouts/UnknownMap_0848144C/border.bin"
+
+UnknownMap_0848144C_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_0848144C/map.bin"
+
+	.align 2
+UnknownMap_0848144C_Layout::
+	.4byte 0xE
+	.4byte 0xE
+	.4byte UnknownMap_0848144C_MapBorder
+	.4byte UnknownMap_0848144C_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/UnknownMap_0848144C/map.bin b/data/layouts/UnknownMap_0848144C/map.bin
index eeccae9ae..eeccae9ae 100644
--- a/data/maps/UnknownMap_0848144C/map.bin
+++ b/data/layouts/UnknownMap_0848144C/map.bin
diff --git a/data/maps/UnknownMap_084815F4/border.bin b/data/layouts/UnknownMap_084815F4/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_084815F4/border.bin
+++ b/data/layouts/UnknownMap_084815F4/border.bin
diff --git a/data/layouts/UnknownMap_084815F4/layout.inc b/data/layouts/UnknownMap_084815F4/layout.inc
new file mode 100644
index 000000000..73ed49c79
--- /dev/null
+++ b/data/layouts/UnknownMap_084815F4/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_084815F4_MapBorder::
+	.incbin "data/layouts/UnknownMap_084815F4/border.bin"
+
+UnknownMap_084815F4_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_084815F4/map.bin"
+
+	.align 2
+UnknownMap_084815F4_Layout::
+	.4byte 0xE
+	.4byte 0xE
+	.4byte UnknownMap_084815F4_MapBorder
+	.4byte UnknownMap_084815F4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/UnknownMap_084815F4/map.bin b/data/layouts/UnknownMap_084815F4/map.bin
index 8507a4932..8507a4932 100644
--- a/data/maps/UnknownMap_084815F4/map.bin
+++ b/data/layouts/UnknownMap_084815F4/map.bin
diff --git a/data/maps/UnknownMap_08481B24/border.bin b/data/layouts/UnknownMap_08481B24/border.bin
index e9d1c658c..e9d1c658c 100644
--- a/data/maps/UnknownMap_08481B24/border.bin
+++ b/data/layouts/UnknownMap_08481B24/border.bin
diff --git a/data/layouts/UnknownMap_08481B24/layout.inc b/data/layouts/UnknownMap_08481B24/layout.inc
new file mode 100644
index 000000000..250528be0
--- /dev/null
+++ b/data/layouts/UnknownMap_08481B24/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08481B24_MapBorder::
+	.incbin "data/layouts/UnknownMap_08481B24/border.bin"
+
+UnknownMap_08481B24_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_08481B24/map.bin"
+
+	.align 2
+UnknownMap_08481B24_Layout::
+	.4byte 0x1B
+	.4byte 0x18
+	.4byte UnknownMap_08481B24_MapBorder
+	.4byte UnknownMap_08481B24_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
+
diff --git a/data/maps/UnknownMap_08481B24/map.bin b/data/layouts/UnknownMap_08481B24/map.bin
index 2a47bca91..2a47bca91 100644
--- a/data/maps/UnknownMap_08481B24/map.bin
+++ b/data/layouts/UnknownMap_08481B24/map.bin
diff --git a/data/maps/UnknownMap_08481DBC/border.bin b/data/layouts/UnknownMap_08481DBC/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/UnknownMap_08481DBC/border.bin
+++ b/data/layouts/UnknownMap_08481DBC/border.bin
diff --git a/data/layouts/UnknownMap_08481DBC/layout.inc b/data/layouts/UnknownMap_08481DBC/layout.inc
new file mode 100644
index 000000000..465b92dc8
--- /dev/null
+++ b/data/layouts/UnknownMap_08481DBC/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08481DBC_MapBorder::
+	.incbin "data/layouts/UnknownMap_08481DBC/border.bin"
+
+UnknownMap_08481DBC_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_08481DBC/map.bin"
+
+	.align 2
+UnknownMap_08481DBC_Layout::
+	.4byte 0xB
+	.4byte 0x8
+	.4byte UnknownMap_08481DBC_MapBorder
+	.4byte UnknownMap_08481DBC_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_MysteryEventsHouse
+
diff --git a/data/maps/UnknownMap_08481DBC/map.bin b/data/layouts/UnknownMap_08481DBC/map.bin
index 603f55c93..603f55c93 100644
--- a/data/maps/UnknownMap_08481DBC/map.bin
+++ b/data/layouts/UnknownMap_08481DBC/map.bin
diff --git a/data/maps/UnknownMap_25_29/border.bin b/data/layouts/UnknownMap_25_29/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_29/border.bin
+++ b/data/layouts/UnknownMap_25_29/border.bin
diff --git a/data/layouts/UnknownMap_25_29/layout.inc b/data/layouts/UnknownMap_25_29/layout.inc
new file mode 100644
index 000000000..bb7002a20
--- /dev/null
+++ b/data/layouts/UnknownMap_25_29/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_29_MapBorder::
+	.incbin "data/layouts/UnknownMap_25_29/border.bin"
+
+UnknownMap_25_29_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_25_29/map.bin"
+
+	.align 2
+UnknownMap_25_29_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_29_MapBorder
+	.4byte UnknownMap_25_29_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
+
diff --git a/data/maps/UnknownMap_25_29/map.bin b/data/layouts/UnknownMap_25_29/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_29/map.bin
+++ b/data/layouts/UnknownMap_25_29/map.bin
diff --git a/data/maps/UnknownMap_25_30/border.bin b/data/layouts/UnknownMap_25_30/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_30/border.bin
+++ b/data/layouts/UnknownMap_25_30/border.bin
diff --git a/data/layouts/UnknownMap_25_30/layout.inc b/data/layouts/UnknownMap_25_30/layout.inc
new file mode 100644
index 000000000..5937a2195
--- /dev/null
+++ b/data/layouts/UnknownMap_25_30/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_30_MapBorder::
+	.incbin "data/layouts/UnknownMap_25_30/border.bin"
+
+UnknownMap_25_30_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_25_30/map.bin"
+
+	.align 2
+UnknownMap_25_30_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_30_MapBorder
+	.4byte UnknownMap_25_30_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
+
diff --git a/data/maps/UnknownMap_25_30/map.bin b/data/layouts/UnknownMap_25_30/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_30/map.bin
+++ b/data/layouts/UnknownMap_25_30/map.bin
diff --git a/data/maps/UnknownMap_25_31/border.bin b/data/layouts/UnknownMap_25_31/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_31/border.bin
+++ b/data/layouts/UnknownMap_25_31/border.bin
diff --git a/data/layouts/UnknownMap_25_31/layout.inc b/data/layouts/UnknownMap_25_31/layout.inc
new file mode 100644
index 000000000..3dcbc7986
--- /dev/null
+++ b/data/layouts/UnknownMap_25_31/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_31_MapBorder::
+	.incbin "data/layouts/UnknownMap_25_31/border.bin"
+
+UnknownMap_25_31_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_25_31/map.bin"
+
+	.align 2
+UnknownMap_25_31_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_31_MapBorder
+	.4byte UnknownMap_25_31_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
+
diff --git a/data/maps/UnknownMap_25_31/map.bin b/data/layouts/UnknownMap_25_31/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_31/map.bin
+++ b/data/layouts/UnknownMap_25_31/map.bin
diff --git a/data/maps/UnknownMap_25_32/border.bin b/data/layouts/UnknownMap_25_32/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_32/border.bin
+++ b/data/layouts/UnknownMap_25_32/border.bin
diff --git a/data/layouts/UnknownMap_25_32/layout.inc b/data/layouts/UnknownMap_25_32/layout.inc
new file mode 100644
index 000000000..0ffe4c0b7
--- /dev/null
+++ b/data/layouts/UnknownMap_25_32/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_32_MapBorder::
+	.incbin "data/layouts/UnknownMap_25_32/border.bin"
+
+UnknownMap_25_32_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_25_32/map.bin"
+
+	.align 2
+UnknownMap_25_32_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_32_MapBorder
+	.4byte UnknownMap_25_32_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
+
diff --git a/data/maps/UnknownMap_25_32/map.bin b/data/layouts/UnknownMap_25_32/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_32/map.bin
+++ b/data/layouts/UnknownMap_25_32/map.bin
diff --git a/data/maps/UnknownMap_25_33/border.bin b/data/layouts/UnknownMap_25_33/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_33/border.bin
+++ b/data/layouts/UnknownMap_25_33/border.bin
diff --git a/data/layouts/UnknownMap_25_33/layout.inc b/data/layouts/UnknownMap_25_33/layout.inc
new file mode 100644
index 000000000..3f8113a6f
--- /dev/null
+++ b/data/layouts/UnknownMap_25_33/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_33_MapBorder::
+	.incbin "data/layouts/UnknownMap_25_33/border.bin"
+
+UnknownMap_25_33_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_25_33/map.bin"
+
+	.align 2
+UnknownMap_25_33_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_33_MapBorder
+	.4byte UnknownMap_25_33_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
+
diff --git a/data/maps/UnknownMap_25_33/map.bin b/data/layouts/UnknownMap_25_33/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_33/map.bin
+++ b/data/layouts/UnknownMap_25_33/map.bin
diff --git a/data/maps/UnknownMap_25_34/border.bin b/data/layouts/UnknownMap_25_34/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_34/border.bin
+++ b/data/layouts/UnknownMap_25_34/border.bin
diff --git a/data/layouts/UnknownMap_25_34/layout.inc b/data/layouts/UnknownMap_25_34/layout.inc
new file mode 100644
index 000000000..6001d8fe7
--- /dev/null
+++ b/data/layouts/UnknownMap_25_34/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_34_MapBorder::
+	.incbin "data/layouts/UnknownMap_25_34/border.bin"
+
+UnknownMap_25_34_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_25_34/map.bin"
+
+	.align 2
+UnknownMap_25_34_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_34_MapBorder
+	.4byte UnknownMap_25_34_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
+
diff --git a/data/maps/UnknownMap_25_34/map.bin b/data/layouts/UnknownMap_25_34/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_34/map.bin
+++ b/data/layouts/UnknownMap_25_34/map.bin
diff --git a/data/maps/VerdanturfTown/border.bin b/data/layouts/VerdanturfTown/border.bin
index 864ac15fa..864ac15fa 100644
--- a/data/maps/VerdanturfTown/border.bin
+++ b/data/layouts/VerdanturfTown/border.bin
diff --git a/data/layouts/VerdanturfTown/layout.inc b/data/layouts/VerdanturfTown/layout.inc
new file mode 100644
index 000000000..ce58c0798
--- /dev/null
+++ b/data/layouts/VerdanturfTown/layout.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_MapBorder::
+	.incbin "data/layouts/VerdanturfTown/border.bin"
+
+VerdanturfTown_MapBlockdata::
+	.incbin "data/layouts/VerdanturfTown/map.bin"
+
+	.align 2
+VerdanturfTown_Layout::
+	.4byte 0x14
+	.4byte 0x14
+	.4byte VerdanturfTown_MapBorder
+	.4byte VerdanturfTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
+
diff --git a/data/maps/VerdanturfTown/map.bin b/data/layouts/VerdanturfTown/map.bin
index 8ed6ea56b..8ed6ea56b 100644
--- a/data/maps/VerdanturfTown/map.bin
+++ b/data/layouts/VerdanturfTown/map.bin
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin b/data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin
index 9afd13cdc..9afd13cdc 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin
+++ b/data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin
diff --git a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc
new file mode 100644
index 000000000..21fca6953
--- /dev/null
+++ b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_BattleTentBattleRoom_MapBorder::
+	.incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin"
+
+VerdanturfTown_BattleTentBattleRoom_MapBlockdata::
+	.incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin"
+
+	.align 2
+VerdanturfTown_BattleTentBattleRoom_Layout::
+	.4byte 0xd
+	.4byte 0x9
+	.4byte VerdanturfTown_BattleTentBattleRoom_MapBorder
+	.4byte VerdanturfTown_BattleTentBattleRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_BattleTent
+
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin b/data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin
index c405aabfc..c405aabfc 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin
+++ b/data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin
diff --git a/data/maps/VerdanturfTown_WandasHouse/border.bin b/data/layouts/VerdanturfTown_WandasHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/VerdanturfTown_WandasHouse/border.bin
+++ b/data/layouts/VerdanturfTown_WandasHouse/border.bin
diff --git a/data/layouts/VerdanturfTown_WandasHouse/layout.inc b/data/layouts/VerdanturfTown_WandasHouse/layout.inc
new file mode 100644
index 000000000..ae5d1a7cf
--- /dev/null
+++ b/data/layouts/VerdanturfTown_WandasHouse/layout.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_WandasHouse_MapBorder::
+	.incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin"
+
+VerdanturfTown_WandasHouse_MapBlockdata::
+	.incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin"
+
+	.align 2
+VerdanturfTown_WandasHouse_Layout::
+	.4byte 0x11
+	.4byte 0x8
+	.4byte VerdanturfTown_WandasHouse_MapBorder
+	.4byte VerdanturfTown_WandasHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
diff --git a/data/maps/VerdanturfTown_WandasHouse/map.bin b/data/layouts/VerdanturfTown_WandasHouse/map.bin
index 95d14d3c4..95d14d3c4 100644
--- a/data/maps/VerdanturfTown_WandasHouse/map.bin
+++ b/data/layouts/VerdanturfTown_WandasHouse/map.bin
diff --git a/data/maps/VictoryRoad_1F/border.bin b/data/layouts/VictoryRoad_1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/VictoryRoad_1F/border.bin
+++ b/data/layouts/VictoryRoad_1F/border.bin
diff --git a/data/layouts/VictoryRoad_1F/layout.inc b/data/layouts/VictoryRoad_1F/layout.inc
new file mode 100644
index 000000000..31e0fede3
--- /dev/null
+++ b/data/layouts/VictoryRoad_1F/layout.inc
@@ -0,0 +1,15 @@
+VictoryRoad_1F_MapBorder::
+	.incbin "data/layouts/VictoryRoad_1F/border.bin"
+
+VictoryRoad_1F_MapBlockdata::
+	.incbin "data/layouts/VictoryRoad_1F/map.bin"
+
+	.align 2
+VictoryRoad_1F_Layout::
+	.4byte 0x2e
+	.4byte 0x2d
+	.4byte VictoryRoad_1F_MapBorder
+	.4byte VictoryRoad_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/VictoryRoad_1F/map.bin b/data/layouts/VictoryRoad_1F/map.bin
index a78316ef9..a78316ef9 100644
--- a/data/maps/VictoryRoad_1F/map.bin
+++ b/data/layouts/VictoryRoad_1F/map.bin
diff --git a/data/maps/VictoryRoad_B1F/border.bin b/data/layouts/VictoryRoad_B1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/VictoryRoad_B1F/border.bin
+++ b/data/layouts/VictoryRoad_B1F/border.bin
diff --git a/data/layouts/VictoryRoad_B1F/layout.inc b/data/layouts/VictoryRoad_B1F/layout.inc
new file mode 100644
index 000000000..9ce7223e1
--- /dev/null
+++ b/data/layouts/VictoryRoad_B1F/layout.inc
@@ -0,0 +1,15 @@
+VictoryRoad_B1F_MapBorder::
+	.incbin "data/layouts/VictoryRoad_B1F/border.bin"
+
+VictoryRoad_B1F_MapBlockdata::
+	.incbin "data/layouts/VictoryRoad_B1F/map.bin"
+
+	.align 2
+VictoryRoad_B1F_Layout::
+	.4byte 0x2e
+	.4byte 0x1f
+	.4byte VictoryRoad_B1F_MapBorder
+	.4byte VictoryRoad_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/VictoryRoad_B1F/map.bin b/data/layouts/VictoryRoad_B1F/map.bin
index c1ea2f657..c1ea2f657 100644
--- a/data/maps/VictoryRoad_B1F/map.bin
+++ b/data/layouts/VictoryRoad_B1F/map.bin
diff --git a/data/maps/VictoryRoad_B2F/border.bin b/data/layouts/VictoryRoad_B2F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/VictoryRoad_B2F/border.bin
+++ b/data/layouts/VictoryRoad_B2F/border.bin
diff --git a/data/layouts/VictoryRoad_B2F/layout.inc b/data/layouts/VictoryRoad_B2F/layout.inc
new file mode 100644
index 000000000..23c500cbe
--- /dev/null
+++ b/data/layouts/VictoryRoad_B2F/layout.inc
@@ -0,0 +1,15 @@
+VictoryRoad_B2F_MapBorder::
+	.incbin "data/layouts/VictoryRoad_B2F/border.bin"
+
+VictoryRoad_B2F_MapBlockdata::
+	.incbin "data/layouts/VictoryRoad_B2F/map.bin"
+
+	.align 2
+VictoryRoad_B2F_Layout::
+	.4byte 0x2e
+	.4byte 0x1f
+	.4byte VictoryRoad_B2F_MapBorder
+	.4byte VictoryRoad_B2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
+
diff --git a/data/maps/VictoryRoad_B2F/map.bin b/data/layouts/VictoryRoad_B2F/map.bin
index 24c4f646a..24c4f646a 100644
--- a/data/maps/VictoryRoad_B2F/map.bin
+++ b/data/layouts/VictoryRoad_B2F/map.bin
diff --git a/data/layouts_table.inc b/data/layouts_table.inc
new file mode 100644
index 000000000..bd67fb6f9
--- /dev/null
+++ b/data/layouts_table.inc
@@ -0,0 +1,443 @@
+	.align 2
+gMapLayouts::
+	.4byte PetalburgCity_Layout
+	.4byte SlateportCity_Layout
+	.4byte MauvilleCity_Layout
+	.4byte RustboroCity_Layout
+	.4byte FortreeCity_Layout
+	.4byte LilycoveCity_Layout
+	.4byte MossdeepCity_Layout
+	.4byte SootopolisCity_Layout
+	.4byte EverGrandeCity_Layout
+	.4byte LittlerootTown_Layout
+	.4byte OldaleTown_Layout
+	.4byte DewfordTown_Layout
+	.4byte LavaridgeTown_Layout
+	.4byte FallarborTown_Layout
+	.4byte VerdanturfTown_Layout
+	.4byte PacifidlogTown_Layout
+	.4byte Route101_Layout
+	.4byte Route102_Layout
+	.4byte Route103_Layout
+	.4byte Route104_Layout
+	.4byte Route105_Layout
+	.4byte Route106_Layout
+	.4byte Route107_Layout
+	.4byte Route108_Layout
+	.4byte Route109_Layout
+	.4byte Route110_Layout
+	.4byte Route111_Layout
+	.4byte Route112_Layout
+	.4byte Route113_Layout
+	.4byte Route114_Layout
+	.4byte Route115_Layout
+	.4byte Route116_Layout
+	.4byte Route117_Layout
+	.4byte Route118_Layout
+	.4byte Route119_Layout
+	.4byte Route120_Layout
+	.4byte Route121_Layout
+	.4byte Route122_Layout
+	.4byte Route123_Layout
+	.4byte Route124_Layout
+	.4byte Route125_Layout
+	.4byte Route126_Layout
+	.4byte Route127_Layout
+	.4byte Route128_Layout
+	.4byte Route129_Layout
+	.4byte UnknownMap_08417FC4_Layout
+	.4byte Route131_Layout
+	.4byte Route132_Layout
+	.4byte Route133_Layout
+	.4byte Route134_Layout
+	.4byte Underwater2_Layout
+	.4byte Underwater3_Layout
+	.4byte Underwater4_Layout
+	.4byte LittlerootTown_BrendansHouse_1F_Layout
+	.4byte LittlerootTown_BrendansHouse_2F_Layout
+	.4byte LittlerootTown_MaysHouse_1F_Layout
+	.4byte LittlerootTown_MaysHouse_2F_Layout
+	.4byte LittlerootTown_ProfessorBirchsLab_Layout
+	.4byte House1_Layout
+	.4byte House2_Layout
+	.4byte PokemonCenter_1F_Layout
+	.4byte PokemonCenter_2F_Layout
+	.4byte Mart_Layout
+	.4byte House3_Layout
+	.4byte DewfordTown_Gym_Layout
+	.4byte DewfordTown_Hall_Layout
+	.4byte House4_Layout
+	.4byte LavaridgeTown_HerbShop_Layout
+	.4byte LavaridgeTown_Gym_1F_Layout
+	.4byte LavaridgeTown_Gym_B1F_Layout
+	.4byte LavaridgeTown_PokemonCenter_1F_Layout
+	.4byte FallarborTown_LeftoverRSContestLobby_Layout
+	.4byte FallarborTown_LeftoverRSContestHall_Layout
+	.4byte LilycoveCity_House2_Layout
+	.4byte UnknownMap_08428450_Layout
+	.4byte VerdanturfTown_WandasHouse_Layout
+	.4byte PacifidlogTown_House1_Layout
+	.4byte PacifidlogTown_House2_Layout
+	.4byte PetalburgCity_Gym_Layout
+	.4byte HouseWithBed_Layout
+	.4byte SlateportCity_SternsShipyard_1F_Layout
+	.4byte SlateportCity_SternsShipyard_2F_Layout
+	.4byte UnknownMap_084294C4_Layout
+	.4byte UnknownMap_084294E8_Layout
+	.4byte SlateportCity_PokemonFanClub_Layout
+	.4byte SlateportCity_OceanicMuseum_1F_Layout
+	.4byte SlateportCity_OceanicMuseum_2F_Layout
+	.4byte Harbor_Layout
+	.4byte MauvilleCity_Gym_Layout
+	.4byte MauvilleCity_BikeShop_Layout
+	.4byte MauvilleCity_GameCorner_Layout
+	.4byte RustboroCity_DevonCorp_1F_Layout
+	.4byte RustboroCity_DevonCorp_2F_Layout
+	.4byte RustboroCity_Gym_Layout
+	.4byte RustboroCity_PokemonSchool_Layout
+	.4byte RustboroCity_House_Layouts
+	.4byte RustboroCity_House1_Layout
+	.4byte RustboroCity_CuttersHouse_Layout
+	.4byte FortreeCity_House1_Layout
+	.4byte FortreeCity_Gym_Layout
+	.4byte FortreeCity_House2_Layout
+	.4byte Route104_MrBrineysHouse_Layout
+	.4byte LilycoveCity_LilycoveMuseum_1F_Layout
+	.4byte LilycoveCity_LilycoveMuseum_2F_Layout
+	.4byte LilycoveCity_ContestLobby_Layout
+	.4byte LilycoveCity_ContestHall_Layout
+	.4byte LilycoveCity_PokemonTrainerFanClub_Layout
+	.4byte MossdeepCity_Gym_Layout
+	.4byte SootopolisCity_Gym_1F_Layout
+	.4byte SootopolisCity_Gym_B1F_Layout
+	.4byte EverGrandeCity_SidneysRoom_Layout
+	.4byte EverGrandeCity_PhoebesRoom_Layout
+	.4byte EverGrandeCity_GlaciasRoom_Layout
+	.4byte EverGrandeCity_DrakesRoom_Layout
+	.4byte EverGrandeCity_ChampionsRoom_Layout
+	.4byte EverGrandeCity_ShortHall_Layout
+	.4byte Route104_PrettyPetalFlowerShop_Layout
+	.4byte CableCarStation_Layout
+	.4byte Route114_FossilManiacsHouse_Layout
+	.4byte Route114_FossilManiacsTunnel_Layout
+	.4byte Route114_LanettesHouse_Layout
+	.4byte Route116_TunnelersRestHouse_Layout
+	.4byte Route117_PokemonDayCare_Layout
+	.4byte Route121_SafariZoneEntrance_Layout
+	.4byte MeteorFalls_1F_1R_Layout
+	.4byte MeteorFalls_1F_2R_Layout
+	.4byte MeteorFalls_B1F_1R_Layout
+	.4byte MeteorFalls_B1F_2R_Layout
+	.4byte RusturfTunnel_Layout
+	.4byte Underwater_SootopolisCity_Layout
+	.4byte DesertRuins_Layout
+	.4byte GraniteCave_1F_Layout
+	.4byte GraniteCave_B1F_Layout
+	.4byte GraniteCave_B2F_Layout
+	.4byte PetalburgWoods_Layout
+	.4byte MtChimney_Layout
+	.4byte MtPyre_1F_Layout
+	.4byte MtPyre_2F_Layout
+	.4byte MtPyre_3F_Layout
+	.4byte MtPyre_4F_Layout
+	.4byte MtPyre_5F_Layout
+	.4byte MtPyre_6F_Layout
+	.4byte AquaHideout_1F_Layout
+	.4byte AquaHideout_B1F_Layout
+	.4byte AquaHideout_B2F_Layout
+	.4byte Underwater_SeafloorCavern_Layout
+	.4byte SeafloorCavern_Entrance_Layout
+	.4byte SeafloorCavern_Room1_Layout
+	.4byte SeafloorCavern_Room2_Layout
+	.4byte SeafloorCavern_Room3_Layout
+	.4byte SeafloorCavern_Room4_Layout
+	.4byte SeafloorCavern_Room5_Layout
+	.4byte SeafloorCavern_Room6_Layout
+	.4byte SeafloorCavern_Room7_Layout
+	.4byte SeafloorCavern_Room8_Layout
+	.4byte SeafloorCavern_Room9_Layout
+	.4byte CaveOfOrigin_Entrance_Layout
+	.4byte CaveOfOrigin_1F_Layout
+	.4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout
+	.4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout
+	.4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout
+	.4byte CaveOfOrigin_B1F_Layout
+	.4byte VictoryRoad_1F_Layout
+	.4byte ShoalCave_LowTideEntranceRoom_Layout
+	.4byte ShoalCave_LowTideInnerRoom_Layout
+	.4byte ShoalCave_LowTideStairsRoom_Layout
+	.4byte ShoalCave_LowTideLowerRoom_Layout
+	.4byte ShoalCave_HighTideEntranceRoom_Layout
+	.4byte ShoalCave_HighTideInnerRoom_Layout
+	.4byte UnknownMap_0843E6C0_Layout
+	.4byte UnknownMap_0843E6E4_Layout
+	.4byte UnknownMap_0843E708_Layout
+	.4byte UnknownMap_0843E72C_Layout
+	.4byte UnknownMap_0843E750_Layout
+	.4byte UnknownMap_0843E774_Layout
+	.4byte UnknownMap_0843E798_Layout
+	.4byte UnknownMap_0843E7BC_Layout
+	.4byte UnknownMap_0843E7E0_Layout
+	.4byte UnknownMap_0843E804_Layout
+	.4byte UnknownMap_0843E828_Layout
+	.4byte UnknownMap_0843E84C_Layout
+	.4byte UnknownMap_0843E870_Layout
+	.4byte UnknownMap_0843E894_Layout
+	.4byte NewMauville_Entrance_Layout
+	.4byte NewMauville_Inside_Layout
+	.4byte AbandonedShip_Deck_Layout
+	.4byte AbandonedShip_Corridors_1F_Layout
+	.4byte AbandonedShip_Rooms_1F_Layout
+	.4byte AbandonedShip_Corridors_B1F_Layout
+	.4byte AbandonedShip_Rooms_B1F_Layout
+	.4byte AbandonedShip_Rooms2_B1F_Layout
+	.4byte AbandonedShip_Underwater1_Layout
+	.4byte AbandonedShip_Room_B1F_Layout
+	.4byte AbandonedShip_Rooms2_1F_Layout
+	.4byte AbandonedShip_CaptainsOffice_Layout
+	.4byte AbandonedShip_Underwater2_Layout
+	.4byte SecretBase_RedCave1_Layout
+	.4byte SecretBase_BrownCave1_Layout
+	.4byte SecretBase_BlueCave1_Layout
+	.4byte SecretBase_YellowCave1_Layout
+	.4byte SecretBase_Tree1_Layout
+	.4byte SecretBase_Shrub1_Layout
+	.4byte SecretBase_RedCave2_Layout
+	.4byte SecretBase_BrownCave2_Layout
+	.4byte SecretBase_BlueCave2_Layout
+	.4byte SecretBase_YellowCave2_Layout
+	.4byte SecretBase_Tree2_Layout
+	.4byte SecretBase_Shrub2_Layout
+	.4byte SecretBase_RedCave3_Layout
+	.4byte SecretBase_BrownCave3_Layout
+	.4byte SecretBase_BlueCave3_Layout
+	.4byte SecretBase_YellowCave3_Layout
+	.4byte SecretBase_Tree3_Layout
+	.4byte SecretBase_Shrub3_Layout
+	.4byte SecretBase_RedCave4_Layout
+	.4byte SecretBase_BrownCave4_Layout
+	.4byte SecretBase_BlueCave4_Layout
+	.4byte SecretBase_YellowCave4_Layout
+	.4byte SecretBase_Tree4_Layout
+	.4byte SecretBase_Shrub4_Layout
+	.4byte SingleBattleColosseum_Layout
+	.4byte TradeCenter_Layout
+	.4byte RecordCorner_Layout
+	.4byte DoubleBattleColosseum_Layout
+	.4byte LinkContestRoom1_Layout
+	.4byte UnknownMap_25_29_Layout
+	.4byte UnknownMap_25_30_Layout
+	.4byte UnknownMap_25_31_Layout
+	.4byte UnknownMap_25_32_Layout
+	.4byte UnknownMap_25_33_Layout
+	.4byte UnknownMap_25_34_Layout
+	.4byte LinkContestRoom2_Layout
+	.4byte LinkContestRoom3_Layout
+	.4byte LinkContestRoom4_Layout
+	.4byte LinkContestRoom5_Layout
+	.4byte LinkContestRoom6_Layout
+	.4byte InsideOfTruck_Layout
+	.4byte SafariZone_Northwest_Layout
+	.4byte SafariZone_North_Layout
+	.4byte SafariZone_Southwest_Layout
+	.4byte SafariZone_South_Layout
+	.4byte UnknownMap_08447028_Layout
+	.4byte Route109_SeashoreHouse_Layout
+	.4byte Route110_TrickHouseEntrance_Layout
+	.4byte Route110_TrickHouseEnd_Layout
+	.4byte Route110_TrickHouseCorridor_Layout
+	.4byte Route110_TrickHousePuzzle1_Layout
+	.4byte Route110_TrickHousePuzzle2_Layout
+	.4byte Route110_TrickHousePuzzle3_Layout
+	.4byte Route110_TrickHousePuzzle4_Layout
+	.4byte Route110_TrickHousePuzzle5_Layout
+	.4byte Route110_TrickHousePuzzle6_Layout
+	.4byte Route110_TrickHousePuzzle7_Layout
+	.4byte Route110_TrickHousePuzzle8_Layout
+	.4byte FortreeCity_DecorationShop_Layout
+	.4byte Route110_SeasideCyclingRoadEntrance_Layout
+	.4byte LilycoveCity_DepartmentStore_1F_Layout
+	.4byte LilycoveCity_DepartmentStore_2F_Layout
+	.4byte LilycoveCity_DepartmentStore_3F_Layout
+	.4byte LilycoveCity_DepartmentStore_4F_Layout
+	.4byte LilycoveCity_DepartmentStore_5F_Layout
+	.4byte LilycoveCity_DepartmentStoreRooftop_Layout
+	.4byte Route130_Layout
+	.4byte BattleFrontier_BattleTowerLobby_Layout
+	.4byte BattleFrontier_OutsideWest_Layout
+	.4byte BattleElevator_Layout
+	.4byte BattleFrontier_BattleTowerCorridor_Layout
+	.4byte BattleFrontier_BattleTowerBattleRoom_Layout
+	.4byte RustboroCity_DevonCorp_3F_Layout
+	.4byte EverGrandeCity_PokemonLeague_1F_Layout
+	.4byte Route119_WeatherInstitute_1F_Layout
+	.4byte Route119_WeatherInstitute_2F_Layout
+	.4byte LilycoveCity_DepartmentStoreElevator_Layout
+	.4byte Underwater1_Layout
+	.4byte MossdeepCity_SpaceCenter_1F_Layout
+	.4byte MossdeepCity_SpaceCenter_2F_Layout
+	.4byte SSTidalCorridor_Layout
+	.4byte SSTidalLowerDeck_Layout
+	.4byte SSTidalRooms_Layout
+	.4byte IslandCave_Layout
+	.4byte AncientTomb_Layout
+	.4byte Underwater_Route134_Layout
+	.4byte Underwater_SealedChamber_Layout
+	.4byte SealedChamber_OuterRoom_Layout
+	.4byte VictoryRoad_B1F_Layout
+	.4byte VictoryRoad_B2F_Layout
+	.4byte Route104_Prototype_Layout
+	.4byte GraniteCave_StevensRoom_Layout
+	.4byte AbandonedShip_HiddenFloorCorridors_Layout
+	.4byte SouthernIsland_Exterior_Layout
+	.4byte SouthernIsland_Interior_Layout
+	.4byte JaggedPass_Layout
+	.4byte FieryPath_Layout
+	.4byte RustboroCity_Flat2_1F_Layout
+	.4byte RustboroCity_Flat2_2F_Layout
+	.4byte RustboroCity_Flat2_3F_Layout
+	.4byte SootopolisCity_LotadAndSeedotHouse_Layout
+	.4byte EverGrandeCity_HallOfFame_Layout
+	.4byte LilycoveCity_CoveLilyMotel_1F_Layout
+	.4byte LilycoveCity_CoveLilyMotel_2F_Layout
+	.4byte Route124_DivingTreasureHuntersHouse_Layout
+	.4byte MtPyre_Exterior_Layout
+	.4byte MtPyre_Summit_Layout
+	.4byte SealedChamber_InnerRoom_Layout
+	.4byte MossdeepCity_GameCorner_1F_Layout
+	.4byte MossdeepCity_GameCorner_B1F_Layout
+	.4byte SootopolisCity_House1_Layout
+	.4byte SootopolisCity_House2_Layout
+	.4byte SootopolisCity_House3_Layout
+	.4byte AbandonedShip_HiddenFloorRooms_Layout
+	.4byte ScorchedSlab_Layout
+	.4byte UnknownMap_0845A394_Layout
+	.4byte RustboroCity_Flat1_1F_Layout
+	.4byte RustboroCity_Flat1_2F_Layout
+	.4byte EverGrandeCity_Hall4_Layout
+	.4byte AquaHideout_UnusedRubyMap1_Layout
+	.4byte AquaHideout_UnusedRubyMap2_Layout
+	.4byte AquaHideout_UnusedRubyMap3_Layout
+	.4byte UnknownMap_0845D470_Layout
+	.4byte SkyPillar_Entrance_Layout
+	.4byte SkyPillar_Outside_Layout
+	.4byte SkyPillar_1F_Layout
+	.4byte SkyPillar_2F_Layout
+	.4byte SkyPillar_3F_Layout
+	.4byte SkyPillar_4F_Layout
+	.4byte UnknownMap_0845ECB4_Layout
+	.4byte MossdeepCity_StevensHouse_Layout
+	.4byte ShoalCave_LowTideIceRoom_Layout
+	.4byte SafariZone_RestHouse_Layout
+	.4byte SkyPillar_5F_Layout
+	.4byte SkyPillar_Top_Layout
+	.4byte BattleFrontier_BattleDomeLobby_Layout
+	.4byte BattleFrontier_BattleDomeCorridor_Layout
+	.4byte BattleFrontier_BattleDomePreBattleRoom_Layout
+	.4byte BattleFrontier_BattleDomeBattleRoom_Layout
+	.4byte MagmaHideout_1F_Layout
+	.4byte MagmaHideout_2F_1R_Layout
+	.4byte MagmaHideout_2F_2R_Layout
+	.4byte MagmaHideout_3F_1R_Layout
+	.4byte MagmaHideout_3F_2R_Layout
+	.4byte MagmaHideout_4F_Layout
+	.4byte BattleFrontier_BattlePalaceLobby_Layout
+	.4byte BattleFrontier_BattlePalaceCorridor_Layout
+	.4byte BattleFrontier_BattlePalaceBattleRoom_Layout
+	.4byte BattleFrontier_OutsideEast_Layout
+	.4byte BattleFrontier_BattleFactoryLobby_Layout
+	.4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout
+	.4byte BattleFrontier_BattleFactoryBattleRoom_Layout
+	.4byte BattleFrontier_BattlePikeLobby_Layout
+	.4byte BattleFrontier_BattlePikeCorridor_Layout
+	.4byte BattleFrontier_BattlePikeThreePathRoom_Layout
+	.4byte BattleFrontier_BattlePikeRandomRoom1_Layout
+	.4byte BattleFrontier_BattlePikeRandomRoom2_Layout
+	.4byte BattleFrontier_BattleArenaLobby_Layout
+	.4byte BattleFrontier_BattleArenaCorridor_Layout
+	.4byte BattleFrontier_BattleArenaBattleRoom_Layout
+	.4byte UnknownMap_08469200_Layout
+	.4byte BattleFrontier_BattlePikeRandomRoom3_Layout
+	.4byte UnknownMap_084693AC_Layout
+	.4byte BattleFrontier_BattlePyramidLobby_Layout
+	.4byte BattleFrontier_BattlePyramidEmptySquare_Layout
+	.4byte BattlePyramidSquare01_Layout
+	.4byte BattlePyramidSquare02_Layout
+	.4byte BattlePyramidSquare03_Layout
+	.4byte BattlePyramidSquare04_Layout
+	.4byte BattlePyramidSquare05_Layout
+	.4byte BattlePyramidSquare06_Layout
+	.4byte BattlePyramidSquare07_Layout
+	.4byte BattlePyramidSquare08_Layout
+	.4byte BattlePyramidSquare09_Layout
+	.4byte BattlePyramidSquare10_Layout
+	.4byte BattlePyramidSquare11_Layout
+	.4byte BattlePyramidSquare12_Layout
+	.4byte BattlePyramidSquare13_Layout
+	.4byte BattlePyramidSquare14_Layout
+	.4byte BattlePyramidSquare15_Layout
+	.4byte BattlePyramidSquare16_Layout
+	.4byte BattleFrontier_BattlePyramidTop_Layout
+	.4byte MagmaHideout_3F_3R_Layout
+	.4byte MagmaHideout_2F_3R_Layout
+	.4byte MirageTower_1F_Layout
+	.4byte MirageTower_2F_Layout
+	.4byte MirageTower_3F_Layout
+	.4byte BattleTentLobby_Layout
+	.4byte BattleTentCorridor_Layout
+	.4byte BattleTentBattleRoom_Layout
+	.4byte VerdanturfTown_BattleTentBattleRoom_Layout
+	.4byte MirageTower_4F_Layout
+	.4byte DesertUnderpass_Layout
+	.4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout
+	.4byte BattleFrontier_BattleTowerCorridor2_Layout
+	.4byte UnknownMap_08470BD8_Layout
+	.4byte UnionRoom_Layout
+	.4byte SafariZone_Northeast_Layout
+	.4byte SafariZone_Southeast_Layout
+	.4byte BattleFrontier_RankingHall_Layout
+	.4byte BattleFrontier_Lounge1_Layout
+	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout
+	.4byte BattleFrontier_ReceptionGate_Layout
+	.4byte ArtisanCave_B1F_Layout
+	.4byte ArtisanCave_1F_Layout
+	.4byte FarawayIsland_Entrance_Layout
+	.4byte FarawayIsland_Interior_Layout
+	.4byte BirthIsland_Exterior_Layout
+	.4byte IslandHarbor_Layout
+	.4byte Underwater_MarineCave_Layout
+	.4byte MarineCave_Entrance_Layout
+	.4byte TerraCave_Entrance_Layout
+	.4byte TerraCave_End_Layout
+	.4byte Underwater6_Layout
+	.4byte Underwater7_Layout
+	.4byte Underwater5_Layout
+	.4byte MarineCave_End_Layout
+	.4byte TrainerHill_Entrance_Layout
+	.4byte TrainerHill_1F_Layout
+	.4byte TrainerHill_2F_Layout
+	.4byte TrainerHill_3F_Layout
+	.4byte TrainerHill_4F_Layout
+	.4byte TrainerHill_Roof_Layout
+	.4byte AlteringCave_Layout
+	.4byte NavelRock_Exterior_Layout
+	.4byte NavelRock_Entrance_Layout
+	.4byte NavelRock_Top_Layout
+	.4byte NavelRock_Bottom_Layout
+	.4byte NavelRock_LadderRoom1_Layout
+	.4byte NavelRock_LadderRoom2_Layout
+	.4byte NavelRock_B1F_Layout
+	.4byte NavelRock_Fork_Layout
+	.4byte BattleFrontier_Lounge2_Layout
+	.4byte BattleFrontier_ScottsHouse_Layout
+	.4byte MeteorFalls_StevensCave_Layout
+	.4byte UnknownMap_08480DAC_Layout
+	.4byte UnknownMap_08480F54_Layout
+	.4byte UnknownMap_084810FC_Layout
+	.4byte UnknownMap_084812A4_Layout
+	.4byte UnknownMap_0848144C_Layout
+	.4byte UnknownMap_084815F4_Layout
+	.4byte UnknownMap_08481B24_Layout
+	.4byte SootopolisCity_MysteryEventsHouse_1F_Layout
+	.4byte SootopolisCity_MysteryEventsHouse_B1F_Layout
+	.4byte UnknownMap_08481DBC_Layout
diff --git a/data/map_events.s b/data/map_events.s
index 228380e7b..4fcfb5979 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -1,528 +1,529 @@
+#include "constants/event_objects.h"
 #include "constants/flags.h"
 #include "constants/items.h"
-#include "constants/event_objects.h"
+#include "constants/maps.h"
 #include "constants/vars.h"
 	.include "asm/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/Underwater5.inc"
-	.include "data/maps/events/Underwater6.inc"
-	.include "data/maps/events/Underwater7.inc"
-	.include "data/maps/events/LittlerootTown_BrendansHouse_1F.inc"
-	.include "data/maps/events/LittlerootTown_BrendansHouse_2F.inc"
-	.include "data/maps/events/LittlerootTown_MaysHouse_1F.inc"
-	.include "data/maps/events/LittlerootTown_MaysHouse_2F.inc"
-	.include "data/maps/events/LittlerootTown_ProfessorBirchsLab.inc"
-	.include "data/maps/events/OldaleTown_House1.inc"
-	.include "data/maps/events/OldaleTown_House2.inc"
-	.include "data/maps/events/OldaleTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/OldaleTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/OldaleTown_Mart.inc"
-	.include "data/maps/events/DewfordTown_House1.inc"
-	.include "data/maps/events/DewfordTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/DewfordTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/DewfordTown_Gym.inc"
-	.include "data/maps/events/DewfordTown_Hall.inc"
-	.include "data/maps/events/DewfordTown_House2.inc"
-	.include "data/maps/events/LavaridgeTown_HerbShop.inc"
-	.include "data/maps/events/LavaridgeTown_Gym_1F.inc"
-	.include "data/maps/events/LavaridgeTown_Gym_B1F.inc"
-	.include "data/maps/events/LavaridgeTown_House.inc"
-	.include "data/maps/events/LavaridgeTown_Mart.inc"
-	.include "data/maps/events/LavaridgeTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/LavaridgeTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/FallarborTown_Mart.inc"
-	.include "data/maps/events/FallarborTown_BattleTentLobby.inc"
-	.include "data/maps/events/FallarborTown_BattleTentCorridor.inc"
-	.include "data/maps/events/FallarborTown_BattleTentBattleRoom.inc"
-	.include "data/maps/events/FallarborTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/FallarborTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/FallarborTown_House1.inc"
-	.include "data/maps/events/FallarborTown_House2.inc"
-	.include "data/maps/events/VerdanturfTown_BattleTentLobby.inc"
-	.include "data/maps/events/VerdanturfTown_BattleTentCorridor.inc"
-	.include "data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc"
-	.include "data/maps/events/VerdanturfTown_Mart.inc"
-	.include "data/maps/events/VerdanturfTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/VerdanturfTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/VerdanturfTown_WandasHouse.inc"
-	.include "data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc"
-	.include "data/maps/events/VerdanturfTown_House.inc"
-	.include "data/maps/events/PacifidlogTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/PacifidlogTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/PacifidlogTown_House1.inc"
-	.include "data/maps/events/PacifidlogTown_House2.inc"
-	.include "data/maps/events/PacifidlogTown_House3.inc"
-	.include "data/maps/events/PacifidlogTown_House4.inc"
-	.include "data/maps/events/PacifidlogTown_House5.inc"
-	.include "data/maps/events/PetalburgCity_WallysHouse.inc"
-	.include "data/maps/events/PetalburgCity_Gym.inc"
-	.include "data/maps/events/PetalburgCity_House1.inc"
-	.include "data/maps/events/PetalburgCity_House2.inc"
-	.include "data/maps/events/PetalburgCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/PetalburgCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/PetalburgCity_Mart.inc"
-	.include "data/maps/events/SlateportCity_SternsShipyard_1F.inc"
-	.include "data/maps/events/SlateportCity_SternsShipyard_2F.inc"
-	.include "data/maps/events/SlateportCity_BattleTentLobby.inc"
-	.include "data/maps/events/SlateportCity_BattleTentCorridor.inc"
-	.include "data/maps/events/SlateportCity_BattleTentBattleRoom.inc"
-	.include "data/maps/events/SlateportCity_House1.inc"
-	.include "data/maps/events/SlateportCity_PokemonFanClub.inc"
-	.include "data/maps/events/SlateportCity_OceanicMuseum_1F.inc"
-	.include "data/maps/events/SlateportCity_OceanicMuseum_2F.inc"
-	.include "data/maps/events/SlateportCity_Harbor.inc"
-	.include "data/maps/events/SlateportCity_House2.inc"
-	.include "data/maps/events/SlateportCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/SlateportCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/SlateportCity_Mart.inc"
-	.include "data/maps/events/MauvilleCity_Gym.inc"
-	.include "data/maps/events/MauvilleCity_BikeShop.inc"
-	.include "data/maps/events/MauvilleCity_House1.inc"
-	.include "data/maps/events/MauvilleCity_GameCorner.inc"
-	.include "data/maps/events/MauvilleCity_House2.inc"
-	.include "data/maps/events/MauvilleCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/MauvilleCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/MauvilleCity_Mart.inc"
-	.include "data/maps/events/RustboroCity_DevonCorp_1F.inc"
-	.include "data/maps/events/RustboroCity_DevonCorp_2F.inc"
-	.include "data/maps/events/RustboroCity_DevonCorp_3F.inc"
-	.include "data/maps/events/RustboroCity_Gym.inc"
-	.include "data/maps/events/RustboroCity_PokemonSchool.inc"
-	.include "data/maps/events/RustboroCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/RustboroCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/RustboroCity_Mart.inc"
-	.include "data/maps/events/RustboroCity_Flat1_1F.inc"
-	.include "data/maps/events/RustboroCity_Flat1_2F.inc"
-	.include "data/maps/events/RustboroCity_House1.inc"
-	.include "data/maps/events/RustboroCity_CuttersHouse.inc"
-	.include "data/maps/events/RustboroCity_House2.inc"
-	.include "data/maps/events/RustboroCity_Flat2_1F.inc"
-	.include "data/maps/events/RustboroCity_Flat2_2F.inc"
-	.include "data/maps/events/RustboroCity_Flat2_3F.inc"
-	.include "data/maps/events/RustboroCity_House3.inc"
-	.include "data/maps/events/FortreeCity_House1.inc"
-	.include "data/maps/events/FortreeCity_Gym.inc"
-	.include "data/maps/events/FortreeCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/FortreeCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/FortreeCity_Mart.inc"
-	.include "data/maps/events/FortreeCity_House2.inc"
-	.include "data/maps/events/FortreeCity_House3.inc"
-	.include "data/maps/events/FortreeCity_House4.inc"
-	.include "data/maps/events/FortreeCity_House5.inc"
-	.include "data/maps/events/FortreeCity_DecorationShop.inc"
-	.include "data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc"
-	.include "data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc"
-	.include "data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc"
-	.include "data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc"
-	.include "data/maps/events/LilycoveCity_ContestLobby.inc"
-	.include "data/maps/events/LilycoveCity_ContestHall.inc"
-	.include "data/maps/events/LilycoveCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/LilycoveCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/LilycoveCity_UnusedMart.inc"
-	.include "data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc"
-	.include "data/maps/events/LilycoveCity_Harbor.inc"
-	.include "data/maps/events/LilycoveCity_MoveDeletersHouse.inc"
-	.include "data/maps/events/LilycoveCity_House1.inc"
-	.include "data/maps/events/LilycoveCity_House2.inc"
-	.include "data/maps/events/LilycoveCity_House3.inc"
-	.include "data/maps/events/LilycoveCity_House4.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_1F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_2F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_3F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_4F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_5F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStoreElevator.inc"
-	.include "data/maps/events/MossdeepCity_Gym.inc"
-	.include "data/maps/events/MossdeepCity_House1.inc"
-	.include "data/maps/events/MossdeepCity_House2.inc"
-	.include "data/maps/events/MossdeepCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/MossdeepCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/MossdeepCity_Mart.inc"
-	.include "data/maps/events/MossdeepCity_House3.inc"
-	.include "data/maps/events/MossdeepCity_StevensHouse.inc"
-	.include "data/maps/events/MossdeepCity_House4.inc"
-	.include "data/maps/events/MossdeepCity_SpaceCenter_1F.inc"
-	.include "data/maps/events/MossdeepCity_SpaceCenter_2F.inc"
-	.include "data/maps/events/MossdeepCity_GameCorner_1F.inc"
-	.include "data/maps/events/MossdeepCity_GameCorner_B1F.inc"
-	.include "data/maps/events/SootopolisCity_Gym_1F.inc"
-	.include "data/maps/events/SootopolisCity_Gym_B1F.inc"
-	.include "data/maps/events/SootopolisCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/SootopolisCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/SootopolisCity_Mart.inc"
-	.include "data/maps/events/SootopolisCity_House1.inc"
-	.include "data/maps/events/SootopolisCity_House2.inc"
-	.include "data/maps/events/SootopolisCity_House3.inc"
-	.include "data/maps/events/SootopolisCity_House4.inc"
-	.include "data/maps/events/SootopolisCity_House5.inc"
-	.include "data/maps/events/SootopolisCity_House6.inc"
-	.include "data/maps/events/SootopolisCity_House7.inc"
-	.include "data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc"
-	.include "data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc"
-	.include "data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc"
-	.include "data/maps/events/EverGrandeCity_SidneysRoom.inc"
-	.include "data/maps/events/EverGrandeCity_PhoebesRoom.inc"
-	.include "data/maps/events/EverGrandeCity_GlaciasRoom.inc"
-	.include "data/maps/events/EverGrandeCity_DrakesRoom.inc"
-	.include "data/maps/events/EverGrandeCity_ChampionsRoom.inc"
-	.include "data/maps/events/EverGrandeCity_Hall1.inc"
-	.include "data/maps/events/EverGrandeCity_Hall2.inc"
-	.include "data/maps/events/EverGrandeCity_Hall3.inc"
-	.include "data/maps/events/EverGrandeCity_Hall4.inc"
-	.include "data/maps/events/EverGrandeCity_Hall5.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonLeague_1F.inc"
-	.include "data/maps/events/EverGrandeCity_HallOfFame.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonLeague_2F.inc"
-	.include "data/maps/events/Route104_MrBrineysHouse.inc"
-	.include "data/maps/events/Route104_PrettyPetalFlowerShop.inc"
-	.include "data/maps/events/Route111_WinstrateFamilysHouse.inc"
-	.include "data/maps/events/Route111_OldLadysRestStop.inc"
-	.include "data/maps/events/Route112_CableCarStation.inc"
-	.include "data/maps/events/MtChimney_CableCarStation.inc"
-	.include "data/maps/events/Route114_FossilManiacsHouse.inc"
-	.include "data/maps/events/Route114_FossilManiacsTunnel.inc"
-	.include "data/maps/events/Route114_LanettesHouse.inc"
-	.include "data/maps/events/Route116_TunnelersRestHouse.inc"
-	.include "data/maps/events/Route117_PokemonDayCare.inc"
-	.include "data/maps/events/Route121_SafariZoneEntrance.inc"
-	.include "data/maps/events/MeteorFalls_1F_1R.inc"
-	.include "data/maps/events/MeteorFalls_1F_2R.inc"
-	.include "data/maps/events/MeteorFalls_B1F_1R.inc"
-	.include "data/maps/events/MeteorFalls_B1F_2R.inc"
-	.include "data/maps/events/RusturfTunnel.inc"
-	.include "data/maps/events/Underwater_SootopolisCity.inc"
-	.include "data/maps/events/DesertRuins.inc"
-	.include "data/maps/events/GraniteCave_1F.inc"
-	.include "data/maps/events/GraniteCave_B1F.inc"
-	.include "data/maps/events/GraniteCave_B2F.inc"
-	.include "data/maps/events/GraniteCave_StevensRoom.inc"
-	.include "data/maps/events/PetalburgWoods.inc"
-	.include "data/maps/events/MtChimney.inc"
-	.include "data/maps/events/JaggedPass.inc"
-	.include "data/maps/events/FieryPath.inc"
-	.include "data/maps/events/MtPyre_1F.inc"
-	.include "data/maps/events/MtPyre_2F.inc"
-	.include "data/maps/events/MtPyre_3F.inc"
-	.include "data/maps/events/MtPyre_4F.inc"
-	.include "data/maps/events/MtPyre_5F.inc"
-	.include "data/maps/events/MtPyre_6F.inc"
-	.include "data/maps/events/MtPyre_Exterior.inc"
-	.include "data/maps/events/MtPyre_Summit.inc"
-	.include "data/maps/events/AquaHideout_1F.inc"
-	.include "data/maps/events/AquaHideout_B1F.inc"
-	.include "data/maps/events/AquaHideout_B2F.inc"
-	.include "data/maps/events/Underwater_SeafloorCavern.inc"
-	.include "data/maps/events/SeafloorCavern_Entrance.inc"
-	.include "data/maps/events/SeafloorCavern_Room1.inc"
-	.include "data/maps/events/SeafloorCavern_Room2.inc"
-	.include "data/maps/events/SeafloorCavern_Room3.inc"
-	.include "data/maps/events/SeafloorCavern_Room4.inc"
-	.include "data/maps/events/SeafloorCavern_Room5.inc"
-	.include "data/maps/events/SeafloorCavern_Room6.inc"
-	.include "data/maps/events/SeafloorCavern_Room7.inc"
-	.include "data/maps/events/SeafloorCavern_Room8.inc"
-	.include "data/maps/events/SeafloorCavern_Room9.inc"
-	.include "data/maps/events/CaveOfOrigin_Entrance.inc"
-	.include "data/maps/events/CaveOfOrigin_1F.inc"
-	.include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc"
-	.include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc"
-	.include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc"
-	.include "data/maps/events/CaveOfOrigin_B1F.inc"
-	.include "data/maps/events/VictoryRoad_1F.inc"
-	.include "data/maps/events/VictoryRoad_B1F.inc"
-	.include "data/maps/events/VictoryRoad_B2F.inc"
-	.include "data/maps/events/ShoalCave_LowTideEntranceRoom.inc"
-	.include "data/maps/events/ShoalCave_LowTideInnerRoom.inc"
-	.include "data/maps/events/ShoalCave_LowTideStairsRoom.inc"
-	.include "data/maps/events/ShoalCave_LowTideLowerRoom.inc"
-	.include "data/maps/events/ShoalCave_HighTideEntranceRoom.inc"
-	.include "data/maps/events/ShoalCave_HighTideInnerRoom.inc"
-	.include "data/maps/events/NewMauville_Entrance.inc"
-	.include "data/maps/events/NewMauville_Inside.inc"
-	.include "data/maps/events/AbandonedShip_Deck.inc"
-	.include "data/maps/events/AbandonedShip_Corridors_1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms_1F.inc"
-	.include "data/maps/events/AbandonedShip_Corridors_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms2_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Underwater1.inc"
-	.include "data/maps/events/AbandonedShip_Room_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms2_1F.inc"
-	.include "data/maps/events/AbandonedShip_CaptainsOffice.inc"
-	.include "data/maps/events/AbandonedShip_Underwater2.inc"
-	.include "data/maps/events/AbandonedShip_HiddenFloorCorridors.inc"
-	.include "data/maps/events/AbandonedShip_HiddenFloorRooms.inc"
-	.include "data/maps/events/IslandCave.inc"
-	.include "data/maps/events/AncientTomb.inc"
-	.include "data/maps/events/Underwater_Route134.inc"
-	.include "data/maps/events/Underwater_SealedChamber.inc"
-	.include "data/maps/events/SealedChamber_OuterRoom.inc"
-	.include "data/maps/events/SealedChamber_InnerRoom.inc"
-	.include "data/maps/events/ScorchedSlab.inc"
-	.include "data/maps/events/AquaHideout_UnusedRubyMap1.inc"
-	.include "data/maps/events/AquaHideout_UnusedRubyMap2.inc"
-	.include "data/maps/events/AquaHideout_UnusedRubyMap3.inc"
-	.include "data/maps/events/SkyPillar_Entrance.inc"
-	.include "data/maps/events/SkyPillar_Outside.inc"
-	.include "data/maps/events/SkyPillar_1F.inc"
-	.include "data/maps/events/SkyPillar_2F.inc"
-	.include "data/maps/events/SkyPillar_3F.inc"
-	.include "data/maps/events/SkyPillar_4F.inc"
-	.include "data/maps/events/ShoalCave_LowTideIceRoom.inc"
-	.include "data/maps/events/SkyPillar_5F.inc"
-	.include "data/maps/events/SkyPillar_Top.inc"
-	.include "data/maps/events/MagmaHideout_1F.inc"
-	.include "data/maps/events/MagmaHideout_2F_1R.inc"
-	.include "data/maps/events/MagmaHideout_2F_2R.inc"
-	.include "data/maps/events/MagmaHideout_3F_1R.inc"
-	.include "data/maps/events/MagmaHideout_3F_2R.inc"
-	.include "data/maps/events/MagmaHideout_4F.inc"
-	.include "data/maps/events/MagmaHideout_3F_3R.inc"
-	.include "data/maps/events/MagmaHideout_2F_3R.inc"
-	.include "data/maps/events/MirageTower_1F.inc"
-	.include "data/maps/events/MirageTower_2F.inc"
-	.include "data/maps/events/MirageTower_3F.inc"
-	.include "data/maps/events/MirageTower_4F.inc"
-	.include "data/maps/events/DesertUnderpass.inc"
-	.include "data/maps/events/ArtisanCave_B1F.inc"
-	.include "data/maps/events/ArtisanCave_1F.inc"
-	.include "data/maps/events/Underwater_MarineCave.inc"
-	.include "data/maps/events/MarineCave_Entrance.inc"
-	.include "data/maps/events/MarineCave_End.inc"
-	.include "data/maps/events/TerraCave_Entrance.inc"
-	.include "data/maps/events/TerraCave_End.inc"
-	.include "data/maps/events/AlteringCave.inc"
-	.include "data/maps/events/MeteorFalls_StevensCave.inc"
-	.include "data/maps/events/SecretBase_RedCave1.inc"
-	.include "data/maps/events/SecretBase_BrownCave1.inc"
-	.include "data/maps/events/SecretBase_BlueCave1.inc"
-	.include "data/maps/events/SecretBase_YellowCave1.inc"
-	.include "data/maps/events/SecretBase_Tree1.inc"
-	.include "data/maps/events/SecretBase_Shrub1.inc"
-	.include "data/maps/events/SecretBase_RedCave2.inc"
-	.include "data/maps/events/SecretBase_BrownCave2.inc"
-	.include "data/maps/events/SecretBase_BlueCave2.inc"
-	.include "data/maps/events/SecretBase_YellowCave2.inc"
-	.include "data/maps/events/SecretBase_Tree2.inc"
-	.include "data/maps/events/SecretBase_Shrub2.inc"
-	.include "data/maps/events/SecretBase_RedCave3.inc"
-	.include "data/maps/events/SecretBase_BrownCave3.inc"
-	.include "data/maps/events/SecretBase_BlueCave3.inc"
-	.include "data/maps/events/SecretBase_YellowCave3.inc"
-	.include "data/maps/events/SecretBase_Tree3.inc"
-	.include "data/maps/events/SecretBase_Shrub3.inc"
-	.include "data/maps/events/SecretBase_RedCave4.inc"
-	.include "data/maps/events/SecretBase_BrownCave4.inc"
-	.include "data/maps/events/SecretBase_BlueCave4.inc"
-	.include "data/maps/events/SecretBase_YellowCave4.inc"
-	.include "data/maps/events/SecretBase_Tree4.inc"
-	.include "data/maps/events/SecretBase_Shrub4.inc"
-	.include "data/maps/events/SingleBattleColosseum.inc"
-	.include "data/maps/events/TradeCenter.inc"
-	.include "data/maps/events/RecordCorner.inc"
-	.include "data/maps/events/DoubleBattleColosseum.inc"
-	.include "data/maps/events/LinkContestRoom1.inc"
-	.include "data/maps/events/LinkContestRoom2.inc"
-	.include "data/maps/events/LinkContestRoom3.inc"
-	.include "data/maps/events/LinkContestRoom4.inc"
-	.include "data/maps/events/LinkContestRoom5.inc"
-	.include "data/maps/events/LinkContestRoom6.inc"
-	.include "data/maps/events/UnknownMap_25_29.inc"
-	.include "data/maps/events/UnknownMap_25_30.inc"
-	.include "data/maps/events/UnknownMap_25_31.inc"
-	.include "data/maps/events/UnknownMap_25_32.inc"
-	.include "data/maps/events/UnknownMap_25_33.inc"
-	.include "data/maps/events/UnknownMap_25_34.inc"
-	.include "data/maps/events/InsideOfTruck.inc"
-	.include "data/maps/events/SSTidalCorridor.inc"
-	.include "data/maps/events/SSTidalLowerDeck.inc"
-	.include "data/maps/events/SSTidalRooms.inc"
-	.include "data/maps/events/BattlePyramidSquare01.inc"
-	.include "data/maps/events/BattlePyramidSquare02.inc"
-	.include "data/maps/events/BattlePyramidSquare03.inc"
-	.include "data/maps/events/BattlePyramidSquare04.inc"
-	.include "data/maps/events/BattlePyramidSquare05.inc"
-	.include "data/maps/events/BattlePyramidSquare06.inc"
-	.include "data/maps/events/BattlePyramidSquare07.inc"
-	.include "data/maps/events/BattlePyramidSquare08.inc"
-	.include "data/maps/events/BattlePyramidSquare09.inc"
-	.include "data/maps/events/BattlePyramidSquare10.inc"
-	.include "data/maps/events/BattlePyramidSquare11.inc"
-	.include "data/maps/events/BattlePyramidSquare12.inc"
-	.include "data/maps/events/BattlePyramidSquare13.inc"
-	.include "data/maps/events/BattlePyramidSquare14.inc"
-	.include "data/maps/events/BattlePyramidSquare15.inc"
-	.include "data/maps/events/BattlePyramidSquare16.inc"
-	.include "data/maps/events/UnionRoom.inc"
-	.include "data/maps/events/SafariZone_Northwest.inc"
-	.include "data/maps/events/SafariZone_North.inc"
-	.include "data/maps/events/SafariZone_Southwest.inc"
-	.include "data/maps/events/SafariZone_South.inc"
-	.include "data/maps/events/BattleFrontier_OutsideWest.inc"
-	.include "data/maps/events/BattleFrontier_BattleTowerLobby.inc"
-	.include "data/maps/events/BattleFrontier_BattleTowerElevator.inc"
-	.include "data/maps/events/BattleFrontier_BattleTowerCorridor.inc"
-	.include "data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc"
-	.include "data/maps/events/SouthernIsland_Exterior.inc"
-	.include "data/maps/events/SouthernIsland_Interior.inc"
-	.include "data/maps/events/SafariZone_RestHouse.inc"
-	.include "data/maps/events/SafariZone_Northeast.inc"
-	.include "data/maps/events/SafariZone_Southeast.inc"
-	.include "data/maps/events/BattleFrontier_OutsideEast.inc"
-	.include "data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattleTowerCorridor2.inc"
-	.include "data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc"
-	.include "data/maps/events/BattleFrontier_BattleDomeLobby.inc"
-	.include "data/maps/events/BattleFrontier_BattleDomeCorridor.inc"
-	.include "data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattlePalaceLobby.inc"
-	.include "data/maps/events/BattleFrontier_BattlePalaceCorridor.inc"
-	.include "data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattlePyramidLobby.inc"
-	.include "data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc"
-	.include "data/maps/events/BattleFrontier_BattlePyramidTop.inc"
-	.include "data/maps/events/BattleFrontier_BattleArenaLobby.inc"
-	.include "data/maps/events/BattleFrontier_BattleArenaCorridor.inc"
-	.include "data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattleFactoryLobby.inc"
-	.include "data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattlePikeLobby.inc"
-	.include "data/maps/events/BattleFrontier_BattlePikeCorridor.inc"
-	.include "data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc"
-	.include "data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc"
-	.include "data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc"
-	.include "data/maps/events/BattleFrontier_RankingHall.inc"
-	.include "data/maps/events/BattleFrontier_Lounge1.inc"
-	.include "data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc"
-	.include "data/maps/events/BattleFrontier_Lounge2.inc"
-	.include "data/maps/events/BattleFrontier_Lounge3.inc"
-	.include "data/maps/events/BattleFrontier_Lounge4.inc"
-	.include "data/maps/events/BattleFrontier_ScottsHouse.inc"
-	.include "data/maps/events/BattleFrontier_Lounge5.inc"
-	.include "data/maps/events/BattleFrontier_Lounge6.inc"
-	.include "data/maps/events/BattleFrontier_Lounge7.inc"
-	.include "data/maps/events/BattleFrontier_ReceptionGate.inc"
-	.include "data/maps/events/BattleFrontier_Lounge8.inc"
-	.include "data/maps/events/BattleFrontier_Lounge9.inc"
-	.include "data/maps/events/BattleFrontier_PokemonCenter_1F.inc"
-	.include "data/maps/events/BattleFrontier_PokemonCenter_2F.inc"
-	.include "data/maps/events/BattleFrontier_Mart.inc"
-	.include "data/maps/events/FarawayIsland_Entrance.inc"
-	.include "data/maps/events/FarawayIsland_Interior.inc"
-	.include "data/maps/events/BirthIsland_Exterior.inc"
-	.include "data/maps/events/BirthIsland_Harbor.inc"
-	.include "data/maps/events/TrainerHill_Entrance.inc"
-	.include "data/maps/events/TrainerHill_1F.inc"
-	.include "data/maps/events/TrainerHill_2F.inc"
-	.include "data/maps/events/TrainerHill_3F.inc"
-	.include "data/maps/events/TrainerHill_4F.inc"
-	.include "data/maps/events/TrainerHill_Roof.inc"
-	.include "data/maps/events/NavelRock_Exterior.inc"
-	.include "data/maps/events/NavelRock_Harbor.inc"
-	.include "data/maps/events/NavelRock_Entrance.inc"
-	.include "data/maps/events/NavelRock_B1F.inc"
-	.include "data/maps/events/NavelRock_Fork.inc"
-	.include "data/maps/events/NavelRock_Up1.inc"
-	.include "data/maps/events/NavelRock_Up2.inc"
-	.include "data/maps/events/NavelRock_Up3.inc"
-	.include "data/maps/events/NavelRock_Up4.inc"
-	.include "data/maps/events/NavelRock_Top.inc"
-	.include "data/maps/events/NavelRock_Down01.inc"
-	.include "data/maps/events/NavelRock_Down02.inc"
-	.include "data/maps/events/NavelRock_Down03.inc"
-	.include "data/maps/events/NavelRock_Down04.inc"
-	.include "data/maps/events/NavelRock_Down05.inc"
-	.include "data/maps/events/NavelRock_Down06.inc"
-	.include "data/maps/events/NavelRock_Down07.inc"
-	.include "data/maps/events/NavelRock_Down08.inc"
-	.include "data/maps/events/NavelRock_Down09.inc"
-	.include "data/maps/events/NavelRock_Down10.inc"
-	.include "data/maps/events/NavelRock_Down11.inc"
-	.include "data/maps/events/NavelRock_Bottom.inc"
-	.include "data/maps/events/TrainerHill_Elevator.inc"
-	.include "data/maps/events/Route104_Prototype.inc"
-	.include "data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc"
-	.include "data/maps/events/Route109_SeashoreHouse.inc"
-	.include "data/maps/events/Route110_TrickHouseEntrance.inc"
-	.include "data/maps/events/Route110_TrickHouseEnd.inc"
-	.include "data/maps/events/Route110_TrickHouseCorridor.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle1.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle2.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle3.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle4.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle5.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle6.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle7.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle8.inc"
-	.include "data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc"
-	.include "data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc"
-	.include "data/maps/events/Route113_GlassWorkshop.inc"
-	.include "data/maps/events/Route123_BerryMastersHouse.inc"
-	.include "data/maps/events/Route119_WeatherInstitute_1F.inc"
-	.include "data/maps/events/Route119_WeatherInstitute_2F.inc"
-	.include "data/maps/events/Route119_House.inc"
-	.include "data/maps/events/Route124_DivingTreasureHuntersHouse.inc"
+	.include "data/maps/PetalburgCity/events.inc"
+	.include "data/maps/SlateportCity/events.inc"
+	.include "data/maps/MauvilleCity/events.inc"
+	.include "data/maps/RustboroCity/events.inc"
+	.include "data/maps/FortreeCity/events.inc"
+	.include "data/maps/LilycoveCity/events.inc"
+	.include "data/maps/MossdeepCity/events.inc"
+	.include "data/maps/SootopolisCity/events.inc"
+	.include "data/maps/EverGrandeCity/events.inc"
+	.include "data/maps/LittlerootTown/events.inc"
+	.include "data/maps/OldaleTown/events.inc"
+	.include "data/maps/DewfordTown/events.inc"
+	.include "data/maps/LavaridgeTown/events.inc"
+	.include "data/maps/FallarborTown/events.inc"
+	.include "data/maps/VerdanturfTown/events.inc"
+	.include "data/maps/PacifidlogTown/events.inc"
+	.include "data/maps/Route101/events.inc"
+	.include "data/maps/Route102/events.inc"
+	.include "data/maps/Route103/events.inc"
+	.include "data/maps/Route104/events.inc"
+	.include "data/maps/Route105/events.inc"
+	.include "data/maps/Route106/events.inc"
+	.include "data/maps/Route107/events.inc"
+	.include "data/maps/Route108/events.inc"
+	.include "data/maps/Route109/events.inc"
+	.include "data/maps/Route110/events.inc"
+	.include "data/maps/Route111/events.inc"
+	.include "data/maps/Route112/events.inc"
+	.include "data/maps/Route113/events.inc"
+	.include "data/maps/Route114/events.inc"
+	.include "data/maps/Route115/events.inc"
+	.include "data/maps/Route116/events.inc"
+	.include "data/maps/Route117/events.inc"
+	.include "data/maps/Route118/events.inc"
+	.include "data/maps/Route119/events.inc"
+	.include "data/maps/Route120/events.inc"
+	.include "data/maps/Route121/events.inc"
+	.include "data/maps/Route122/events.inc"
+	.include "data/maps/Route123/events.inc"
+	.include "data/maps/Route124/events.inc"
+	.include "data/maps/Route125/events.inc"
+	.include "data/maps/Route126/events.inc"
+	.include "data/maps/Route127/events.inc"
+	.include "data/maps/Route128/events.inc"
+	.include "data/maps/Route129/events.inc"
+	.include "data/maps/Route130/events.inc"
+	.include "data/maps/Route131/events.inc"
+	.include "data/maps/Route132/events.inc"
+	.include "data/maps/Route133/events.inc"
+	.include "data/maps/Route134/events.inc"
+	.include "data/maps/Underwater1/events.inc"
+	.include "data/maps/Underwater2/events.inc"
+	.include "data/maps/Underwater3/events.inc"
+	.include "data/maps/Underwater4/events.inc"
+	.include "data/maps/Underwater5/events.inc"
+	.include "data/maps/Underwater6/events.inc"
+	.include "data/maps/Underwater7/events.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_1F/events.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_2F/events.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_1F/events.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_2F/events.inc"
+	.include "data/maps/LittlerootTown_ProfessorBirchsLab/events.inc"
+	.include "data/maps/OldaleTown_House1/events.inc"
+	.include "data/maps/OldaleTown_House2/events.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/OldaleTown_Mart/events.inc"
+	.include "data/maps/DewfordTown_House1/events.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/DewfordTown_Gym/events.inc"
+	.include "data/maps/DewfordTown_Hall/events.inc"
+	.include "data/maps/DewfordTown_House2/events.inc"
+	.include "data/maps/LavaridgeTown_HerbShop/events.inc"
+	.include "data/maps/LavaridgeTown_Gym_1F/events.inc"
+	.include "data/maps/LavaridgeTown_Gym_B1F/events.inc"
+	.include "data/maps/LavaridgeTown_House/events.inc"
+	.include "data/maps/LavaridgeTown_Mart/events.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/FallarborTown_Mart/events.inc"
+	.include "data/maps/FallarborTown_BattleTentLobby/events.inc"
+	.include "data/maps/FallarborTown_BattleTentCorridor/events.inc"
+	.include "data/maps/FallarborTown_BattleTentBattleRoom/events.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/FallarborTown_House1/events.inc"
+	.include "data/maps/FallarborTown_House2/events.inc"
+	.include "data/maps/VerdanturfTown_BattleTentLobby/events.inc"
+	.include "data/maps/VerdanturfTown_BattleTentCorridor/events.inc"
+	.include "data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc"
+	.include "data/maps/VerdanturfTown_Mart/events.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/VerdanturfTown_WandasHouse/events.inc"
+	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc"
+	.include "data/maps/VerdanturfTown_House/events.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/PacifidlogTown_House1/events.inc"
+	.include "data/maps/PacifidlogTown_House2/events.inc"
+	.include "data/maps/PacifidlogTown_House3/events.inc"
+	.include "data/maps/PacifidlogTown_House4/events.inc"
+	.include "data/maps/PacifidlogTown_House5/events.inc"
+	.include "data/maps/PetalburgCity_WallysHouse/events.inc"
+	.include "data/maps/PetalburgCity_Gym/events.inc"
+	.include "data/maps/PetalburgCity_House1/events.inc"
+	.include "data/maps/PetalburgCity_House2/events.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/PetalburgCity_Mart/events.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_1F/events.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_2F/events.inc"
+	.include "data/maps/SlateportCity_BattleTentLobby/events.inc"
+	.include "data/maps/SlateportCity_BattleTentCorridor/events.inc"
+	.include "data/maps/SlateportCity_BattleTentBattleRoom/events.inc"
+	.include "data/maps/SlateportCity_House1/events.inc"
+	.include "data/maps/SlateportCity_PokemonFanClub/events.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_1F/events.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_2F/events.inc"
+	.include "data/maps/SlateportCity_Harbor/events.inc"
+	.include "data/maps/SlateportCity_House2/events.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/SlateportCity_Mart/events.inc"
+	.include "data/maps/MauvilleCity_Gym/events.inc"
+	.include "data/maps/MauvilleCity_BikeShop/events.inc"
+	.include "data/maps/MauvilleCity_House1/events.inc"
+	.include "data/maps/MauvilleCity_GameCorner/events.inc"
+	.include "data/maps/MauvilleCity_House2/events.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/MauvilleCity_Mart/events.inc"
+	.include "data/maps/RustboroCity_DevonCorp_1F/events.inc"
+	.include "data/maps/RustboroCity_DevonCorp_2F/events.inc"
+	.include "data/maps/RustboroCity_DevonCorp_3F/events.inc"
+	.include "data/maps/RustboroCity_Gym/events.inc"
+	.include "data/maps/RustboroCity_PokemonSchool/events.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/RustboroCity_Mart/events.inc"
+	.include "data/maps/RustboroCity_Flat1_1F/events.inc"
+	.include "data/maps/RustboroCity_Flat1_2F/events.inc"
+	.include "data/maps/RustboroCity_House1/events.inc"
+	.include "data/maps/RustboroCity_CuttersHouse/events.inc"
+	.include "data/maps/RustboroCity_House2/events.inc"
+	.include "data/maps/RustboroCity_Flat2_1F/events.inc"
+	.include "data/maps/RustboroCity_Flat2_2F/events.inc"
+	.include "data/maps/RustboroCity_Flat2_3F/events.inc"
+	.include "data/maps/RustboroCity_House3/events.inc"
+	.include "data/maps/FortreeCity_House1/events.inc"
+	.include "data/maps/FortreeCity_Gym/events.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/FortreeCity_Mart/events.inc"
+	.include "data/maps/FortreeCity_House2/events.inc"
+	.include "data/maps/FortreeCity_House3/events.inc"
+	.include "data/maps/FortreeCity_House4/events.inc"
+	.include "data/maps/FortreeCity_House5/events.inc"
+	.include "data/maps/FortreeCity_DecorationShop/events.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc"
+	.include "data/maps/LilycoveCity_ContestLobby/events.inc"
+	.include "data/maps/LilycoveCity_ContestHall/events.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/LilycoveCity_UnusedMart/events.inc"
+	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc"
+	.include "data/maps/LilycoveCity_Harbor/events.inc"
+	.include "data/maps/LilycoveCity_MoveDeletersHouse/events.inc"
+	.include "data/maps/LilycoveCity_House1/events.inc"
+	.include "data/maps/LilycoveCity_House2/events.inc"
+	.include "data/maps/LilycoveCity_House3/events.inc"
+	.include "data/maps/LilycoveCity_House4/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_1F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_2F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_3F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_4F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_5F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreElevator/events.inc"
+	.include "data/maps/MossdeepCity_Gym/events.inc"
+	.include "data/maps/MossdeepCity_House1/events.inc"
+	.include "data/maps/MossdeepCity_House2/events.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/MossdeepCity_Mart/events.inc"
+	.include "data/maps/MossdeepCity_House3/events.inc"
+	.include "data/maps/MossdeepCity_StevensHouse/events.inc"
+	.include "data/maps/MossdeepCity_House4/events.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_1F/events.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_2F/events.inc"
+	.include "data/maps/MossdeepCity_GameCorner_1F/events.inc"
+	.include "data/maps/MossdeepCity_GameCorner_B1F/events.inc"
+	.include "data/maps/SootopolisCity_Gym_1F/events.inc"
+	.include "data/maps/SootopolisCity_Gym_B1F/events.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/SootopolisCity_Mart/events.inc"
+	.include "data/maps/SootopolisCity_House1/events.inc"
+	.include "data/maps/SootopolisCity_House2/events.inc"
+	.include "data/maps/SootopolisCity_House3/events.inc"
+	.include "data/maps/SootopolisCity_House4/events.inc"
+	.include "data/maps/SootopolisCity_House5/events.inc"
+	.include "data/maps/SootopolisCity_House6/events.inc"
+	.include "data/maps/SootopolisCity_House7/events.inc"
+	.include "data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc"
+	.include "data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc"
+	.include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc"
+	.include "data/maps/EverGrandeCity_SidneysRoom/events.inc"
+	.include "data/maps/EverGrandeCity_PhoebesRoom/events.inc"
+	.include "data/maps/EverGrandeCity_GlaciasRoom/events.inc"
+	.include "data/maps/EverGrandeCity_DrakesRoom/events.inc"
+	.include "data/maps/EverGrandeCity_ChampionsRoom/events.inc"
+	.include "data/maps/EverGrandeCity_Hall1/events.inc"
+	.include "data/maps/EverGrandeCity_Hall2/events.inc"
+	.include "data/maps/EverGrandeCity_Hall3/events.inc"
+	.include "data/maps/EverGrandeCity_Hall4/events.inc"
+	.include "data/maps/EverGrandeCity_Hall5/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague_1F/events.inc"
+	.include "data/maps/EverGrandeCity_HallOfFame/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague_2F/events.inc"
+	.include "data/maps/Route104_MrBrineysHouse/events.inc"
+	.include "data/maps/Route104_PrettyPetalFlowerShop/events.inc"
+	.include "data/maps/Route111_WinstrateFamilysHouse/events.inc"
+	.include "data/maps/Route111_OldLadysRestStop/events.inc"
+	.include "data/maps/Route112_CableCarStation/events.inc"
+	.include "data/maps/MtChimney_CableCarStation/events.inc"
+	.include "data/maps/Route114_FossilManiacsHouse/events.inc"
+	.include "data/maps/Route114_FossilManiacsTunnel/events.inc"
+	.include "data/maps/Route114_LanettesHouse/events.inc"
+	.include "data/maps/Route116_TunnelersRestHouse/events.inc"
+	.include "data/maps/Route117_PokemonDayCare/events.inc"
+	.include "data/maps/Route121_SafariZoneEntrance/events.inc"
+	.include "data/maps/MeteorFalls_1F_1R/events.inc"
+	.include "data/maps/MeteorFalls_1F_2R/events.inc"
+	.include "data/maps/MeteorFalls_B1F_1R/events.inc"
+	.include "data/maps/MeteorFalls_B1F_2R/events.inc"
+	.include "data/maps/RusturfTunnel/events.inc"
+	.include "data/maps/Underwater_SootopolisCity/events.inc"
+	.include "data/maps/DesertRuins/events.inc"
+	.include "data/maps/GraniteCave_1F/events.inc"
+	.include "data/maps/GraniteCave_B1F/events.inc"
+	.include "data/maps/GraniteCave_B2F/events.inc"
+	.include "data/maps/GraniteCave_StevensRoom/events.inc"
+	.include "data/maps/PetalburgWoods/events.inc"
+	.include "data/maps/MtChimney/events.inc"
+	.include "data/maps/JaggedPass/events.inc"
+	.include "data/maps/FieryPath/events.inc"
+	.include "data/maps/MtPyre_1F/events.inc"
+	.include "data/maps/MtPyre_2F/events.inc"
+	.include "data/maps/MtPyre_3F/events.inc"
+	.include "data/maps/MtPyre_4F/events.inc"
+	.include "data/maps/MtPyre_5F/events.inc"
+	.include "data/maps/MtPyre_6F/events.inc"
+	.include "data/maps/MtPyre_Exterior/events.inc"
+	.include "data/maps/MtPyre_Summit/events.inc"
+	.include "data/maps/AquaHideout_1F/events.inc"
+	.include "data/maps/AquaHideout_B1F/events.inc"
+	.include "data/maps/AquaHideout_B2F/events.inc"
+	.include "data/maps/Underwater_SeafloorCavern/events.inc"
+	.include "data/maps/SeafloorCavern_Entrance/events.inc"
+	.include "data/maps/SeafloorCavern_Room1/events.inc"
+	.include "data/maps/SeafloorCavern_Room2/events.inc"
+	.include "data/maps/SeafloorCavern_Room3/events.inc"
+	.include "data/maps/SeafloorCavern_Room4/events.inc"
+	.include "data/maps/SeafloorCavern_Room5/events.inc"
+	.include "data/maps/SeafloorCavern_Room6/events.inc"
+	.include "data/maps/SeafloorCavern_Room7/events.inc"
+	.include "data/maps/SeafloorCavern_Room8/events.inc"
+	.include "data/maps/SeafloorCavern_Room9/events.inc"
+	.include "data/maps/CaveOfOrigin_Entrance/events.inc"
+	.include "data/maps/CaveOfOrigin_1F/events.inc"
+	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc"
+	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc"
+	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc"
+	.include "data/maps/CaveOfOrigin_B1F/events.inc"
+	.include "data/maps/VictoryRoad_1F/events.inc"
+	.include "data/maps/VictoryRoad_B1F/events.inc"
+	.include "data/maps/VictoryRoad_B2F/events.inc"
+	.include "data/maps/ShoalCave_LowTideEntranceRoom/events.inc"
+	.include "data/maps/ShoalCave_LowTideInnerRoom/events.inc"
+	.include "data/maps/ShoalCave_LowTideStairsRoom/events.inc"
+	.include "data/maps/ShoalCave_LowTideLowerRoom/events.inc"
+	.include "data/maps/ShoalCave_HighTideEntranceRoom/events.inc"
+	.include "data/maps/ShoalCave_HighTideInnerRoom/events.inc"
+	.include "data/maps/NewMauville_Entrance/events.inc"
+	.include "data/maps/NewMauville_Inside/events.inc"
+	.include "data/maps/AbandonedShip_Deck/events.inc"
+	.include "data/maps/AbandonedShip_Corridors_1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms_1F/events.inc"
+	.include "data/maps/AbandonedShip_Corridors_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms2_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Underwater1/events.inc"
+	.include "data/maps/AbandonedShip_Room_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms2_1F/events.inc"
+	.include "data/maps/AbandonedShip_CaptainsOffice/events.inc"
+	.include "data/maps/AbandonedShip_Underwater2/events.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorCorridors/events.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorRooms/events.inc"
+	.include "data/maps/IslandCave/events.inc"
+	.include "data/maps/AncientTomb/events.inc"
+	.include "data/maps/Underwater_Route134/events.inc"
+	.include "data/maps/Underwater_SealedChamber/events.inc"
+	.include "data/maps/SealedChamber_OuterRoom/events.inc"
+	.include "data/maps/SealedChamber_InnerRoom/events.inc"
+	.include "data/maps/ScorchedSlab/events.inc"
+	.include "data/maps/AquaHideout_UnusedRubyMap1/events.inc"
+	.include "data/maps/AquaHideout_UnusedRubyMap2/events.inc"
+	.include "data/maps/AquaHideout_UnusedRubyMap3/events.inc"
+	.include "data/maps/SkyPillar_Entrance/events.inc"
+	.include "data/maps/SkyPillar_Outside/events.inc"
+	.include "data/maps/SkyPillar_1F/events.inc"
+	.include "data/maps/SkyPillar_2F/events.inc"
+	.include "data/maps/SkyPillar_3F/events.inc"
+	.include "data/maps/SkyPillar_4F/events.inc"
+	.include "data/maps/ShoalCave_LowTideIceRoom/events.inc"
+	.include "data/maps/SkyPillar_5F/events.inc"
+	.include "data/maps/SkyPillar_Top/events.inc"
+	.include "data/maps/MagmaHideout_1F/events.inc"
+	.include "data/maps/MagmaHideout_2F_1R/events.inc"
+	.include "data/maps/MagmaHideout_2F_2R/events.inc"
+	.include "data/maps/MagmaHideout_3F_1R/events.inc"
+	.include "data/maps/MagmaHideout_3F_2R/events.inc"
+	.include "data/maps/MagmaHideout_4F/events.inc"
+	.include "data/maps/MagmaHideout_3F_3R/events.inc"
+	.include "data/maps/MagmaHideout_2F_3R/events.inc"
+	.include "data/maps/MirageTower_1F/events.inc"
+	.include "data/maps/MirageTower_2F/events.inc"
+	.include "data/maps/MirageTower_3F/events.inc"
+	.include "data/maps/MirageTower_4F/events.inc"
+	.include "data/maps/DesertUnderpass/events.inc"
+	.include "data/maps/ArtisanCave_B1F/events.inc"
+	.include "data/maps/ArtisanCave_1F/events.inc"
+	.include "data/maps/Underwater_MarineCave/events.inc"
+	.include "data/maps/MarineCave_Entrance/events.inc"
+	.include "data/maps/MarineCave_End/events.inc"
+	.include "data/maps/TerraCave_Entrance/events.inc"
+	.include "data/maps/TerraCave_End/events.inc"
+	.include "data/maps/AlteringCave/events.inc"
+	.include "data/maps/MeteorFalls_StevensCave/events.inc"
+	.include "data/maps/SecretBase_RedCave1/events.inc"
+	.include "data/maps/SecretBase_BrownCave1/events.inc"
+	.include "data/maps/SecretBase_BlueCave1/events.inc"
+	.include "data/maps/SecretBase_YellowCave1/events.inc"
+	.include "data/maps/SecretBase_Tree1/events.inc"
+	.include "data/maps/SecretBase_Shrub1/events.inc"
+	.include "data/maps/SecretBase_RedCave2/events.inc"
+	.include "data/maps/SecretBase_BrownCave2/events.inc"
+	.include "data/maps/SecretBase_BlueCave2/events.inc"
+	.include "data/maps/SecretBase_YellowCave2/events.inc"
+	.include "data/maps/SecretBase_Tree2/events.inc"
+	.include "data/maps/SecretBase_Shrub2/events.inc"
+	.include "data/maps/SecretBase_RedCave3/events.inc"
+	.include "data/maps/SecretBase_BrownCave3/events.inc"
+	.include "data/maps/SecretBase_BlueCave3/events.inc"
+	.include "data/maps/SecretBase_YellowCave3/events.inc"
+	.include "data/maps/SecretBase_Tree3/events.inc"
+	.include "data/maps/SecretBase_Shrub3/events.inc"
+	.include "data/maps/SecretBase_RedCave4/events.inc"
+	.include "data/maps/SecretBase_BrownCave4/events.inc"
+	.include "data/maps/SecretBase_BlueCave4/events.inc"
+	.include "data/maps/SecretBase_YellowCave4/events.inc"
+	.include "data/maps/SecretBase_Tree4/events.inc"
+	.include "data/maps/SecretBase_Shrub4/events.inc"
+	.include "data/maps/SingleBattleColosseum/events.inc"
+	.include "data/maps/TradeCenter/events.inc"
+	.include "data/maps/RecordCorner/events.inc"
+	.include "data/maps/DoubleBattleColosseum/events.inc"
+	.include "data/maps/LinkContestRoom1/events.inc"
+	.include "data/maps/LinkContestRoom2/events.inc"
+	.include "data/maps/LinkContestRoom3/events.inc"
+	.include "data/maps/LinkContestRoom4/events.inc"
+	.include "data/maps/LinkContestRoom5/events.inc"
+	.include "data/maps/LinkContestRoom6/events.inc"
+	.include "data/maps/UnknownMap_25_29/events.inc"
+	.include "data/maps/UnknownMap_25_30/events.inc"
+	.include "data/maps/UnknownMap_25_31/events.inc"
+	.include "data/maps/UnknownMap_25_32/events.inc"
+	.include "data/maps/UnknownMap_25_33/events.inc"
+	.include "data/maps/UnknownMap_25_34/events.inc"
+	.include "data/maps/InsideOfTruck/events.inc"
+	.include "data/maps/SSTidalCorridor/events.inc"
+	.include "data/maps/SSTidalLowerDeck/events.inc"
+	.include "data/maps/SSTidalRooms/events.inc"
+	.include "data/maps/BattlePyramidSquare01/events.inc"
+	.include "data/maps/BattlePyramidSquare02/events.inc"
+	.include "data/maps/BattlePyramidSquare03/events.inc"
+	.include "data/maps/BattlePyramidSquare04/events.inc"
+	.include "data/maps/BattlePyramidSquare05/events.inc"
+	.include "data/maps/BattlePyramidSquare06/events.inc"
+	.include "data/maps/BattlePyramidSquare07/events.inc"
+	.include "data/maps/BattlePyramidSquare08/events.inc"
+	.include "data/maps/BattlePyramidSquare09/events.inc"
+	.include "data/maps/BattlePyramidSquare10/events.inc"
+	.include "data/maps/BattlePyramidSquare11/events.inc"
+	.include "data/maps/BattlePyramidSquare12/events.inc"
+	.include "data/maps/BattlePyramidSquare13/events.inc"
+	.include "data/maps/BattlePyramidSquare14/events.inc"
+	.include "data/maps/BattlePyramidSquare15/events.inc"
+	.include "data/maps/BattlePyramidSquare16/events.inc"
+	.include "data/maps/UnionRoom/events.inc"
+	.include "data/maps/SafariZone_Northwest/events.inc"
+	.include "data/maps/SafariZone_North/events.inc"
+	.include "data/maps/SafariZone_Southwest/events.inc"
+	.include "data/maps/SafariZone_South/events.inc"
+	.include "data/maps/BattleFrontier_OutsideWest/events.inc"
+	.include "data/maps/BattleFrontier_BattleTowerLobby/events.inc"
+	.include "data/maps/BattleFrontier_BattleTowerElevator/events.inc"
+	.include "data/maps/BattleFrontier_BattleTowerCorridor/events.inc"
+	.include "data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc"
+	.include "data/maps/SouthernIsland_Exterior/events.inc"
+	.include "data/maps/SouthernIsland_Interior/events.inc"
+	.include "data/maps/SafariZone_RestHouse/events.inc"
+	.include "data/maps/SafariZone_Northeast/events.inc"
+	.include "data/maps/SafariZone_Southeast/events.inc"
+	.include "data/maps/BattleFrontier_OutsideEast/events.inc"
+	.include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattleTowerCorridor2/events.inc"
+	.include "data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc"
+	.include "data/maps/BattleFrontier_BattleDomeLobby/events.inc"
+	.include "data/maps/BattleFrontier_BattleDomeCorridor/events.inc"
+	.include "data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattlePalaceLobby/events.inc"
+	.include "data/maps/BattleFrontier_BattlePalaceCorridor/events.inc"
+	.include "data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattlePyramidLobby/events.inc"
+	.include "data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc"
+	.include "data/maps/BattleFrontier_BattlePyramidTop/events.inc"
+	.include "data/maps/BattleFrontier_BattleArenaLobby/events.inc"
+	.include "data/maps/BattleFrontier_BattleArenaCorridor/events.inc"
+	.include "data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattleFactoryLobby/events.inc"
+	.include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattlePikeLobby/events.inc"
+	.include "data/maps/BattleFrontier_BattlePikeCorridor/events.inc"
+	.include "data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc"
+	.include "data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc"
+	.include "data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc"
+	.include "data/maps/BattleFrontier_RankingHall/events.inc"
+	.include "data/maps/BattleFrontier_Lounge1/events.inc"
+	.include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc"
+	.include "data/maps/BattleFrontier_Lounge2/events.inc"
+	.include "data/maps/BattleFrontier_Lounge3/events.inc"
+	.include "data/maps/BattleFrontier_Lounge4/events.inc"
+	.include "data/maps/BattleFrontier_ScottsHouse/events.inc"
+	.include "data/maps/BattleFrontier_Lounge5/events.inc"
+	.include "data/maps/BattleFrontier_Lounge6/events.inc"
+	.include "data/maps/BattleFrontier_Lounge7/events.inc"
+	.include "data/maps/BattleFrontier_ReceptionGate/events.inc"
+	.include "data/maps/BattleFrontier_Lounge8/events.inc"
+	.include "data/maps/BattleFrontier_Lounge9/events.inc"
+	.include "data/maps/BattleFrontier_PokemonCenter_1F/events.inc"
+	.include "data/maps/BattleFrontier_PokemonCenter_2F/events.inc"
+	.include "data/maps/BattleFrontier_Mart/events.inc"
+	.include "data/maps/FarawayIsland_Entrance/events.inc"
+	.include "data/maps/FarawayIsland_Interior/events.inc"
+	.include "data/maps/BirthIsland_Exterior/events.inc"
+	.include "data/maps/BirthIsland_Harbor/events.inc"
+	.include "data/maps/TrainerHill_Entrance/events.inc"
+	.include "data/maps/TrainerHill_1F/events.inc"
+	.include "data/maps/TrainerHill_2F/events.inc"
+	.include "data/maps/TrainerHill_3F/events.inc"
+	.include "data/maps/TrainerHill_4F/events.inc"
+	.include "data/maps/TrainerHill_Roof/events.inc"
+	.include "data/maps/NavelRock_Exterior/events.inc"
+	.include "data/maps/NavelRock_Harbor/events.inc"
+	.include "data/maps/NavelRock_Entrance/events.inc"
+	.include "data/maps/NavelRock_B1F/events.inc"
+	.include "data/maps/NavelRock_Fork/events.inc"
+	.include "data/maps/NavelRock_Up1/events.inc"
+	.include "data/maps/NavelRock_Up2/events.inc"
+	.include "data/maps/NavelRock_Up3/events.inc"
+	.include "data/maps/NavelRock_Up4/events.inc"
+	.include "data/maps/NavelRock_Top/events.inc"
+	.include "data/maps/NavelRock_Down01/events.inc"
+	.include "data/maps/NavelRock_Down02/events.inc"
+	.include "data/maps/NavelRock_Down03/events.inc"
+	.include "data/maps/NavelRock_Down04/events.inc"
+	.include "data/maps/NavelRock_Down05/events.inc"
+	.include "data/maps/NavelRock_Down06/events.inc"
+	.include "data/maps/NavelRock_Down07/events.inc"
+	.include "data/maps/NavelRock_Down08/events.inc"
+	.include "data/maps/NavelRock_Down09/events.inc"
+	.include "data/maps/NavelRock_Down10/events.inc"
+	.include "data/maps/NavelRock_Down11/events.inc"
+	.include "data/maps/NavelRock_Bottom/events.inc"
+	.include "data/maps/TrainerHill_Elevator/events.inc"
+	.include "data/maps/Route104_Prototype/events.inc"
+	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc"
+	.include "data/maps/Route109_SeashoreHouse/events.inc"
+	.include "data/maps/Route110_TrickHouseEntrance/events.inc"
+	.include "data/maps/Route110_TrickHouseEnd/events.inc"
+	.include "data/maps/Route110_TrickHouseCorridor/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle1/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle2/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle3/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle4/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle5/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle6/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle7/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle8/events.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/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 8848ac242..91c108c7a 100644
--- a/data/maps.s
+++ b/data/maps.s
@@ -1,11 +1,12 @@
+#include "constants/maps.h"
 #include "constants/songs.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
 	.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/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc
new file mode 100644
index 000000000..e7e48568c
--- /dev/null
+++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc
@@ -0,0 +1,11 @@
+AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, 1, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100
+
+AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C
+	warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
+	warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
+
+AbandonedShip_CaptainsOffice_MapEvents:: @ 8536A9C
+	map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc
index 5c6bae920..0348798fc 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/header.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc
@@ -1,5 +1,5 @@
 AbandonedShip_CaptainsOffice: @ 84845A4
-	.4byte AbandonedShip_CaptainsOffice_MapAttributes
+	.4byte AbandonedShip_CaptainsOffice_Layout
 	.4byte AbandonedShip_CaptainsOffice_MapEvents
 	.4byte AbandonedShip_CaptainsOffice_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
index 5b3941dd2..5b3941dd2 100644
--- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc
new file mode 100644
index 000000000..f0e276032
--- /dev/null
+++ b/data/maps/AbandonedShip_Corridors_1F/events.inc
@@ -0,0 +1,21 @@
+AbandonedShip_Corridors_1F_EventObjects: @ 85366C0
+	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0
+	object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, 45, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0
+
+AbandonedShip_Corridors_1F_MapWarps: @ 85366F0
+	warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK
+	warp_def 8, 11, 3, 2, MAP_ABANDONED_SHIP_DECK
+	warp_def 0, 11, 3, 3, MAP_ABANDONED_SHIP_DECK
+	warp_def 1, 11, 3, 3, MAP_ABANDONED_SHIP_DECK
+	warp_def 11, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS_1F
+	warp_def 14, 9, 3, 3, MAP_ABANDONED_SHIP_ROOMS_1F
+	warp_def 11, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS_1F
+	warp_def 14, 3, 3, 4, MAP_ABANDONED_SHIP_ROOMS_1F
+	warp_def 3, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_1F
+	warp_def 16, 2, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 5, 2, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F
+
+AbandonedShip_Corridors_1F_MapEvents:: @ 8536750
+	map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc
index 7d1582721..2ce374617 100644
--- a/data/maps/AbandonedShip_Corridors_1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/header.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Corridors_1F: @ 84844C4
-	.4byte AbandonedShip_Corridors_1F_MapAttributes
+	.4byte AbandonedShip_Corridors_1F_Layout
 	.4byte AbandonedShip_Corridors_1F_MapEvents
 	.4byte AbandonedShip_Corridors_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
index 39c7861a1..39c7861a1 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_1F.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc
new file mode 100644
index 000000000..d1ee69499
--- /dev/null
+++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc
@@ -0,0 +1,20 @@
+AbandonedShip_Corridors_B1F_EventObjects: @ 8536808
+	object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0
+
+AbandonedShip_Corridors_B1F_MapWarps: @ 8536838
+	warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F
+	warp_def 3, 4, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_B1F
+	warp_def 5, 7, 3, 0, MAP_ABANDONED_SHIP_ROOMS_B1F
+	warp_def 8, 7, 3, 1, MAP_ABANDONED_SHIP_ROOMS_B1F
+	warp_def 11, 7, 3, 2, MAP_ABANDONED_SHIP_ROOMS_B1F
+	warp_def 11, 4, 3, 0, MAP_ABANDONED_SHIP_ROOM_B1F
+	warp_def 0, 2, 3, 10, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F
+
+AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878
+	bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DC8
+
+AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884
+	map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents
+
diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc
index 2205786fe..e8d5fc419 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Corridors_B1F: @ 84844FC
-	.4byte AbandonedShip_Corridors_B1F_MapAttributes
+	.4byte AbandonedShip_Corridors_B1F_Layout
 	.4byte AbandonedShip_Corridors_B1F_MapEvents
 	.4byte AbandonedShip_Corridors_B1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
new file mode 100644
index 000000000..f19dfe322
--- /dev/null
+++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
@@ -0,0 +1,91 @@
+AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84
+	map_script 5, AbandonedShip_Corridors_B1F_MapScript1_237D8F
+	map_script 1, AbandonedShip_Corridors_B1F_MapScript1_237D98
+	.byte 0
+
+AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F
+	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4
+	end
+
+AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98
+	checkflag FLAG_0x0EF
+	call_if 0, AbandonedShip_Corridors_B1F_EventScript_237DAB
+	checkflag FLAG_0x0EF
+	call_if 1, AbandonedShip_Corridors_B1F_EventScript_237DB5
+	end
+
+AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB
+	setmetatile 11, 4, 563, 1
+	return
+
+AbandonedShip_Corridors_B1F_EventScript_237DB5:: @ 8237DB5
+	setmetatile 11, 4, 555, 1
+	return
+
+AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF
+	msgbox AbandonedShip_Corridors_B1F_Text_237F03, 2
+	end
+
+AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8
+	lockall
+	checkflag FLAG_0x0EF
+	goto_eq AbandonedShip_Corridors_B1F_EventScript_237E09
+	checkitem ITEM_STORAGE_KEY, 1
+	compare VAR_RESULT, 0
+	goto_eq AbandonedShip_Corridors_B1F_EventScript_237DFF
+	msgbox AbandonedShip_Corridors_B1F_Text_237F4B, 4
+	playse SE_PIN
+	takeitem ITEM_STORAGE_KEY, 1
+	setflag FLAG_0x0EF
+	call AbandonedShip_Corridors_B1F_EventScript_237DB5
+	special DrawWholeMapView
+	releaseall
+	end
+
+AbandonedShip_Corridors_B1F_EventScript_237DFF:: @ 8237DFF
+	msgbox AbandonedShip_Corridors_B1F_Text_237F15, 4
+	releaseall
+	end
+
+AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09
+	msgbox AbandonedShip_Corridors_B1F_Text_237FA5, 4
+	releaseall
+	end
+
+AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13
+	trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80
+	msgbox AbandonedShip_Corridors_B1F_Text_237E92, 6
+	end
+
+AbandonedShip_Corridors_B1F_Text_237E2A: @ 8237E2A
+	.string "When we go out to sea, we SAILORS\n"
+	.string "always bring our POKéMON.\l"
+	.string "How about a quick battle?$"
+
+AbandonedShip_Corridors_B1F_Text_237E80: @ 8237E80
+	.string "Whoops, I’m sunk!$"
+
+AbandonedShip_Corridors_B1F_Text_237E92: @ 8237E92
+	.string "The ship’s bottom has sunk into the\n"
+	.string "depths.\p"
+	.string "If a POKéMON knew how to go underwater,\n"
+	.string "we might make some progress…$"
+
+AbandonedShip_Corridors_B1F_Text_237F03: @ 8237F03
+	.string "Yay!\n"
+	.string "It’s a ship!$"
+
+AbandonedShip_Corridors_B1F_Text_237F15: @ 8237F15
+	.string "The door is locked.\p"
+	.string "“STORAGE” is painted on the door.$"
+
+AbandonedShip_Corridors_B1F_Text_237F4B: @ 8237F4B
+	.string "{PLAYER} inserted and turned the\n"
+	.string "STORAGE KEY.\p"
+	.string "The inserted KEY stuck fast,\n"
+	.string "but the door opened.$"
+
+AbandonedShip_Corridors_B1F_Text_237FA5: @ 8237FA5
+AbandonedShip_HiddenFloorCorridors_Text_237FA5: @ 8237FA5
+	.string "The door is open.$"
+
diff --git a/data/maps/AbandonedShip_Deck/events.inc b/data/maps/AbandonedShip_Deck/events.inc
new file mode 100644
index 000000000..289f917af
--- /dev/null
+++ b/data/maps/AbandonedShip_Deck/events.inc
@@ -0,0 +1,10 @@
+AbandonedShip_Deck_MapWarps: @ 8536684
+	warp_def 13, 15, 3, 0, MAP_ROUTE108
+	warp_def 14, 15, 3, 0, MAP_ROUTE108
+	warp_def 13, 9, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 8, 9, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 12, 5, 3, 0, MAP_ABANDONED_SHIP_CAPTAINS_OFFICE
+
+AbandonedShip_Deck_MapEvents:: @ 85366AC
+	map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc
index f83905c8f..cac71c430 100644
--- a/data/maps/AbandonedShip_Deck/header.inc
+++ b/data/maps/AbandonedShip_Deck/header.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Deck: @ 84844A8
-	.4byte AbandonedShip_Deck_MapAttributes
+	.4byte AbandonedShip_Deck_Layout
 	.4byte AbandonedShip_Deck_MapEvents
 	.4byte AbandonedShip_Deck_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/scripts.inc
index 1f0c0e2f2..1f0c0e2f2 100644
--- a/data/scripts/maps/AbandonedShip_Deck.inc
+++ b/data/maps/AbandonedShip_Deck/scripts.inc
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
new file mode 100644
index 000000000..fd5cb4ac8
--- /dev/null
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
@@ -0,0 +1,17 @@
+AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC
+	warp_def 3, 8, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
+	warp_def 6, 8, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
+	warp_def 9, 8, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
+	warp_def 3, 3, 3, 6, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
+	warp_def 6, 3, 3, 7, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
+	warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
+
+AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC
+	bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A19
+	bg_event 6, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A50
+	bg_event 3, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A87
+	bg_event 9, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE
+
+AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C
+	map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents
+
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
index fc93ec42d..c03eba0b8 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
@@ -1,5 +1,5 @@
 AbandonedShip_HiddenFloorCorridors: @ 84845DC
-	.4byte AbandonedShip_HiddenFloorCorridors_MapAttributes
+	.4byte AbandonedShip_HiddenFloorCorridors_Layout
 	.4byte AbandonedShip_HiddenFloorCorridors_MapEvents
 	.4byte AbandonedShip_HiddenFloorCorridors_MapScripts
 	.4byte 0x0
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
new file mode 100644
index 000000000..2cd278f91
--- /dev/null
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
@@ -0,0 +1,171 @@
+AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C
+	map_script 5, AbandonedShip_HiddenFloorCorridors_MapScript1_238977
+	map_script 1, AbandonedShip_HiddenFloorCorridors_MapScript1_238980
+	.byte 0
+
+AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977
+	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4
+	end
+
+AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980
+	checkflag FLAG_0x0F0
+	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1
+	checkflag FLAG_0x0F1
+	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB
+	checkflag FLAG_0x0F2
+	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A05
+	checkflag FLAG_0x0F3
+	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F
+	checkflag FLAG_0x0F0
+	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
+	checkflag FLAG_0x0F1
+	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
+	checkflag FLAG_0x0F2
+	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
+	checkflag FLAG_0x0F3
+	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
+	end
+
+AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9
+	setmetatile 3, 8, 555, 1
+	return
+
+AbandonedShip_HiddenFloorCorridors_EventScript_2389D3:: @ 82389D3
+	setmetatile 6, 8, 555, 1
+	return
+
+AbandonedShip_HiddenFloorCorridors_EventScript_2389DD:: @ 82389DD
+	setmetatile 3, 3, 538, 0
+	return
+
+AbandonedShip_HiddenFloorCorridors_EventScript_2389E7:: @ 82389E7
+	setmetatile 9, 3, 538, 0
+	return
+
+AbandonedShip_HiddenFloorCorridors_EventScript_2389F1:: @ 82389F1
+	setmetatile 3, 8, 563, 1
+	return
+
+AbandonedShip_HiddenFloorCorridors_EventScript_2389FB:: @ 82389FB
+	setmetatile 6, 8, 563, 1
+	return
+
+AbandonedShip_HiddenFloorCorridors_EventScript_238A05:: @ 8238A05
+	setmetatile 3, 3, 564, 0
+	return
+
+AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F
+	setmetatile 9, 3, 564, 0
+	return
+
+AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19
+	lockall
+	checkflag FLAG_0x0F0
+	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
+	checkitem ITEM_ROOM_1_KEY, 1
+	compare VAR_RESULT, 0
+	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
+	playse SE_PIN
+	takeitem ITEM_ROOM_1_KEY, 1
+	setflag FLAG_0x0F0
+	call AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
+	special DrawWholeMapView
+	releaseall
+	end
+
+AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50
+	lockall
+	checkflag FLAG_0x0F1
+	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
+	checkitem ITEM_ROOM_2_KEY, 1
+	compare VAR_RESULT, 0
+	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
+	playse SE_PIN
+	takeitem ITEM_ROOM_2_KEY, 1
+	setflag FLAG_0x0F1
+	call AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
+	special DrawWholeMapView
+	releaseall
+	end
+
+AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87
+	lockall
+	checkflag FLAG_0x0F2
+	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
+	checkitem ITEM_ROOM_4_KEY, 1
+	compare VAR_RESULT, 0
+	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
+	playse SE_PIN
+	takeitem ITEM_ROOM_4_KEY, 1
+	setflag FLAG_0x0F2
+	call AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
+	special DrawWholeMapView
+	releaseall
+	end
+
+AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE
+	lockall
+	checkflag FLAG_0x0F3
+	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
+	checkitem ITEM_ROOM_6_KEY, 1
+	compare VAR_RESULT, 0
+	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
+	playse SE_PIN
+	takeitem ITEM_ROOM_6_KEY, 1
+	setflag FLAG_0x0F3
+	call AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
+	special DrawWholeMapView
+	releaseall
+	end
+
+AbandonedShip_HiddenFloorCorridors_EventScript_238AF5:: @ 8238AF5
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, 4
+	releaseall
+	end
+
+AbandonedShip_HiddenFloorCorridors_EventScript_238AFF:: @ 8238AFF
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, 4
+	releaseall
+	end
+
+AbandonedShip_HiddenFloorCorridors_EventScript_238B09:: @ 8238B09
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, 4
+	releaseall
+	end
+
+AbandonedShip_HiddenFloorCorridors_EventScript_238B13:: @ 8238B13
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, 4
+	releaseall
+	end
+
+AbandonedShip_HiddenFloorCorridors_EventScript_238B1D:: @ 8238B1D
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, 4
+	releaseall
+	end
+
+AbandonedShip_HiddenFloorCorridors_Text_238B27: @ 8238B27
+	.string "The door is locked.\p"
+	.string "“RM. 1” is painted on the door.$"
+
+AbandonedShip_HiddenFloorCorridors_Text_238B5B: @ 8238B5B
+	.string "The door is locked.\p"
+	.string "“RM. 2” is painted on the door.$"
+
+AbandonedShip_HiddenFloorCorridors_Text_238B8F: @ 8238B8F
+	.string "The door is locked.\p"
+	.string "“RM. 4” is painted on the door.$"
+
+AbandonedShip_HiddenFloorCorridors_Text_238BC3: @ 8238BC3
+	.string "The door is locked.\p"
+	.string "“RM. 6” is painted on the door.$"
+
+AbandonedShip_HiddenFloorCorridors_Text_238BF7: @ 8238BF7
+	.string "{PLAYER} inserted and turned the\n"
+	.string "KEY.\p"
+	.string "The inserted KEY stuck fast,\n"
+	.string "but the door opened.$"
+
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
new file mode 100644
index 000000000..e352635a5
--- /dev/null
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
@@ -0,0 +1,32 @@
+AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101
+
+AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
+	warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 7, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 21, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 22, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 36, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 37, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 6, 1, 3, 3, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 21, 1, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+
+AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8
+	bg_event 42, 10, 3, 7, 0, ITEM_ROOM_1_KEY, 31, 0
+	bg_event 20, 5, 3, 7, 0, ITEM_ROOM_2_KEY, 32, 0
+	bg_event 1, 12, 3, 7, 0, ITEM_ROOM_4_KEY, 33, 0
+	bg_event 1, 2, 0, 7, 0, ITEM_ROOM_6_KEY, 34, 0
+	bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+	bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+	bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+	bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+	bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+	bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+
+AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60
+	map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents
+
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
index cb8f99732..efa3a0bb9 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
@@ -1,5 +1,5 @@
 AbandonedShip_HiddenFloorRooms: @ 84845F8
-	.4byte AbandonedShip_HiddenFloorRooms_MapAttributes
+	.4byte AbandonedShip_HiddenFloorRooms_Layout
 	.4byte AbandonedShip_HiddenFloorRooms_MapEvents
 	.4byte AbandonedShip_HiddenFloorRooms_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
index 701b79fbf..701b79fbf 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc
new file mode 100644
index 000000000..1f1cab59a
--- /dev/null
+++ b/data/maps/AbandonedShip_Room_B1F/events.inc
@@ -0,0 +1,10 @@
+AbandonedShip_Room_B1F_EventObjects: @ 853697C
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098
+
+AbandonedShip_Room_B1F_MapWarps: @ 8536994
+	warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+
+AbandonedShip_Room_B1F_MapEvents:: @ 85369A4
+	map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc
index 68b484f68..e2021ea85 100644
--- a/data/maps/AbandonedShip_Room_B1F/header.inc
+++ b/data/maps/AbandonedShip_Room_B1F/header.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Room_B1F: @ 848456C
-	.4byte AbandonedShip_Room_B1F_MapAttributes
+	.4byte AbandonedShip_Room_B1F_Layout
 	.4byte AbandonedShip_Room_B1F_MapEvents
 	.4byte AbandonedShip_Room_B1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/scripts.inc
index 5dd7a2bad..5dd7a2bad 100644
--- a/data/scripts/maps/AbandonedShip_Room_B1F.inc
+++ b/data/maps/AbandonedShip_Room_B1F/scripts.inc
diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc
new file mode 100644
index 000000000..7dfb4d059
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099
+	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, 10, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0
+	object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, 9, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0
+
+AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30
+	warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 5, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F
+
+AbandonedShip_Rooms2_1F_MapEvents:: @ 8536A48
+	map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc
index d712be55f..227bf3e8f 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Rooms2_1F: @ 8484588
-	.4byte AbandonedShip_Rooms2_1F_MapAttributes
+	.4byte AbandonedShip_Rooms2_1F_Layout
 	.4byte AbandonedShip_Rooms2_1F_MapEvents
 	.4byte AbandonedShip_Rooms2_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
index 2ffe3afc7..2ffe3afc7 100644
--- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc
new file mode 100644
index 000000000..40e4600af
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc
@@ -0,0 +1,13 @@
+AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097
+
+AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
+	warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 5, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 13, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+
+AbandonedShip_Rooms2_B1F_MapEvents:: @ 8536944
+	map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
index 1b5cbb68a..55d228f47 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Rooms2_B1F: @ 8484534
-	.4byte AbandonedShip_Rooms2_B1F_MapAttributes
+	.4byte AbandonedShip_Rooms2_B1F_Layout
 	.4byte AbandonedShip_Rooms2_B1F_MapEvents
 	.4byte AbandonedShip_Rooms2_B1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
index 00b3d0fb9..00b3d0fb9 100644
--- a/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc
new file mode 100644
index 000000000..072892b0a
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms_1F/events.inc
@@ -0,0 +1,17 @@
+AbandonedShip_Rooms_1F_EventObjects: @ 8536764
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095
+	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, 8, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, 16, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0
+
+AbandonedShip_Rooms_1F_MapWarps: @ 85367C4
+	warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 5, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 4, 1, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 13, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 13, 1, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F
+
+AbandonedShip_Rooms_1F_MapEvents:: @ 85367F4
+	map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc
index 68dbcbbdb..62991d12e 100644
--- a/data/maps/AbandonedShip_Rooms_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/header.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Rooms_1F: @ 84844E0
-	.4byte AbandonedShip_Rooms_1F_MapAttributes
+	.4byte AbandonedShip_Rooms_1F_Layout
 	.4byte AbandonedShip_Rooms_1F_MapEvents
 	.4byte AbandonedShip_Rooms_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
index 2a6bc36b6..2a6bc36b6 100644
--- a/data/scripts/maps/AbandonedShip_Rooms_1F.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc
new file mode 100644
index 000000000..50bc7c0ee
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc
@@ -0,0 +1,12 @@
+AbandonedShip_Rooms_B1F_EventObjects: @ 8536898
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096
+
+AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
+	warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 13, 1, 3, 3, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+
+AbandonedShip_Rooms_B1F_MapEvents:: @ 85368E0
+	map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc
index 219410a9f..7838b8875 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Rooms_B1F: @ 8484518
-	.4byte AbandonedShip_Rooms_B1F_MapAttributes
+	.4byte AbandonedShip_Rooms_B1F_Layout
 	.4byte AbandonedShip_Rooms_B1F_MapEvents
 	.4byte AbandonedShip_Rooms_B1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
new file mode 100644
index 000000000..d4a5c9233
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
@@ -0,0 +1,18 @@
+AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7
+	map_script 5, AbandonedShip_Rooms_B1F_MapScript1_237FBD
+	.byte 0
+
+AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD
+	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4
+	end
+
+AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6
+	msgbox AbandonedShip_Rooms_B1F_Text_237FCF, 2
+	end
+
+AbandonedShip_Rooms_B1F_Text_237FCF: @ 8237FCF
+	.string "Urrrrppp…\p"
+	.string "I’m getting queasy just being aboard\n"
+	.string "this ship…\p"
+	.string "It’s not even moving, but…$"
+
diff --git a/data/maps/AbandonedShip_Underwater1/events.inc b/data/maps/AbandonedShip_Underwater1/events.inc
new file mode 100644
index 000000000..5c9af3c10
--- /dev/null
+++ b/data/maps/AbandonedShip_Underwater1/events.inc
@@ -0,0 +1,7 @@
+AbandonedShip_Underwater1_MapWarps: @ 8536958
+	warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2
+	warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2
+
+AbandonedShip_Underwater1_MapEvents:: @ 8536968
+	map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc
index b314f5028..cc9db3443 100644
--- a/data/maps/AbandonedShip_Underwater1/header.inc
+++ b/data/maps/AbandonedShip_Underwater1/header.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Underwater1: @ 8484550
-	.4byte AbandonedShip_Underwater1_MapAttributes
+	.4byte AbandonedShip_Underwater1_Layout
 	.4byte AbandonedShip_Underwater1_MapEvents
 	.4byte AbandonedShip_Underwater1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc
new file mode 100644
index 000000000..7e39b1939
--- /dev/null
+++ b/data/maps/AbandonedShip_Underwater1/scripts.inc
@@ -0,0 +1,8 @@
+AbandonedShip_Underwater1_MapScripts:: @ 8238096
+	map_script 5, AbandonedShip_Underwater1_MapScript1_23809C
+	.byte 0
+
+AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C
+	setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10
+	end
+
diff --git a/data/maps/AbandonedShip_Underwater2/events.inc b/data/maps/AbandonedShip_Underwater2/events.inc
new file mode 100644
index 000000000..f06c21b2a
--- /dev/null
+++ b/data/maps/AbandonedShip_Underwater2/events.inc
@@ -0,0 +1,6 @@
+AbandonedShip_Underwater2_MapWarps: @ 8536AB0
+	warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1
+
+AbandonedShip_Underwater2_MapEvents:: @ 8536AB8
+	map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc
index 3f15871b7..87650f5b2 100644
--- a/data/maps/AbandonedShip_Underwater2/header.inc
+++ b/data/maps/AbandonedShip_Underwater2/header.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Underwater2: @ 84845C0
-	.4byte AbandonedShip_Underwater2_MapAttributes
+	.4byte AbandonedShip_Underwater2_Layout
 	.4byte AbandonedShip_Underwater2_MapEvents
 	.4byte AbandonedShip_Underwater2_MapScripts
 	.4byte 0x0
diff --git a/data/maps/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc
new file mode 100644
index 000000000..17f52c691
--- /dev/null
+++ b/data/maps/AbandonedShip_Underwater2/scripts.inc
@@ -0,0 +1,8 @@
+AbandonedShip_Underwater2_MapScripts:: @ 823895D
+	map_script 5, AbandonedShip_Underwater2_MapScript1_238963
+	.byte 0
+
+AbandonedShip_Underwater2_MapScript1_238963: @ 8238963
+	setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7
+	end
+
diff --git a/data/maps/AlteringCave/events.inc b/data/maps/AlteringCave/events.inc
new file mode 100644
index 000000000..898038715
--- /dev/null
+++ b/data/maps/AlteringCave/events.inc
@@ -0,0 +1,6 @@
+AlteringCave_MapWarps: @ 8537894
+	warp_def 18, 22, 0, 0, MAP_ROUTE103
+
+AlteringCave_MapEvents:: @ 853789C
+	map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc
index 98a23f76a..2361bf769 100644
--- a/data/maps/AlteringCave/header.inc
+++ b/data/maps/AlteringCave/header.inc
@@ -1,5 +1,5 @@
 AlteringCave: @ 8484A58
-	.4byte AlteringCave_MapAttributes
+	.4byte AlteringCave_Layout
 	.4byte AlteringCave_MapEvents
 	.4byte AlteringCave_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AlteringCave.inc b/data/maps/AlteringCave/scripts.inc
index a9faddc36..a9faddc36 100644
--- a/data/scripts/maps/AlteringCave.inc
+++ b/data/maps/AlteringCave/scripts.inc
diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc
new file mode 100644
index 000000000..4950be4ac
--- /dev/null
+++ b/data/maps/AncientTomb/events.inc
@@ -0,0 +1,16 @@
+AncientTomb_EventObjects: @ 8536CDC
+	object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937
+
+AncientTomb_MapWarps: @ 8536CF4
+	warp_def 8, 29, 3, 0, MAP_ROUTE120
+	warp_def 8, 20, 0, 2, MAP_ANCIENT_TOMB
+	warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB
+
+AncientTomb_MapBGEvents: @ 8536D0C
+	bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_239033
+	bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_239050
+	bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_239050
+
+AncientTomb_MapEvents:: @ 8536D30
+	map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents
+
diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc
index 2d384b07b..5e958c6bd 100644
--- a/data/maps/AncientTomb/header.inc
+++ b/data/maps/AncientTomb/header.inc
@@ -1,5 +1,5 @@
 AncientTomb: @ 8484630
-	.4byte AncientTomb_MapAttributes
+	.4byte AncientTomb_Layout
 	.4byte AncientTomb_MapEvents
 	.4byte AncientTomb_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AncientTomb.inc b/data/maps/AncientTomb/scripts.inc
index 3cd0b9eff..3cd0b9eff 100644
--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/maps/AncientTomb/scripts.inc
diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc
new file mode 100644
index 000000000..7d0befd16
--- /dev/null
+++ b/data/maps/AquaHideout_1F/events.inc
@@ -0,0 +1,13 @@
+AquaHideout_1F_EventObjects: @ 8535304
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, 50, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924
+
+AquaHideout_1F_MapWarps: @ 853534C
+	warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY
+	warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY
+	warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F
+
+AquaHideout_1F_MapEvents:: @ 8535364
+	map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc
index d2f8601bf..afbba5738 100644
--- a/data/maps/AquaHideout_1F/header.inc
+++ b/data/maps/AquaHideout_1F/header.inc
@@ -1,5 +1,5 @@
 AquaHideout_1F: @ 8484144
-	.4byte AquaHideout_1F_MapAttributes
+	.4byte AquaHideout_1F_Layout
 	.4byte AquaHideout_1F_MapEvents
 	.4byte AquaHideout_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/scripts.inc
index 9172c3927..9172c3927 100644
--- a/data/scripts/maps/AquaHideout_1F.inc
+++ b/data/maps/AquaHideout_1F/scripts.inc
diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc
new file mode 100644
index 000000000..31108fa9c
--- /dev/null
+++ b/data/maps/AquaHideout_B1F/events.inc
@@ -0,0 +1,41 @@
+AquaHideout_B1F_EventObjects: @ 8535378
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978
+	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, 7, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924
+
+AquaHideout_B1F_MapWarps: @ 8535450
+	warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F
+	warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F
+	warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F
+	warp_def 3, 3, 3, 2, MAP_AQUA_HIDEOUT_B2F
+	warp_def 31, 4, 3, 7, MAP_AQUA_HIDEOUT_B1F
+	warp_def 27, 4, 3, 8, MAP_AQUA_HIDEOUT_B1F
+	warp_def 20, 4, 3, 10, MAP_AQUA_HIDEOUT_B1F
+	warp_def 27, 12, 3, 4, MAP_AQUA_HIDEOUT_B1F
+	warp_def 3, 15, 3, 5, MAP_AQUA_HIDEOUT_B1F
+	warp_def 3, 20, 3, 12, MAP_AQUA_HIDEOUT_B1F
+	warp_def 32, 19, 3, 6, MAP_AQUA_HIDEOUT_B1F
+	warp_def 23, 10, 3, 22, MAP_AQUA_HIDEOUT_B1F
+	warp_def 45, 3, 3, 9, MAP_AQUA_HIDEOUT_B1F
+	warp_def 42, 5, 3, 18, MAP_AQUA_HIDEOUT_B1F
+	warp_def 45, 5, 3, 12, MAP_AQUA_HIDEOUT_B1F
+	warp_def 48, 5, 3, 16, MAP_AQUA_HIDEOUT_B1F
+	warp_def 42, 9, 3, 15, MAP_AQUA_HIDEOUT_B1F
+	warp_def 45, 9, 3, 20, MAP_AQUA_HIDEOUT_B1F
+	warp_def 48, 9, 3, 13, MAP_AQUA_HIDEOUT_B1F
+	warp_def 42, 13, 3, 24, MAP_AQUA_HIDEOUT_B1F
+	warp_def 45, 13, 3, 17, MAP_AQUA_HIDEOUT_B1F
+	warp_def 48, 13, 3, 12, MAP_AQUA_HIDEOUT_B1F
+	warp_def 42, 17, 3, 11, MAP_AQUA_HIDEOUT_B1F
+	warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F
+	warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F
+
+AquaHideout_B1F_MapEvents:: @ 8535518
+	map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc
index e5a70a5c0..079c18ee9 100644
--- a/data/maps/AquaHideout_B1F/header.inc
+++ b/data/maps/AquaHideout_B1F/header.inc
@@ -1,5 +1,5 @@
 AquaHideout_B1F: @ 8484160
-	.4byte AquaHideout_B1F_MapAttributes
+	.4byte AquaHideout_B1F_Layout
 	.4byte AquaHideout_B1F_MapEvents
 	.4byte AquaHideout_B1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/scripts.inc
index cf59bdacc..cf59bdacc 100644
--- a/data/scripts/maps/AquaHideout_B1F.inc
+++ b/data/maps/AquaHideout_B1F/scripts.inc
diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc
new file mode 100644
index 000000000..eca22f5f7
--- /dev/null
+++ b/data/maps/AquaHideout_B2F/events.inc
@@ -0,0 +1,27 @@
+AquaHideout_B2F_EventObjects: @ 853552C
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, 45, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072
+	object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, 10, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, 9, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924
+
+AquaHideout_B2F_MapWarps: @ 85355BC
+	warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F
+	warp_def 12, 1, 3, 2, MAP_AQUA_HIDEOUT_B1F
+	warp_def 3, 3, 3, 3, MAP_AQUA_HIDEOUT_B1F
+	warp_def 31, 8, 3, 5, MAP_AQUA_HIDEOUT_B2F
+	warp_def 8, 8, 3, 8, MAP_AQUA_HIDEOUT_B2F
+	warp_def 5, 8, 3, 3, MAP_AQUA_HIDEOUT_B2F
+	warp_def 18, 13, 3, 7, MAP_AQUA_HIDEOUT_B2F
+	warp_def 12, 13, 3, 6, MAP_AQUA_HIDEOUT_B2F
+	warp_def 31, 17, 3, 4, MAP_AQUA_HIDEOUT_B2F
+	warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F
+
+AquaHideout_B2F_MapCoordEvents: @ 853560C
+	coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5
+	coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5
+
+AquaHideout_B2F_MapEvents:: @ 853562C
+	map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0
+
diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc
index 0f3849799..8089a1634 100644
--- a/data/maps/AquaHideout_B2F/header.inc
+++ b/data/maps/AquaHideout_B2F/header.inc
@@ -1,5 +1,5 @@
 AquaHideout_B2F: @ 848417C
-	.4byte AquaHideout_B2F_MapAttributes
+	.4byte AquaHideout_B2F_Layout
 	.4byte AquaHideout_B2F_MapEvents
 	.4byte AquaHideout_B2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/scripts.inc
index fd3868512..fd3868512 100644
--- a/data/scripts/maps/AquaHideout_B2F.inc
+++ b/data/maps/AquaHideout_B2F/scripts.inc
diff --git a/data/maps/events/AquaHideout_UnusedRubyMap1.inc b/data/maps/AquaHideout_UnusedRubyMap1/events.inc
index 45663b68f..45663b68f 100644
--- a/data/maps/events/AquaHideout_UnusedRubyMap1.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap1/events.inc
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
index b32ecf901..a643b729e 100644
--- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
@@ -1,5 +1,5 @@
 AquaHideout_UnusedRubyMap1: @ 84846D8
-	.4byte AquaHideout_UnusedRubyMap1_MapAttributes
+	.4byte AquaHideout_UnusedRubyMap1_Layout
 	.4byte AquaHideout_UnusedRubyMap1_MapEvents
 	.4byte AquaHideout_UnusedRubyMap1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap1.inc b/data/maps/AquaHideout_UnusedRubyMap1/scripts.inc
index 73cde82a9..73cde82a9 100644
--- a/data/scripts/maps/AquaHideout_UnusedRubyMap1.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap1/scripts.inc
diff --git a/data/maps/events/AquaHideout_UnusedRubyMap2.inc b/data/maps/AquaHideout_UnusedRubyMap2/events.inc
index 6f53de284..6f53de284 100644
--- a/data/maps/events/AquaHideout_UnusedRubyMap2.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap2/events.inc
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
index dec1a5311..bb82dba18 100644
--- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
@@ -1,5 +1,5 @@
 AquaHideout_UnusedRubyMap2: @ 84846F4
-	.4byte AquaHideout_UnusedRubyMap2_MapAttributes
+	.4byte AquaHideout_UnusedRubyMap2_Layout
 	.4byte AquaHideout_UnusedRubyMap2_MapEvents
 	.4byte AquaHideout_UnusedRubyMap2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap2.inc b/data/maps/AquaHideout_UnusedRubyMap2/scripts.inc
index 28901497a..28901497a 100644
--- a/data/scripts/maps/AquaHideout_UnusedRubyMap2.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap2/scripts.inc
diff --git a/data/maps/events/AquaHideout_UnusedRubyMap3.inc b/data/maps/AquaHideout_UnusedRubyMap3/events.inc
index 8a23a3786..8a23a3786 100644
--- a/data/maps/events/AquaHideout_UnusedRubyMap3.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap3/events.inc
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
index a2383a4a6..1fa34aab4 100644
--- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
@@ -1,5 +1,5 @@
 AquaHideout_UnusedRubyMap3: @ 8484710
-	.4byte AquaHideout_UnusedRubyMap3_MapAttributes
+	.4byte AquaHideout_UnusedRubyMap3_Layout
 	.4byte AquaHideout_UnusedRubyMap3_MapEvents
 	.4byte AquaHideout_UnusedRubyMap3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap3.inc b/data/maps/AquaHideout_UnusedRubyMap3/scripts.inc
index de0e6d7dd..de0e6d7dd 100644
--- a/data/scripts/maps/AquaHideout_UnusedRubyMap3.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap3/scripts.inc
diff --git a/data/maps/ArtisanCave_1F/events.inc b/data/maps/ArtisanCave_1F/events.inc
new file mode 100644
index 000000000..edd7429a3
--- /dev/null
+++ b/data/maps/ArtisanCave_1F/events.inc
@@ -0,0 +1,10 @@
+ArtisanCave_1F_EventObjects: @ 8537774
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163
+
+ArtisanCave_1F_MapWarps: @ 853778C
+	warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+	warp_def 6, 5, 0, 1, MAP_ARTISAN_CAVE_B1F
+
+ArtisanCave_1F_MapEvents:: @ 853779C
+	map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc
index 1c363e7c9..a8d91737e 100644
--- a/data/maps/ArtisanCave_1F/header.inc
+++ b/data/maps/ArtisanCave_1F/header.inc
@@ -1,5 +1,5 @@
 ArtisanCave_1F: @ 84849B0
-	.4byte ArtisanCave_1F_MapAttributes
+	.4byte ArtisanCave_1F_Layout
 	.4byte ArtisanCave_1F_MapEvents
 	.4byte ArtisanCave_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/ArtisanCave_1F.inc b/data/maps/ArtisanCave_1F/scripts.inc
index 18090ff68..18090ff68 100644
--- a/data/scripts/maps/ArtisanCave_1F.inc
+++ b/data/maps/ArtisanCave_1F/scripts.inc
diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc
new file mode 100644
index 000000000..a0b96c316
--- /dev/null
+++ b/data/maps/ArtisanCave_B1F/events.inc
@@ -0,0 +1,16 @@
+ArtisanCave_B1F_EventObjects: @ 8537708
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, 1, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162
+
+ArtisanCave_B1F_MapWarps: @ 8537720
+	warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+	warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F
+
+ArtisanCave_B1F_MapBGEvents: @ 8537730
+	bg_event 32, 29, 0, 7, 0, ITEM_ZINC, 102, 0
+	bg_event 27, 8, 0, 7, 0, ITEM_CALCIUM, 101, 0
+	bg_event 7, 5, 0, 7, 0, ITEM_PROTEIN, 103, 0
+	bg_event 19, 43, 0, 7, 0, ITEM_IRON, 104, 0
+
+ArtisanCave_B1F_MapEvents:: @ 8537760
+	map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents
+
diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc
index 844f627c1..a82cd93f6 100644
--- a/data/maps/ArtisanCave_B1F/header.inc
+++ b/data/maps/ArtisanCave_B1F/header.inc
@@ -1,5 +1,5 @@
 ArtisanCave_B1F: @ 8484994
-	.4byte ArtisanCave_B1F_MapAttributes
+	.4byte ArtisanCave_B1F_Layout
 	.4byte ArtisanCave_B1F_MapEvents
 	.4byte ArtisanCave_B1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/ArtisanCave_B1F.inc b/data/maps/ArtisanCave_B1F/scripts.inc
index 059343a56..059343a56 100644
--- a/data/scripts/maps/ArtisanCave_B1F.inc
+++ b/data/maps/ArtisanCave_B1F/scripts.inc
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
new file mode 100644
index 000000000..ce6eeb952
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
@@ -0,0 +1,14 @@
+BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, 7, 1, 1, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, 7, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, 10, 1, 1, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, 9, 1, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, 9, 1, 1, 0, 0, 0x0, 0
+	object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, 10, 1, 1, 0, 0, 0x0, 0
+	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, 8, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4
+	map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
index 19e6f0413..7a8afda58 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleArenaBattleRoom: @ 8485484
-	.4byte BattleFrontier_BattleArenaBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattleArenaBattleRoom_Layout
 	.4byte BattleFrontier_BattleArenaBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleArenaBattleRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
new file mode 100644
index 000000000..076eeab6e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
@@ -0,0 +1,712 @@
+BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487
+	map_script 3, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0
+	map_script 2, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2
+	map_script 4, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C
+	map_script 5, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C
+	.byte 0
+
+BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C
+	special sub_8139980
+	end
+
+BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
+	setvar VAR_0x8004, 5
+	special sub_81A1780
+	call BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE
+	end
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC
+	return
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6
+	setvar VAR_OBJ_GFX_ID_1, 100
+	return
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC:: @ 82574CC
+	setvar VAR_OBJ_GFX_ID_1, 105
+	return
+
+BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC
+	.2byte 0
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC
+	lockall
+	showobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
+	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE2
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E
+	applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08
+	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB
+	setvar VAR_TEMP_2, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E
+	setvar VAR_0x8004, 3
+	special sub_8161F74
+	addobject 7
+	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BEF
+	waitmovement 0
+	applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
+	playse SE_W187
+	waitse
+	waitmovement 0
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, 4
+	closemessage
+	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5
+	waitmovement 0
+	applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
+	playse SE_W187
+	waitse
+	waitmovement 0
+	setvar VAR_0x8004, 6
+	special sub_81A5238
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C68, 4
+	closemessage
+	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2
+	waitmovement 0
+	applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
+	playse SE_W187
+	waitse
+	waitmovement 0
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, 4
+	closemessage
+	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5
+	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2
+	waitmovement 0
+	setvar VAR_0x8004, 5
+	special sub_8195960
+	msgbox 0x2021fc4, 4
+	waitmessage
+	call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257630
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB:: @ 82575DB
+	applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
+	applymovement 1, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
+	applymovement 2, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
+	applymovement 3, BattleFrontier_BattleArenaBattleRoom_Movement_257C05
+	applymovement 4, BattleFrontier_BattleArenaBattleRoom_Movement_257C05
+	playse SE_W173
+	waitse
+	waitmovement 0
+	setvar VAR_0x8004, 6
+	special sub_81A5238
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, 4
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 4
+	special sub_81A1780
+	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
+	waitstate
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
+	call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	addvar VAR_RESULT, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	switch VAR_RESULT
+	case 7, BattleFrontier_BattleArenaBattleRoom_EventScript_257852
+	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE7
+	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BFA
+	waitmovement 0
+	removeobject 7
+	applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08
+	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB
+	waitmovement 0
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, 4
+	special LoadPlayerParty
+	special SavePlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0
+	setvar VAR_0x8004, 9
+	special sub_81A1780
+	copyvar VAR_TEMP_F, VAR_RESULT
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870
+	compare VAR_RESULT, 2
+	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257877
+	compare VAR_RESULT, 3
+	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25787E
+	compare VAR_RESULT, 4
+	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257885
+	compare VAR_RESULT, 5
+	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25788C
+	compare VAR_RESULT, 6
+	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257893
+	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768
+	multichoice 19, 4, 103, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A
+	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25779E
+	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA
+	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257808
+	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257768:: @ 8257768
+	multichoice 20, 6, 104, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A
+	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA
+	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257808
+	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_25779E:: @ 825779E
+	message BattleFrontier_BattleArenaBattleRoom_Text_257F04
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0
+	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0:: @ 82577D0
+	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4
+	goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA:: @ 82577DA
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257E6B, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25789A
+	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257808:: @ 8257808
+	message BattleFrontier_BattleArenaBattleRoom_Text_257E9E
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257615
+	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_25783A:: @ 825783A
+	closemessage
+	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BED
+	applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257BED
+	waitmovement 0
+	goto BattleFrontier_BattleArenaBattleRoom_EventScript_25752E
+	waitstate
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852
+	delay 60
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 3
+	special sub_81A1780
+	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
+	waitstate
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257870:: @ 8257870
+	message BattleFrontier_BattleArenaBattleRoom_Text_257D17
+	waitmessage
+	return
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257877:: @ 8257877
+	message BattleFrontier_BattleArenaBattleRoom_Text_257D50
+	waitmessage
+	return
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_25787E:: @ 825787E
+	message BattleFrontier_BattleArenaBattleRoom_Text_257D88
+	waitmessage
+	return
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257885:: @ 8257885
+	message BattleFrontier_BattleArenaBattleRoom_Text_257DC1
+	waitmessage
+	return
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_25788C:: @ 825788C
+	message BattleFrontier_BattleArenaBattleRoom_Text_257DF9
+	waitmessage
+	return
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257893:: @ 8257893
+	message BattleFrontier_BattleArenaBattleRoom_Text_257E31
+	waitmessage
+	return
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A
+	message BattleFrontier_BattleArenaBattleRoom_Text_257EDB
+	waitmessage
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 2
+	special sub_81A5238
+	playse SE_SAVE
+	waitse
+	fadescreen 1
+	setvar VAR_0x8004, 4
+	special sub_81A1780
+	end
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC
+	compare VAR_TEMP_2, 1
+	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, 4
+	setvar VAR_TEMP_2, 1
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4
+	message BattleFrontier_BattleArenaBattleRoom_Text_257FBB
+	waitmessage
+	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B
+	multichoice 19, 4, 103, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961
+	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25779E
+	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA
+	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257808
+	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_25792B:: @ 825792B
+	multichoice 20, 6, 104, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961
+	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA
+	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257808
+	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961
+	call BattleFrontier_BattleArenaBattleRoom_EventScript_242170
+	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BED
+	applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257BED
+	waitmovement 0
+	applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
+	playse SE_W187
+	waitse
+	waitmovement 0
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, 4
+	closemessage
+	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE4
+	waitmovement 0
+	applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
+	playse SE_W187
+	waitse
+	waitmovement 0
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257FED, 4
+	closemessage
+	addobject 7
+	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF4
+	waitmovement 0
+	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2
+	waitmovement 0
+	switch VAR_TEMP_F
+	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5
+	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
+	case 4, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, 4
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30
+	waitmovement 0
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, 4
+	closemessage
+	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A
+	waitmovement 0
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_258068, 4
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, 4
+	call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C
+	goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
+	call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
+	setvar VAR_0x8004, 12
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852
+	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
+	waitmovement 0
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, 4
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattleArenaBattleRoom_Text_25819C
+	waitmessage
+	waitfanfare
+	setvar VAR_0x8004, 13
+	special sub_81A1780
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, 4
+	goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, 4
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30
+	waitmovement 0
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, 4
+	closemessage
+	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A
+	waitmovement 0
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582BB, 4
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, 4
+	call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15
+	goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
+	call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
+	setvar VAR_0x8004, 12
+	special sub_81A1780
+	compare VAR_RESULT, 2
+	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852
+	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
+	waitmovement 0
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, 4
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattleArenaBattleRoom_Text_25835B
+	waitmessage
+	waitfanfare
+	setvar VAR_0x8004, 13
+	special sub_81A1780
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, 4
+	goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E:: @ 8257B5E
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, 4
+	call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C
+	return
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C:: @ 8257B6C
+FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C
+	closemessage
+	setvar VAR_TEMP_2, 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special HealPlayerParty
+	setvar VAR_0x8004, 5
+	setvar VAR_0x8005, 0
+	special sub_8163AC4
+	waitstate
+	setvar VAR_0x8004, 18
+	special sub_81A1780
+	special HealPlayerParty
+	setvar VAR_0x8004, 21
+	special sub_81A1780
+	return
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9
+	applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
+	applymovement 1, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
+	applymovement 2, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
+	applymovement 3, BattleFrontier_BattleArenaBattleRoom_Movement_257C05
+	applymovement 4, BattleFrontier_BattleArenaBattleRoom_Movement_257C05
+	playse SE_BAN
+	waitse
+	waitmovement 0
+	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CB3, 4
+	closemessage
+	call BattleFrontier_BattleArenaBattleRoom_EventScript_241EBA
+	return
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257BE2: @ 8257BE2
+	walk_right
+	walk_right
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257BE4: @ 8257BE4
+	walk_right
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257BE5: @ 8257BE5
+	walk_right
+	step_end
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257BE7: @ 8257BE7
+	walk_left
+	walk_left
+	walk_in_place_fastest_right
+	step_end
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257BEB: @ 8257BEB
+	walk_in_place_fastest_up
+	step_end
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257BED: @ 8257BED
+	walk_in_place_fastest_right
+	step_end
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257BEF: @ 8257BEF
+	walk_left
+	walk_left
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257BF1: @ 8257BF1
+	walk_left
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257BF2: @ 8257BF2
+	walk_left
+	step_end
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257BF4: @ 8257BF4
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	step_end
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257BFA: @ 8257BFA
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257C02: @ 8257C02
+	disable_jump_landing_ground_effect
+	jump_in_place_down
+	step_end
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257C05: @ 8257C05
+	disable_jump_landing_ground_effect
+	jump_in_place_up
+	step_end
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257C08: @ 8257C08
+	walk_in_place_fastest_down
+	step_end
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257C0A: @ 8257C0A
+	walk_in_place_fastest_right
+	step_end
+
+BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C: @ 8257C0C
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257C16
+	.2byte 0
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16
+	hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
+	removeobject 7
+	call BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC
+	applymovement 255, BattleFrontier_BattleArenaBattleRoom_Movement_24C773
+	setvar VAR_TEMP_1, 1
+	end
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257C30: @ 8257C30
+	walk_down
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	step_end
+
+BattleFrontier_BattleArenaBattleRoom_Movement_257C3A: @ 8257C3A
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+BattleFrontier_BattleArenaBattleRoom_Text_257C3D: @ 8257C3D
+	.string "REFEREE: TRAINER {PLAYER}!\n"
+	.string "Step forward, please!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257C68: @ 8257C68
+	.string "REFEREE: TRAINER {STR_VAR_1}!\n"
+	.string "Step forward, please!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257C93: @ 8257C93
+FallarborTown_BattleTentBattleRoom_Text_257C93: @ 8257C93
+	.string "REFEREE: Set KO Tourney!\n"
+	.string "Begin!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257CB3: @ 8257CB3
+FallarborTown_BattleTentBattleRoom_Text_257CB3: @ 8257CB3
+	.string "REFEREE: The winner is {PLAYER}!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257CCE: @ 8257CCE
+FallarborTown_BattleTentBattleRoom_Text_257CCE: @ 8257CCE
+	.string "REFEREE: The winner is {STR_VAR_1}!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257CE9: @ 8257CE9
+FallarborTown_BattleTentBattleRoom_Text_257CE9: @ 8257CE9
+	.string "Your POKéMON will be restored to\n"
+	.string "full health.$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257D17: @ 8257D17
+FallarborTown_BattleTentBattleRoom_Text_257D17: @ 8257D17
+	.string "Next up, your second opponent!\n"
+	.string "Are you ready to move on?$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257D50: @ 8257D50
+FallarborTown_BattleTentBattleRoom_Text_257D50: @ 8257D50
+	.string "Next up, your third opponent!\n"
+	.string "Are you ready to move on?$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257D88: @ 8257D88
+	.string "Next up, your fourth opponent!\n"
+	.string "Are you ready to move on?$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257DC1: @ 8257DC1
+	.string "Next up, your fifth opponent!\n"
+	.string "Are you ready to move on?$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257DF9: @ 8257DF9
+	.string "Next up, your sixth opponent!\n"
+	.string "Are you ready to move on?$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257E31: @ 8257E31
+	.string "Next up, your seventh opponent!\n"
+	.string "Are you ready to move on?$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257E6B: @ 8257E6B
+FallarborTown_BattleTentBattleRoom_Text_257E6B: @ 8257E6B
+	.string "Would you like to save the game and\n"
+	.string "shut down now?$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257E9E: @ 8257E9E
+FallarborTown_BattleTentBattleRoom_Text_257E9E: @ 8257E9E
+	.string "Would you like to retire from your\n"
+	.string "Set KO Tourney challenge?$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257EDB: @ 8257EDB
+FallarborTown_BattleTentBattleRoom_Text_257EDB: @ 8257EDB
+	.string "I am saving your game data.\n"
+	.string "Please wait.$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257F04: @ 8257F04
+	.string "Would you like to record your last\n"
+	.string "battle on your FRONTIER PASS?$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257F45: @ 8257F45
+	.string "My dear challenger!\p"
+	.string "Your skill level is truly astounding!\p"
+	.string "We now would like you to face our\n"
+	.string "leader, the ARENA TYCOON!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257FBB: @ 8257FBB
+	.string "A battle with the ARENA TYCOON!\n"
+	.string "Are you prepared?$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_257FED: @ 8257FED
+	.string "REFEREE: The ARENA TYCOON!\n"
+	.string "Make way for GRETA!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_25801C: @ 825801C
+	.string "GRETA: Hey!\n"
+	.string "Howdy!\p"
+	.string "…Wait, are you the challenger?$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_25804E: @ 825804E
+	.string "Is that right? Hmm…\n"
+	.string "Hmhm…$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_258068: @ 8258068
+	.string "I don’t know how to say it, but…\n"
+	.string "To put it bluntly, you look pretty weak.\l"
+	.string "Are you sure you’re up for me?\p"
+	.string "Hmm…\p"
+	.string "Well, all right!\n"
+	.string "We’ll take things easy to start with!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_25810D: @ 825810D
+	.string "Okay! Let’s see you ignite my passion\n"
+	.string "for battle!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_25813F: @ 825813F
+	.string "GRETA: Ow, wait a second!\n"
+	.string "You are tough after all!\p"
+	.string "I like you!\n"
+	.string "Let’s see your FRONTIER PASS.$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_25819C: @ 825819C
+	.string "The Guts Symbol was embossed on\n"
+	.string "the FRONTIER PASS!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_2581CF: @ 82581CF
+	.string "Hmm…\p"
+	.string "It’s going to be fun the next time!\n"
+	.string "I’m looking forward to it!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_258213: @ 8258213
+	.string "GRETA: Hey! Howdy!\n"
+	.string "You finally won your way up to me!\p"
+	.string "I was getting worried waiting for you!\n"
+	.string "I was really looking forward to seeing\l"
+	.string "you again!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_2582A2: @ 82582A2
+	.string "… … …\n"
+	.string "So, are you ready?$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_2582BB: @ 82582BB
+	.string "I won’t allow a halfhearted effort!\n"
+	.string "Be ready for a thrashing!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_2582F9: @ 82582F9
+	.string "Come on, REFEREE!\n"
+	.string "Let’s get this started!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_258323: @ 8258323
+	.string "GRETA: Gaaah! Blown away!\n"
+	.string "Let’s see your FRONTIER PASS!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_25835B: @ 825835B
+	.string "The Guts Symbol took on\n"
+	.string "a golden shine!$"
+
+BattleFrontier_BattleArenaBattleRoom_Text_258383: @ 8258383
+	.string "Arrrgh!\n"
+	.string "This is so infuriating!\p"
+	.string "If we ever battle again, I won’t lose!\n"
+	.string "Don’t you forget it! Bye-bye!$"
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc
new file mode 100644
index 000000000..03a2cb14d
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc
@@ -0,0 +1,6 @@
+BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, 8, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8
+	map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
index d70d50b1d..5312dd0fe 100644
--- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleArenaCorridor: @ 8485468
-	.4byte BattleFrontier_BattleArenaCorridor_MapAttributes
+	.4byte BattleFrontier_BattleArenaCorridor_Layout
 	.4byte BattleFrontier_BattleArenaCorridor_MapEvents
 	.4byte BattleFrontier_BattleArenaCorridor_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
new file mode 100644
index 000000000..a353379c2
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
@@ -0,0 +1,90 @@
+BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9
+	map_script 2, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF
+	.byte 0
+
+BattleFrontier_BattleArenaCorridor_MapScript2_2573BF: @ 82573BF
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaCorridor_EventScript_2573C9
+	.2byte 0
+
+BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9
+	delay 16
+	setvar VAR_TEMP_0, 1
+	applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_25742F
+	applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_257417
+	waitmovement 0
+	applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257444
+	waitmovement 0
+	msgbox BattleFrontier_BattleArenaCorridor_Text_257449, 3
+	applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257446
+	waitmovement 0
+	applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_25742C
+	waitmovement 0
+	setvar VAR_0x8006, 0
+	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5
+	waitstate
+	end
+
+BattleFrontier_BattleArenaCorridor_Movement_257417: @ 8257417
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+BattleFrontier_BattleArenaCorridor_Movement_25742C: @ 825742C
+	walk_right
+	set_invisible
+	step_end
+
+BattleFrontier_BattleArenaCorridor_Movement_25742F: @ 825742F
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+BattleFrontier_BattleArenaCorridor_Movement_257444: @ 8257444
+	walk_in_place_fastest_left
+	step_end
+
+BattleFrontier_BattleArenaCorridor_Movement_257446: @ 8257446
+	walk_up
+	walk_in_place_fastest_down
+	step_end
+
+BattleFrontier_BattleArenaCorridor_Text_257449: @ 8257449
+	.string "Your battles shall be waged in\n"
+	.string "the next room. Please step in!$"
+
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/events.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc
new file mode 100644
index 000000000..d0343228b
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaLobby/events.inc
@@ -0,0 +1,17 @@
+BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 10, 3, 2, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 14, 11, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0
+	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0
+	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0
+
+BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C
+	warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894
+	bg_event 5, 9, 3, 1, 0, BattleFrontier_BattleArenaLobby_EventScript_256092
+	bg_event 1, 7, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560CA
+
+BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC
+	map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents
+
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
index 36522126d..3f5e0ff4e 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleArenaLobby: @ 848544C
-	.4byte BattleFrontier_BattleArenaLobby_MapAttributes
+	.4byte BattleFrontier_BattleArenaLobby_Layout
 	.4byte BattleFrontier_BattleArenaLobby_MapEvents
 	.4byte BattleFrontier_BattleArenaLobby_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
new file mode 100644
index 000000000..a376bfe22
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
@@ -0,0 +1,638 @@
+BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36
+	map_script 2, BattleFrontier_BattleArenaLobby_MapScript2_255C55
+	map_script 4, BattleFrontier_BattleArenaLobby_MapScript2_255C41
+	.byte 0
+
+BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaLobby_EventScript_255C4B
+	.2byte 0
+
+BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaLobby_EventScript_255C7F
+	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleArenaLobby_EventScript_255C88
+	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleArenaLobby_EventScript_255DC0
+	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleArenaLobby_EventScript_255CCF
+	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleArenaLobby_EventScript_255D2B
+	.2byte 0
+
+BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F
+	setvar VAR_0x8004, 0
+	special sub_81A1780
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88
+	lockall
+	msgbox BattleFrontier_BattleArenaLobby_Text_256811, 4
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_81A5238
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 0
+	special sub_81A5238
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF
+	lockall
+	setvar VAR_0x8004, 10
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0
+	msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, 4
+	goto BattleFrontier_BattleArenaLobby_EventScript_255CF8
+
+BattleFrontier_BattleArenaLobby_EventScript_255CF0:: @ 8255CF0
+	msgbox BattleFrontier_BattleArenaLobby_Text_2572D9, 4
+
+BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8
+	msgbox BattleFrontier_BattleArenaLobby_Text_257353, 4
+	setvar VAR_0x8004, 11
+	special sub_81A1780
+	msgbox BattleFrontier_BattleArenaLobby_Text_241520, 9
+	message BattleFrontier_BattleArenaLobby_Text_256931
+	waitmessage
+	call BattleFrontier_BattleArenaLobby_EventScript_255D59
+	msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B
+	lockall
+	message BattleFrontier_BattleArenaLobby_Text_256A2C
+	waitmessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 0
+	special sub_81A5238
+	call BattleFrontier_BattleArenaLobby_EventScript_255D59
+	msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59
+	setvar VAR_0x8004, 8
+	special sub_81A1780
+	special LoadPlayerParty
+	special HealPlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 0
+	special sub_81A5238
+	playse SE_SAVE
+	waitse
+	call BattleFrontier_BattleArenaLobby_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF
+	message BattleFrontier_BattleArenaLobby_Text_256B19
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleArenaLobby_EventScript_255DBF
+	case 0, BattleFrontier_BattleArenaLobby_EventScript_255DBA
+	case 127, BattleFrontier_BattleArenaLobby_EventScript_255DBF
+
+BattleFrontier_BattleArenaLobby_EventScript_255DBA:: @ 8255DBA
+	call BattleFrontier_BattleArenaLobby_EventScript_23E8B4
+
+BattleFrontier_BattleArenaLobby_EventScript_255DBF:: @ 8255DBF
+	return
+
+BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0
+	lockall
+	message BattleFrontier_BattleArenaLobby_Text_256AA1
+	waitmessage
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 1
+	special sub_81A5238
+	playse SE_SAVE
+	waitse
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	goto BattleFrontier_BattleArenaLobby_EventScript_255F54
+
+BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4
+	lock
+	faceplayer
+	setvar VAR_FRONTIER_FACILITY, 3
+	setvar VAR_0x40CE, 0
+	special SavePlayerParty
+	msgbox BattleFrontier_BattleArenaLobby_Text_256166, 4
+
+BattleFrontier_BattleArenaLobby_EventScript_255E0B:: @ 8255E0B
+	message BattleFrontier_BattleArenaLobby_Text_2561EA
+	waitmessage
+	multichoice 17, 6, 23, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleArenaLobby_EventScript_255E47
+	case 1, BattleFrontier_BattleArenaLobby_EventScript_255F9F
+	case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB
+	case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB
+
+BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47
+	message BattleFrontier_BattleArenaLobby_Text_256513
+	waitmessage
+	multichoice 17, 6, 24, 0
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB
+	case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB
+	setvar VAR_0x8004, 15
+	special sub_81A1780
+	compare VAR_0x8004, 1
+	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	msgbox BattleFrontier_BattleArenaLobby_Text_256573, 4
+	fadescreen 1
+	call BattleFrontier_BattleArenaLobby_EventScript_23F2B7
+	copyvar VAR_0x8004, VAR_RESULT
+	setvar VAR_0x8005, 3
+	special sub_80F9490
+	waitstate
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8
+	msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleArenaLobby_EventScript_255FF8
+	case 1, BattleFrontier_BattleArenaLobby_EventScript_255EE8
+	case 127, BattleFrontier_BattleArenaLobby_EventScript_255FF8
+
+BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
+	setvar VAR_TEMP_0, 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	special sub_81A1780
+	setvar VAR_0x8004, 0
+	special sub_81A5238
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 1
+	special sub_81A5238
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special LoadPlayerParty
+	closemessage
+	delay 2
+	call BattleFrontier_BattleArenaLobby_EventScript_27134F
+	setvar VAR_TEMP_0, 255
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1
+
+BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54
+	special SavePlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, 4
+	closemessage
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005
+	compare VAR_RESULT, 1
+	call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050
+	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13
+	setvar VAR_TEMP_0, 0
+	waitstate
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_255F9F:: @ 8255F9F
+	msgbox BattleFrontier_BattleArenaLobby_Text_25624C, 4
+	goto BattleFrontier_BattleArenaLobby_EventScript_255E0B
+
+BattleFrontier_BattleArenaLobby_EventScript_255FAC:: @ 8255FAC
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleArenaLobby_EventScript_255FC7
+	case 1, BattleFrontier_BattleArenaLobby_EventScript_255FD4
+
+BattleFrontier_BattleArenaLobby_EventScript_255FC7:: @ 8255FC7
+	msgbox BattleFrontier_BattleArenaLobby_Text_2566A8, 4
+	goto BattleFrontier_BattleArenaLobby_EventScript_256003
+
+BattleFrontier_BattleArenaLobby_EventScript_255FD4:: @ 8255FD4
+	msgbox BattleFrontier_BattleArenaLobby_Text_2565A5, 4
+	goto BattleFrontier_BattleArenaLobby_EventScript_256003
+
+BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	goto BattleFrontier_BattleArenaLobby_EventScript_255FFB
+
+BattleFrontier_BattleArenaLobby_EventScript_255FF8:: @ 8255FF8
+	special LoadPlayerParty
+
+BattleFrontier_BattleArenaLobby_EventScript_255FFB:: @ 8255FFB
+	msgbox BattleFrontier_BattleArenaLobby_Text_25621F, 4
+
+BattleFrontier_BattleArenaLobby_EventScript_256003:: @ 8256003
+	release
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_256005:: @ 8256005
+	applymovement 1, BattleFrontier_BattleArenaLobby_Movement_256034
+	applymovement 255, BattleFrontier_BattleArenaLobby_Movement_256041
+	waitmovement 0
+	opendoor 2, 2
+	waitdooranim
+	applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E
+	applymovement 255, BattleFrontier_BattleArenaLobby_Movement_25604C
+	waitmovement 0
+	closedoor 2, 2
+	waitdooranim
+	return
+
+BattleFrontier_BattleArenaLobby_Movement_256034: @ 8256034
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	step_end
+
+BattleFrontier_BattleArenaLobby_Movement_25603E: @ 825603E
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleArenaLobby_Movement_256041: @ 8256041
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	step_end
+
+BattleFrontier_BattleArenaLobby_Movement_25604C: @ 825604C
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050
+	applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25607F
+	applymovement 255, BattleFrontier_BattleArenaLobby_Movement_256088
+	waitmovement 0
+	opendoor 11, 2
+	waitdooranim
+	applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E
+	applymovement 255, BattleFrontier_BattleArenaLobby_Movement_25604C
+	waitmovement 0
+	closedoor 11, 2
+	waitdooranim
+	return
+
+BattleFrontier_BattleArenaLobby_Movement_25607F: @ 825607F
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	step_end
+
+BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_2560A6:: @ 82560A6
+	msgbox BattleFrontier_BattleArenaLobby_Text_256B5C, 2
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_2560AF:: @ 82560AF
+	msgbox BattleFrontier_BattleArenaLobby_Text_256BCB, 2
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_2560B8:: @ 82560B8
+	msgbox BattleFrontier_BattleArenaLobby_Text_256C19, 2
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_2560C1:: @ 82560C1
+	msgbox BattleFrontier_BattleArenaLobby_Text_256C9A, 2
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_2560CA:: @ 82560CA
+	lockall
+	msgbox BattleFrontier_BattleArenaLobby_Text_256DB8, 4
+	goto BattleFrontier_BattleArenaLobby_EventScript_2560D9
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_2560D9:: @ 82560D9
+	message BattleFrontier_BattleArenaLobby_Text_256DDF
+	waitmessage
+	multichoice 17, 2, 96, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleArenaLobby_EventScript_25612C
+	case 1, BattleFrontier_BattleArenaLobby_EventScript_25613A
+	case 2, BattleFrontier_BattleArenaLobby_EventScript_256148
+	case 3, BattleFrontier_BattleArenaLobby_EventScript_256156
+	case 4, BattleFrontier_BattleArenaLobby_EventScript_256164
+	case 127, BattleFrontier_BattleArenaLobby_EventScript_256164
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_25612C:: @ 825612C
+	msgbox BattleFrontier_BattleArenaLobby_Text_256E02, 4
+	goto BattleFrontier_BattleArenaLobby_EventScript_2560D9
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_25613A:: @ 825613A
+	msgbox BattleFrontier_BattleArenaLobby_Text_256F43, 4
+	goto BattleFrontier_BattleArenaLobby_EventScript_2560D9
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_256148:: @ 8256148
+	msgbox BattleFrontier_BattleArenaLobby_Text_256FF2, 4
+	goto BattleFrontier_BattleArenaLobby_EventScript_2560D9
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_256156:: @ 8256156
+	msgbox BattleFrontier_BattleArenaLobby_Text_257202, 4
+	goto BattleFrontier_BattleArenaLobby_EventScript_2560D9
+	end
+
+BattleFrontier_BattleArenaLobby_EventScript_256164:: @ 8256164
+	releaseall
+	end
+
+BattleFrontier_BattleArenaLobby_Text_256166: @ 8256166
+	.string "Where the battling spirit of TRAINERS\n"
+	.string "is put to the test!\p"
+	.string "I welcome you to the BATTLE ARENA!\p"
+	.string "I am your guide to the Set KO Tourney!$"
+
+BattleFrontier_BattleArenaLobby_Text_2561EA: @ 82561EA
+	.string "Now, do you wish to take\n"
+	.string "the BATTLE ARENA challenge?$"
+
+BattleFrontier_BattleArenaLobby_Text_25621F: @ 825621F
+	.string "We await your challenge on\n"
+	.string "another occasion!$"
+
+BattleFrontier_BattleArenaLobby_Text_25624C: @ 825624C
+	.string "In the BATTLE ARENA, we undertake\n"
+	.string "the Set KO Tourney.\p"
+	.string "All participants enter with a team of\n"
+	.string "three POKéMON.\p"
+	.string "The three POKéMON must be lined up in\n"
+	.string "the order in which they are to appear.\p"
+	.string "During battle, the POKéMON will appear\n"
+	.string "one at a time in the preset order.\p"
+	.string "Once a POKéMON enters battle, it must\n"
+	.string "remain out until the match is decided.\p"
+	.string "If a match remains undecided in\n"
+	.string "three turns, it goes to judging.\p"
+	.string "If you wish to interrupt your challenge,\n"
+	.string "please save the game.\p"
+	.string "If you don’t save, you will not be able\n"
+	.string "to continue with your challenge.\p"
+	.string "If you pull off the feat of beating\n"
+	.string "seven TRAINERS in succession,\l"
+	.string "we will present you with Battle Points.$"
+
+BattleFrontier_BattleArenaLobby_Text_2564CE: @ 82564CE
+	.string "Before showing you to the BATTLE\n"
+	.string "ARENA, you must save. Is that okay?$"
+
+BattleFrontier_BattleArenaLobby_Text_256513: @ 8256513
+	.string "The BATTLE ARENA offers two levels\n"
+	.string "of challenge, Level 50 and Open Level.\l"
+	.string "Which is your choice?$"
+
+BattleFrontier_BattleArenaLobby_Text_256573: @ 8256573
+	.string "Very well, now select your\n"
+	.string "three POKéMON, please.$"
+
+BattleFrontier_BattleArenaLobby_Text_2565A5: @ 82565A5
+	.string "My dear challenger!\p"
+	.string "You do not have the three POKéMON\n"
+	.string "required for entry.\p"
+	.string "To qualify, you must bring three\n"
+	.string "different kinds of POKéMON.\p"
+	.string "They also must not hold the same\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "When you have made your preparations,\n"
+	.string "please do return.$"
+
+BattleFrontier_BattleArenaLobby_Text_2566A8: @ 82566A8
+	.string "My dear challenger!\p"
+	.string "You do not have the three POKéMON\n"
+	.string "required for entry.\p"
+	.string "To qualify, you must bring three\n"
+	.string "different kinds of POKéMON.\p"
+	.string "The three different POKéMON\n"
+	.string "must all be Level 50 or lower.\p"
+	.string "They also must not hold the same\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "When you have made your preparations,\n"
+	.string "please do return.$"
+
+BattleFrontier_BattleArenaLobby_Text_2567E6: @ 82567E6
+	.string "I shall now guide you to\n"
+	.string "the BATTLE ARENA.$"
+
+BattleFrontier_BattleArenaLobby_Text_256811: @ 8256811
+	.string "My dear challenger!\p"
+	.string "You did not save the game before\n"
+	.string "shutting down, did you?\p"
+	.string "It is unfortunate, but that has\n"
+	.string "resulted in your disqualification\l"
+	.string "from your challenge.\p"
+	.string "You may, of course, start with a fresh\n"
+	.string "challenge.$"
+
+BattleFrontier_BattleArenaLobby_Text_2568E7: @ 82568E7
+	.string "We congratulate you for your splendid\n"
+	.string "string of wins over seven TRAINERS!$"
+
+BattleFrontier_BattleArenaLobby_Text_256931: @ 8256931
+	.string "Your achievement will be recorded.\n"
+	.string "Please wait while I save the game.$"
+
+BattleFrontier_BattleArenaLobby_Text_256977: @ 8256977
+	.string "In commemoration of your 7-win streak,\n"
+	.string "we present you with this prize.$"
+
+BattleFrontier_BattleArenaLobby_Text_2569BE: @ 82569BE
+	.string "{PLAYER} received the prize\n"
+	.string "{STR_VAR_1}.$"
+
+BattleFrontier_BattleArenaLobby_Text_2569D8: @ 82569D8
+	.string "Oh?\n"
+	.string "Your BAG seems to be full.\p"
+	.string "I urge you to clear space and\n"
+	.string "return for your prize.$"
+
+BattleFrontier_BattleArenaLobby_Text_256A2C: @ 8256A2C
+	.string "Thank you so much for participating!\p"
+	.string "Please wait while I save the game.$"
+
+BattleFrontier_BattleArenaLobby_Text_256A74: @ 8256A74
+	.string "We await your challenge on\n"
+	.string "another occasion!$"
+
+BattleFrontier_BattleArenaLobby_Text_256AA1: @ 8256AA1
+	.string "We have been looking forward to\n"
+	.string "your arrival.\p"
+	.string "Before I show you to the BATTLE\n"
+	.string "ARENA, I must save the game.\l"
+	.string "Please wait.$"
+
+BattleFrontier_BattleArenaLobby_Text_256B19: @ 8256B19
+	.string "Shall I record your last BATTLE ARENA\n"
+	.string "match on your FRONTIER PASS?$"
+
+BattleFrontier_BattleArenaLobby_Text_256B5C: @ 8256B5C
+	.string "I lost on the REFEREE’s decision…\p"
+	.string "I don’t think it was a good idea to only\n"
+	.string "use defensive moves and not attack…$"
+
+BattleFrontier_BattleArenaLobby_Text_256BCB: @ 8256BCB
+	.string "I won in judging!\p"
+	.string "Landing hits consistently on\n"
+	.string "the opponent’s POKéMON worked!$"
+
+BattleFrontier_BattleArenaLobby_Text_256C19: @ 8256C19
+	.string "Our match was declared a draw.\p"
+	.string "When we ran out of time, both my\n"
+	.string "POKéMON and the opponent’s had about\l"
+	.string "the same amount of HP left.$"
+
+BattleFrontier_BattleArenaLobby_Text_256C9A: @ 8256C9A
+	.string "In the BATTLE ARENA, the order of\n"
+	.string "POKéMON is totally important.\p"
+	.string "For example, if your first POKéMON\n"
+	.string "has certain type disadvantages,\l"
+	.string "try making your second POKéMON one\l"
+	.string "with moves that are super effective\l"
+	.string "against the first one.\p"
+	.string "I think that will be a good way of\n"
+	.string "making an effective team.$"
+
+BattleFrontier_BattleArenaLobby_Text_256DB8: @ 8256DB8
+FallarborTown_BattleTentLobby_Text_256DB8: @ 8256DB8
+	.string "The Set KO Tourney’s rules are listed.$"
+
+BattleFrontier_BattleArenaLobby_Text_256DDF: @ 8256DDF
+FallarborTown_BattleTentLobby_Text_256DDF: @ 8256DDF
+	.string "Which heading do you want to read?$"
+
+BattleFrontier_BattleArenaLobby_Text_256E02: @ 8256E02
+FallarborTown_BattleTentLobby_Text_256E02: @ 8256E02
+	.string "The Set KO Tourney has special rules,\n"
+	.string "unlike standard battles.\p"
+	.string "First, one battle lasts only\n"
+	.string "three turns.\p"
+	.string "If the outcome is not decided after\n"
+	.string "three turns, it goes to judging.\p"
+	.string "The REFEREE will choose the winner\n"
+	.string "based on how the POKéMON battled.\p"
+	.string "Also, a POKéMON cannot be switched out\n"
+	.string "until its battle’s outcome is decided.$"
+
+BattleFrontier_BattleArenaLobby_Text_256F43: @ 8256F43
+FallarborTown_BattleTentLobby_Text_256F43: @ 8256F43
+	.string "The first judging factor is “Mind.”\n"
+	.string "This factor evaluates how aggressive\l"
+	.string "the battlers were.\p"
+	.string "The judging is based on how often\n"
+	.string "the TRAINERS ordered the use of\l"
+	.string "offensive moves.$"
+
+BattleFrontier_BattleArenaLobby_Text_256FF2: @ 8256FF2
+FallarborTown_BattleTentLobby_Text_256FF2: @ 8256FF2
+	.string "The second judging factor is “Skill.”\n"
+	.string "This factor evaluates how effectively\l"
+	.string "POKéMON moves were used.\p"
+	.string "If a move worked successfully,\n"
+	.string "the Skill rating goes up.\p"
+	.string "If a move failed, the Skill rating\n"
+	.string "is lowered.\p"
+	.string "If it was an offensive move, the Skill\n"
+	.string "rating goes up if the move was “super\l"
+	.string "effective” and goes down if it was\l"
+	.string "“not very effective.”\p"
+	.string "The Skill rating will not go up for\n"
+	.string "moves such as PROTECT and DETECT.\p"
+	.string "If the opponent used PROTECT or\n"
+	.string "DETECT, and your POKéMON failed to\l"
+	.string "hit with a move, its Skill rating will not\l"
+	.string "go down.$"
+
+BattleFrontier_BattleArenaLobby_Text_257202: @ 8257202
+FallarborTown_BattleTentLobby_Text_257202: @ 8257202
+	.string "The third judging factor is “Body.”\n"
+	.string "This factor is based on how much HP\l"
+	.string "remained at the end of a battle.\p"
+	.string "The rating takes into account how much\n"
+	.string "HP a POKéMON had at the start of\l"
+	.string "battle, and what remained at the end.$"
+
+BattleFrontier_BattleArenaLobby_Text_2572D9: @ 82572D9
+	.string "A victory snatched from the ARENA\n"
+	.string "TYCOON, and a seven-TRAINER sweep!\p"
+	.string "We congratulate you on your most\n"
+	.string "splendid challenge!$"
+
+BattleFrontier_BattleArenaLobby_Text_257353: @ 8257353
+	.string "My dear challenger, in recognition of\n"
+	.string "your indefatigable spirit, please\l"
+	.string "accept these Battle Point(s).$"
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
new file mode 100644
index 000000000..2500a826b
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
@@ -0,0 +1,20 @@
+BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4
+	object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 7, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 16, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 16, 1, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, 7, 1, 1, 0, 0, 0x0, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, 9, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
+	map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
index ab6254403..3edfad730 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleDomeBattleRoom: @ 8485388
-	.4byte BattleFrontier_BattleDomeBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattleDomeBattleRoom_Layout
 	.4byte BattleFrontier_BattleDomeBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleDomeBattleRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
new file mode 100644
index 000000000..e853afda0
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
@@ -0,0 +1,1277 @@
+BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
+	map_script 3, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1
+	map_script 2, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00
+	map_script 4, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481
+	map_script 5, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0
+	.byte 0
+
+BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
+	setvar VAR_0x8004, 10
+	special sub_818E9AC
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	copyvar VAR_TEMP_F, VAR_RESULT
+	compare VAR_RESULT, 0
+	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC
+	end
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4
+	setvar VAR_OBJ_GFX_ID_1, 100
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA:: @ 824BCFA
+	setvar VAR_OBJ_GFX_ID_1, 105
+	return
+
+BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A
+	.2byte 0
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A
+	lockall
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
+	compare VAR_RESULT, 0
+	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C938
+	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4
+	waitmovement 0
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, 4
+	closemessage
+	showobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM
+	compare VAR_TEMP_F, 3
+	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E
+	compare VAR_TEMP_E, 0
+	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E:: @ 824BD4E
+	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C775
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A:: @ 824BD5A
+	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77F
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61
+	playse SE_W227B
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	waitmovement 0
+	compare VAR_TEMP_F, 3
+	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82
+	compare VAR_TEMP_E, 0
+	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
+	setvar VAR_0x8004, 4
+	special sub_818E9AC
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, 4
+	closemessage
+	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B
+	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C789
+	waitmovement 0
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 0
+	special sub_8161F74
+	msgbox 0x2021fc4, 4
+	closemessage
+	setvar VAR_0x8004, 5
+	special sub_818E9AC
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440
+	setvar VAR_TEMP_2, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0
+	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
+	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
+	setvar VAR_TEMP_2, 1
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA86, 4
+	closemessage
+	playse SE_W227B
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	delay 60
+	applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C964
+	waitmovement 0
+	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_24C969
+	waitmovement 0
+	delay 180
+	applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C96B
+	waitmovement 0
+	compare VAR_TEMP_2, 2
+	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
+	setvar VAR_0x8004, 19
+	special sub_818E9AC
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
+	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4
+	waitmovement 0
+	setvar VAR_0x8004, 4
+	special sub_818E9AC
+	compare VAR_TEMP_2, 0
+	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1
+	compare VAR_TEMP_2, 1
+	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5
+	compare VAR_TEMP_2, 2
+	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9
+	playse SE_W227B
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	delay 60
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D
+	setvar VAR_0x8004, 12
+	setvar VAR_0x8005, 2
+	special sub_818E9AC
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 4
+	special sub_81A1780
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5
+@ 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1
+	setvar VAR_0x8004, 20
+	setvar VAR_0x8005, 1
+	special sub_81A1780
+	message BattleFrontier_BattleDomeBattleRoom_Text_24C9E1
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5:: @ 824BEC5
+	setvar VAR_0x8004, 20
+	setvar VAR_0x8005, 0
+	special sub_81A1780
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CB34
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9:: @ 824BED9
+	message BattleFrontier_BattleDomeBattleRoom_Text_24D6BE
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
+	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4
+	waitmovement 0
+	compare VAR_TEMP_2, 0
+	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3
+	compare VAR_TEMP_2, 1
+	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC
+	playse SE_W227B
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	delay 60
+	setvar VAR_0x8004, 3
+	special sub_818E9AC
+	setvar VAR_0x8004, 12
+	setvar VAR_0x8005, 1
+	special sub_818E9AC
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	addvar VAR_RESULT, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	switch VAR_RESULT
+	case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
+	setvar VAR_0x8006, 1
+	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3
+	waitstate
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62
+	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77D
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	special sub_81A1780
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, 4
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96:: @ 824BF96
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA44, 4
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E
+	special sub_8175280
+	playse SE_W227B
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	delay 60
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 3
+	special sub_81A1780
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3:: @ 824BFC3
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C9BE, 4
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CB9D, 4
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 6
+	special sub_818E9AC
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_818E9AC
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	special sub_818E9AC
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C023:: @ 824C023
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C05A
+	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C061
+	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C068
+	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C06F
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C05A:: @ 824C05A
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CC06
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C061:: @ 824C061
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CC1C
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C068:: @ 824C068
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CC2E
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C06F:: @ 824C06F
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CC5B
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C076:: @ 824C076
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0AD
+	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0B4
+	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0BB
+	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C0AD:: @ 824C0AD
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CC99
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C0B4:: @ 824C0B4
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CCC5
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C0BB:: @ 824C0BB
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CCFD
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2:: @ 824C0C2
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CD33
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9:: @ 824C0C9
+	compare VAR_TEMP_F, 3
+	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C105
+	switch VAR_TEMP_E
+	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158
+	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161
+	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158
+	case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C105:: @ 824C105
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C13C
+	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C143
+	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C14A
+	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C151
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C13C:: @ 824C13C
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CD72
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C143:: @ 824C143
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CD8C
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C14A:: @ 824C14A
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CDB3
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C151:: @ 824C151
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CDDE
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C158:: @ 824C158
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEBE, 4
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C161:: @ 824C161
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D232, 4
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A:: @ 824C16A
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A1
+	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A8
+	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1AF
+	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A1:: @ 824C1A1
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CE10
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A8:: @ 824C1A8
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CE33
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C1AF:: @ 824C1AF
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CE57
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6:: @ 824C1B6
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CE94
+	waitmessage
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD:: @ 824C1BD
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB
+	switch VAR_TEMP_E
+	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC
+	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209
+	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC
+	case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC:: @ 824C1FC
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEDE, 4
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C211
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C209:: @ 824C209
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D26C, 4
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211
+	closemessage
+	applymovement 2, BattleFrontier_BattleDomeBattleRoom_Movement_24C94B
+	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9
+	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C78E
+	playse SE_W227B
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	waitse
+	playse SE_W227B
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	waitse
+	playse SE_W227B
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	waitse
+	playse SE_W227B
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	waitse
+	playse SE_W227B
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	waitse
+	waitmovement 0
+	message BattleFrontier_BattleDomeBattleRoom_Text_24CF7A
+	waitmessage
+	playse SE_W227B
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	waitse
+	switch VAR_TEMP_E
+	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C346
+	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
+	case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, 4
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, 4
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
+	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
+	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4
+	setvar VAR_0x8004, 12
+	setvar VAR_0x8005, 1
+	special sub_818E9AC
+	setvar VAR_0x8004, 12
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
+	closemessage
+	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B
+	waitmovement 0
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D172, 4
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattleDomeBattleRoom_Text_24D1AA
+	waitmessage
+	waitfanfare
+	setvar VAR_0x8004, 13
+	special sub_81A1780
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, 4
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, 4
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, 4
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
+	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
+	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4
+	setvar VAR_0x8004, 12
+	setvar VAR_0x8005, 1
+	special sub_818E9AC
+	setvar VAR_0x8004, 12
+	special sub_81A1780
+	compare VAR_RESULT, 2
+	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
+	closemessage
+	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B
+	waitmovement 0
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D47F, 4
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattleDomeBattleRoom_Text_24D522
+	waitmessage
+	waitfanfare
+	setvar VAR_0x8004, 13
+	special sub_81A1780
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, 4
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C400:: @ 824C400
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D677, 4
+	closemessage
+	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C787
+	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C829
+	waitmovement 0
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C420:: @ 824C420
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D127, 4
+	playse SE_W227B
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	waitse
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C436:: @ 824C436
+	setvar VAR_TEMP_2, 2
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special HealPlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 0
+	setvar VAR_TEMP_9, 1
+	special sub_8163AC4
+	waitstate
+	setvar VAR_TEMP_9, 0
+	setvar VAR_0x8004, 17
+	special sub_818E9AC
+	special HealPlayerParty
+	setvar VAR_0x8004, 16
+	special sub_818E9AC
+	return
+
+BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B
+	.2byte 0
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B
+	hideobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC
+	setvar VAR_TEMP_1, 1
+	applymovement 255, BattleFrontier_BattleDomeBattleRoom_Movement_24C773
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	compare VAR_RESULT, 3
+	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
+	setvar VAR_0x8004, 9
+	special sub_81A1780
+	copyvar VAR_TEMP_E, VAR_RESULT
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_242170
+	setobjectxyperm 15, 13, 9
+	removeobject 15
+	addobject 15
+	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C78B
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF:: @ 824C4EF
+	end
+
+BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0: @ 824C4F0
+	compare VAR_TEMP_9, 1
+	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC
+	end
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C502:: @ 824C502
+	compare VAR_TEMP_F, 0
+	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F
+	compare VAR_TEMP_F, 1
+	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C530
+	compare VAR_TEMP_F, 2
+	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C594
+	compare VAR_TEMP_F, 3
+	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C652
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C530:: @ 824C530
+	createvobject 46, 1, 3, 0, 3, 1
+	createvobject 22, 4, 6, 0, 3, 1
+	createvobject 5, 6, 8, 0, 3, 1
+	createvobject 12, 9, 11, 0, 3, 1
+	createvobject 46, 11, 13, 0, 3, 1
+	createvobject 66, 13, 15, 0, 3, 1
+	createvobject 45, 19, 7, 1, 3, 1
+	createvobject 34, 22, 11, 1, 3, 1
+	createvobject 11, 25, 15, 1, 3, 1
+	createvobject 35, 26, 2, 2, 3, 1
+	createvobject 38, 29, 5, 1, 3, 1
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C594:: @ 824C594
+	createvobject 46, 1, 3, 0, 3, 1
+	createvobject 22, 4, 6, 0, 3, 1
+	createvobject 5, 6, 8, 0, 3, 1
+	createvobject 20, 7, 9, 0, 3, 1
+	createvobject 12, 9, 11, 0, 3, 1
+	createvobject 47, 10, 12, 0, 3, 1
+	createvobject 46, 11, 13, 0, 3, 1
+	createvobject 66, 13, 15, 0, 3, 1
+	createvobject 48, 15, 2, 1, 3, 1
+	createvobject 5, 16, 3, 1, 3, 1
+	createvobject 20, 17, 4, 1, 3, 1
+	createvobject 45, 19, 7, 1, 3, 1
+	createvobject 22, 20, 9, 1, 3, 1
+	createvobject 34, 22, 11, 1, 3, 1
+	createvobject 46, 23, 13, 1, 3, 1
+	createvobject 11, 25, 15, 1, 3, 1
+	createvobject 35, 26, 2, 2, 3, 1
+	createvobject 40, 28, 5, 2, 3, 1
+	createvobject 38, 29, 5, 1, 3, 1
+	createvobject 83, 30, 6, 2, 3, 1
+	createvobject 34, 31, 8, 2, 3, 1
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652
+	createvobject 5, 0, 2, 0, 3, 1
+	createvobject 46, 1, 3, 0, 3, 1
+	createvobject 45, 2, 15, 0, 3, 1
+	createvobject 66, 3, 5, 0, 3, 1
+	createvobject 22, 4, 6, 0, 3, 1
+	createvobject 46, 5, 7, 0, 3, 1
+	createvobject 5, 6, 8, 0, 3, 1
+	createvobject 20, 7, 9, 0, 3, 1
+	createvobject 24, 8, 10, 0, 3, 1
+	createvobject 12, 9, 11, 0, 3, 1
+	createvobject 47, 10, 12, 0, 3, 1
+	createvobject 46, 11, 13, 0, 3, 1
+	createvobject 45, 12, 14, 0, 3, 1
+	createvobject 66, 13, 15, 2, 3, 1
+	createvobject 55, 14, 12, 2, 3, 1
+	createvobject 48, 15, 2, 1, 3, 1
+	createvobject 5, 16, 3, 1, 3, 1
+	createvobject 20, 17, 4, 1, 3, 1
+	createvobject 24, 18, 6, 1, 3, 1
+	createvobject 45, 19, 7, 1, 3, 1
+	createvobject 22, 20, 9, 1, 3, 1
+	createvobject 23, 21, 10, 1, 3, 1
+	createvobject 34, 22, 11, 1, 3, 1
+	createvobject 46, 23, 13, 1, 3, 1
+	createvobject 48, 24, 14, 1, 3, 1
+	createvobject 11, 25, 15, 1, 3, 1
+	createvobject 35, 26, 2, 2, 3, 1
+	createvobject 17, 27, 3, 2, 3, 1
+	createvobject 40, 28, 5, 2, 3, 1
+	createvobject 38, 29, 5, 1, 3, 1
+	createvobject 83, 30, 6, 2, 3, 1
+	createvobject 34, 31, 8, 2, 3, 1
+	return
+
+BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773
+BattleFrontier_BattleDomeBattleRoom_Movement_24C773: @ 824C773
+	set_invisible
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C775: @ 824C775
+	set_visible
+	delay_16
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C77B: @ 824C77B
+	walk_right
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C77D: @ 824C77D
+	walk_up
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C77F: @ 824C77F
+	set_visible
+	delay_16
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C787: @ 824C787
+	walk_right
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C789: @ 824C789
+	walk_left
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C78B: @ 824C78B
+	face_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C78E: @ 824C78E
+	set_visible
+	walk_up
+	walk_up
+	walk_up
+	face_left
+	delay_8
+	delay_4
+	face_down
+	delay_8
+	delay_4
+	face_right
+	delay_8
+	delay_4
+	face_up
+	delay_8
+	delay_4
+	face_left
+	delay_16
+	walk_fast_up
+	walk_fast_up
+	face_left
+	delay_8
+	delay_4
+	face_down
+	delay_8
+	delay_4
+	face_right
+	delay_8
+	delay_4
+	face_up
+	delay_8
+	delay_4
+	face_left
+	jump_2_left
+	unlock_facing_direction
+	face_up
+	lock_facing_direction
+	jump_2_left
+	jump_2_left
+	unlock_facing_direction
+	face_right
+	lock_facing_direction
+	jump_2_left
+	unlock_facing_direction
+	face_down
+	delay_2
+	face_left
+	delay_8
+	delay_4
+	face_up
+	delay_8
+	delay_4
+	face_right
+	delay_8
+	delay_4
+	face_down
+	delay_8
+	delay_4
+	face_left
+	delay_4
+	face_up
+	delay_4
+	face_right
+	delay_4
+	face_down
+	delay_4
+	face_left
+	delay_2
+	face_up
+	delay_2
+	face_right
+	delay_2
+	face_down
+	delay_2
+	face_left
+	lock_facing_direction
+	walk_right
+	walk_slow_right
+	walk_right
+	walk_slow_right
+	unlock_facing_direction
+	face_up
+	delay_16
+	jump_in_place_up
+	jump_in_place_up
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	jump_in_place_up
+	delay_16
+	walk_right
+	walk_down
+	walk_down
+	face_left
+	delay_2
+	face_up
+	delay_2
+	face_right
+	delay_2
+	face_down
+	delay_2
+	face_left
+	delay_4
+	walk_left
+	walk_left
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9: @ 824C7F9
+	delay_16
+	delay_16
+	walk_left
+	walk_left
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C829: @ 824C829
+	walk_left
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C82B: @ 824C82B
+	walk_left
+	walk_left
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E
+	turnvobject 0, 4
+	turnvobject 2, 4
+	turnvobject 4, 4
+	turnvobject 6, 4
+	turnvobject 8, 4
+	turnvobject 10, 3
+	turnvobject 12, 3
+	turnvobject 14, 3
+	turnvobject 16, 3
+	turnvobject 18, 3
+	turnvobject 20, 4
+	turnvobject 22, 4
+	turnvobject 24, 4
+	turnvobject 26, 4
+	turnvobject 28, 4
+	turnvobject 30, 4
+	delay 20
+	turnvobject 0, 1
+	turnvobject 2, 1
+	turnvobject 4, 1
+	turnvobject 6, 1
+	turnvobject 8, 1
+	turnvobject 10, 1
+	turnvobject 12, 1
+	turnvobject 14, 1
+	turnvobject 16, 1
+	turnvobject 18, 1
+	turnvobject 20, 1
+	turnvobject 22, 1
+	turnvobject 24, 1
+	turnvobject 26, 1
+	turnvobject 28, 1
+	turnvobject 30, 1
+	delay 20
+	turnvobject 1, 4
+	turnvobject 3, 4
+	turnvobject 5, 4
+	turnvobject 7, 4
+	turnvobject 9, 4
+	turnvobject 11, 3
+	turnvobject 13, 3
+	turnvobject 15, 3
+	turnvobject 17, 3
+	turnvobject 19, 3
+	turnvobject 21, 4
+	turnvobject 23, 4
+	turnvobject 25, 4
+	turnvobject 27, 3
+	turnvobject 31, 3
+	delay 20
+	turnvobject 1, 1
+	turnvobject 3, 1
+	turnvobject 5, 1
+	turnvobject 7, 1
+	turnvobject 9, 1
+	turnvobject 11, 1
+	turnvobject 13, 1
+	turnvobject 15, 1
+	turnvobject 17, 1
+	turnvobject 19, 1
+	turnvobject 21, 1
+	turnvobject 23, 1
+	turnvobject 25, 1
+	turnvobject 27, 1
+	turnvobject 31, 1
+	delay 20
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5
+	copyvar VAR_RESULT, VAR_0x40CE
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F
+	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11
+	waitstate
+	end
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F:: @ 824C90F
+	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11
+	waitstate
+	end
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919
+	random 2
+	copyvar VAR_TEMP_D, VAR_RESULT
+	compare VAR_TEMP_D, 0
+	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
+	setobjectxyperm 6, 2, 0
+	setobjectmovementtype 6, 10
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938
+	compare VAR_TEMP_D, 0
+	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
+	applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E
+	return
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C94B: @ 824C94B
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	disable_jump_landing_ground_effect
+	jump_in_place_down
+	delay_4
+	jump_in_place_down
+	enable_jump_landing_ground_effect
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C95E: @ 824C95E
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C964: @ 824C964
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C969: @ 824C969
+	walk_in_place_fastest_left
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C96B: @ 824C96B
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Text_24C970: @ 824C970
+	.string "{PLAYER} has entered the BATTLE DOME!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24C990: @ 824C990
+	.string "{STR_VAR_1}\n"
+	.string "match!\p"
+	.string "{PLAYER} versus {STR_VAR_2}!\p"
+	.string "Let the battle begin!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24C9BE: @ 824C9BE
+	.string "{PLAYER} is the winner!\n"
+	.string "Congratulations!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24C9E1: @ 824C9E1
+	.string "{STR_VAR_2} is the winner!\n"
+	.string "Congratulations!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CA04: @ 824CA04
+	.string "{PLAYER} is the Level 50\n"
+	.string "Battle Tournament Champion!\p"
+	.string "Congratulations!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CA44: @ 824CA44
+	.string "{PLAYER} is the Open Level\n"
+	.string "Battle Tournament Champion!\p"
+	.string "Congratulations!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CA86: @ 824CA86
+	.string "What an unbelievable finish!\n"
+	.string "We have a double knockout!\p"
+	.string "In this event, the Battle Tournament\n"
+	.string "rules call for a REFEREE’S decision.\p"
+	.string "Please wait while the judging\n"
+	.string "is under way.$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CB34: @ 824CB34
+	.string "The REFEREES have reached\n"
+	.string "a decision!\p"
+	.string "The winner is…\n"
+	.string "Oh, my goodness!\l"
+	.string "The winner is {STR_VAR_1}!\l"
+	.string "Congratulations!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CB9D: @ 824CB9D
+	.string "The REFEREES have reached\n"
+	.string "a decision!\p"
+	.string "The winner is…\n"
+	.string "Oh, my goodness!\l"
+	.string "The winner is {PLAYER}!\l"
+	.string "Congratulations!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CC06: @ 824CC06
+	.string "The bright new hope!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CC1C: @ 824CC1C
+	.string "The rising star!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CC2E: @ 824CC2E
+	.string "Will this TRAINER race to\n"
+	.string "the championship?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CC5B: @ 824CC5B
+	.string "Can the feat of a championship\n"
+	.string "on the first try be achieved?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CC99: @ 824CC99
+	.string "Can the loss of the last match\n"
+	.string "be avenged?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CCC5: @ 824CCC5
+	.string "The TRAINER is on fire for\n"
+	.string "the first championship try!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CCFD: @ 824CCFD
+	.string "A win here means this TRAINER\n"
+	.string "advances to the final!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CD33: @ 824CD33
+	.string "Will the long-held dream of\n"
+	.string "a championship finally come true?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CD72: @ 824CD72
+	.string "The invincible champion!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CD8C: @ 824CD8C
+	.string "Can anyone hope to beat this\n"
+	.string "TRAINER?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CDB3: @ 824CDB3
+	.string "Do battles exist solely for\n"
+	.string "this TRAINER?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CDDE: @ 824CDDE
+	.string "The current champion aiming to\n"
+	.string "retain the title!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CE10: @ 824CE10
+	.string "The former champion has returned!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CE33: @ 824CE33
+	.string "The former toughness has returned!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CE57: @ 824CE57
+	.string "Will this TRAINER do as expected\n"
+	.string "and advance to the finals?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CE94: @ 824CE94
+	.string "Will the former champ regain\n"
+	.string "lost glory?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CEBE: @ 824CEBE
+	.string "Feel the glow of a true master!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CEDE: @ 824CEDE
+	.string "And now… The TRAINER standing in\n"
+	.string "{PLAYER}’s record-setting path…\p"
+	.string "Yes! The one and only!\n"
+	.string "The BATTLE DOME COMMISSIONER!\l"
+	.string "Our very own DOME ACE!\l"
+	.string "Make way for TUCKER!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CF7A: @ 824CF7A
+	.string "Spectators: TUCKER! TUCKER!\n"
+	.string "TUCKER! TUCKER! TUCKER!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CFAE: @ 824CFAE
+	.string "TUCKER: Ahahah!\p"
+	.string "Do you hear it? This crowd!\n"
+	.string "They’re all itching to see our match!\p"
+	.string "Ahahah!\p"
+	.string "I bet you’re twitching all over from\n"
+	.string "the tension of getting to battle me!\p"
+	.string "But don’t you worry about a thing!\p"
+	.string "I’m the no. 1 star of the BATTLE DOME!\n"
+	.string "I, TUCKER the DOME ACE, will bathe you\l"
+	.string "in my brilliant glow!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D0D9: @ 824D0D9
+	.string "Your strategy!\n"
+	.string "Let’s see it!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D0F6: @ 824D0F6
+	.string "Unbelievable! It’s incredible!\n"
+	.string "The victor is {PLAYER}!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D127: @ 824D127
+	.string "The winner is TUCKER!\n"
+	.string "The DOME ACE has prevailed!\p"
+	.string "Congratulations, TUCKER!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D172: @ 824D172
+	.string "TUCKER: Rules are rules!\n"
+	.string "Let me see your FRONTIER PASS.$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D1AA: @ 824D1AA
+	.string "The Tactics Symbol was embossed on\n"
+	.string "the FRONTIER PASS!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D1E0: @ 824D1E0
+	.string "… … … … … …\p"
+	.string "I sorely underestimated you. I won’t\n"
+	.string "make the same mistake next time…$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D232: @ 824D232
+	.string "Can the win streak be stretched?\n"
+	.string "The confidence is there!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D26C: @ 824D26C
+	.string "Ladies and gentlemen!\n"
+	.string "Boys, girls, and POKéMON!\p"
+	.string "Finally!\n"
+	.string "Finally, the legend has returned!\p"
+	.string "Yes, the name of that legend!\n"
+	.string "Our very own DOME ACE!\l"
+	.string "It’s none other than TUCKER!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D319: @ 824D319
+	.string "TUCKER: Ah…\n"
+	.string "The pummeling roar of the crowd…\l"
+	.string "Their furnace-like heat of excitement…\l"
+	.string "This is a wonderful place…\p"
+	.string "To the crowd, I am the DOME ACE…\n"
+	.string "I represent their hopes and dreams…\l"
+	.string "I must never fade from their sight…\p"
+	.string "I must burn!\n"
+	.string "Brighter and more brilliant!\l"
+	.string "I must light all that gather here!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D43E: @ 824D43E
+	.string "I will unleash all the power that\n"
+	.string "I possess! Right here and now!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D47F: @ 824D47F
+	.string "TUCKER: You’re genuinely fantastic!\p"
+	.string "Never before! I haven’t ever lost in the\n"
+	.string "times I’ve had to unleash my power.\p"
+	.string "Yes, quite fantastic!\n"
+	.string "Your FRONTIER PASS, please?$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D522: @ 824D522
+	.string "The Tactics Symbol took on\n"
+	.string "a golden shine!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D54D: @ 824D54D
+	.string "You’re strong, but above all,\n"
+	.string "you have a unique charm!\p"
+	.string "In you, I see a definite potential for\n"
+	.string "a superstar like me.\p"
+	.string "I will very much look forward to\n"
+	.string "our next encounter!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D5F5: @ 824D5F5
+	.string "{PLAYER} is the Level 50\n"
+	.string "Battle Tournament Champion!\p"
+	.string "Congratulations!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D635: @ 824D635
+	.string "{PLAYER} is the Open Level\n"
+	.string "Battle Tournament Champion!\p"
+	.string "Congratulations!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D677: @ 824D677
+	.string "The final match!\p"
+	.string "{PLAYER} versus the DOME ACE, TUCKER!\p"
+	.string "Let the battle begin!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D6BE: @ 824D6BE
+	.string "The REFEREES have reached\n"
+	.string "a decision!\p"
+	.string "The winner is…\n"
+	.string "Oh, my goodness!\l"
+	.string "The winner is our very own DOME ACE!\l"
+	.string "It’s TUCKER!\p"
+	.string "Congratulations! And thank you!\n"
+	.string "Let’s hear it for the DOME ACE, TUCKER!$"
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc
new file mode 100644
index 000000000..8a8d5448e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc
@@ -0,0 +1,10 @@
+BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, 8, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164
+	warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+	warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_BattleDomeCorridor_MapEvents:: @ 853C174
+	map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
index f91cfe2d4..133115e33 100644
--- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleDomeCorridor: @ 8485350
-	.4byte BattleFrontier_BattleDomeCorridor_MapAttributes
+	.4byte BattleFrontier_BattleDomeCorridor_Layout
 	.4byte BattleFrontier_BattleDomeCorridor_MapEvents
 	.4byte BattleFrontier_BattleDomeCorridor_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
new file mode 100644
index 000000000..989ebe2f3
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
@@ -0,0 +1,152 @@
+BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE
+	map_script 2, BattleFrontier_BattleDomeCorridor_MapScript2_24B104
+	.byte 0
+
+BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_24B10E
+	.2byte 0
+
+BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E
+	delay 16
+	setvar VAR_TEMP_0, 1
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161
+	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2
+	applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1A1
+	waitmovement 0
+	opendoor 13, 3
+	waitdooranim
+	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1BE
+	applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1AE
+	waitmovement 0
+	closedoor 13, 3
+	waitdooranim
+	goto BattleFrontier_BattleDomeCorridor_EventScript_24B18F
+
+BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161
+	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1D6
+	applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1C1
+	waitmovement 0
+	opendoor 37, 3
+	waitdooranim
+	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1E6
+	applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1D2
+	waitmovement 0
+	closedoor 37, 3
+	waitdooranim
+
+BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F
+	waitmovement 0
+	setvar VAR_0x8006, 0
+	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7
+	waitstate
+	end
+
+BattleFrontier_BattleDomeCorridor_Movement_24B1A1: @ 824B1A1
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	step_end
+
+BattleFrontier_BattleDomeCorridor_Movement_24B1AE: @ 824B1AE
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	step_end
+
+BattleFrontier_BattleDomeCorridor_Movement_24B1BE: @ 824B1BE
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+BattleFrontier_BattleDomeCorridor_Movement_24B1D2: @ 824B1D2
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	step_end
+
+BattleFrontier_BattleDomeCorridor_Movement_24B1E6: @ 824B1E6
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleDomeCorridor_Movement_24B1E9: @ 824B1E9
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	set_invisible
+	step_end
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/events.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc
new file mode 100644
index 000000000..9c6eb2649
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeLobby/events.inc
@@ -0,0 +1,21 @@
+BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 1, 11, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0
+	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0
+	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0
+	object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0
+
+BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8
+	warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+	warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108
+	bg_event 4, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D52
+	bg_event 7, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D84
+	bg_event 18, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D6B
+	bg_event 15, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E34
+
+BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138
+	map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents
+
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
index 0626aea77..26813d1f1 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleDomeLobby: @ 8485334
-	.4byte BattleFrontier_BattleDomeLobby_MapAttributes
+	.4byte BattleFrontier_BattleDomeLobby_Layout
 	.4byte BattleFrontier_BattleDomeLobby_MapEvents
 	.4byte BattleFrontier_BattleDomeLobby_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
new file mode 100644
index 000000000..1e50357bc
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
@@ -0,0 +1,777 @@
+BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
+	map_script 5, BattleFrontier_BattleDomeLobby_MapScript1_2497F2
+	map_script 2, BattleFrontier_BattleDomeLobby_MapScript2_24980F
+	map_script 4, BattleFrontier_BattleDomeLobby_MapScript2_2497FB
+	.byte 0
+
+BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2
+	setvar VAR_0x8004, 21
+	special sub_818E9AC
+	end
+
+BattleFrontier_BattleDomeLobby_MapScript2_2497FB: @ 82497FB
+BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_249805
+	.2byte 0
+
+BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeLobby_EventScript_249839
+	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleDomeLobby_EventScript_249842
+	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleDomeLobby_EventScript_2499F9
+	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleDomeLobby_EventScript_24989B
+	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleDomeLobby_EventScript_249940
+	.2byte 0
+
+BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839
+	setvar VAR_0x8004, 0
+	special sub_81A1780
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
+	lockall
+	msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, 4
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_818E9AC
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_818E9AC
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 1
+	special sub_818E9AC
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B
+	call BattleFrontier_BattleDomeLobby_EventScript_241EBA
+	lockall
+	setvar VAR_0x8004, 10
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1
+	msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, 4
+	goto BattleFrontier_BattleDomeLobby_EventScript_2498C9
+
+BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1
+	msgbox BattleFrontier_BattleDomeLobby_Text_24AD67, 4
+
+BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
+	msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, 4
+	setvar VAR_0x8004, 11
+	special sub_81A1780
+	msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9
+	message BattleFrontier_BattleDomeLobby_Text_24A5D6
+	waitmessage
+	special LoadPlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	setvar VAR_0x8004, 8
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 1
+	special sub_818E9AC
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	setvar VAR_0x8006, 1
+	special sub_818E9AC
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 1
+	special sub_818E9AC
+	special LoadPlayerParty
+	special HealPlayerParty
+	goto BattleFrontier_BattleDomeLobby_EventScript_249991
+
+BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
+	lockall
+	msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, 4
+	message BattleFrontier_BattleDomeLobby_Text_24A5D6
+	waitmessage
+	special LoadPlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	setvar VAR_0x8004, 8
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_818E9AC
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 1
+	special sub_818E9AC
+	special LoadPlayerParty
+	special HealPlayerParty
+
+BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
+	setvar VAR_0x8004, 13
+	setvar VAR_0x8005, 0
+	special sub_818E9AC
+	playse SE_SAVE
+	waitse
+	call BattleFrontier_BattleDomeLobby_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9
+	message BattleFrontier_BattleDomeLobby_Text_24AE17
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleDomeLobby_EventScript_2499E9
+	case 0, BattleFrontier_BattleDomeLobby_EventScript_2499E4
+	case 127, BattleFrontier_BattleDomeLobby_EventScript_2499E9
+
+BattleFrontier_BattleDomeLobby_EventScript_2499E4:: @ 82499E4
+	call BattleFrontier_BattleDomeLobby_EventScript_23E8B4
+
+BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9
+	msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9
+	lockall
+	msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, 4
+	message BattleFrontier_BattleDomeLobby_Text_24A61A
+	waitmessage
+	setvar VAR_0x8004, 13
+	setvar VAR_0x8005, 1
+	special sub_818E9AC
+	playse SE_SAVE
+	waitse
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	goto BattleFrontier_BattleDomeLobby_EventScript_249BC2
+
+BattleFrontier_BattleDomeLobby_EventScript_249A35:: @ 8249A35
+	lock
+	faceplayer
+	setvar VAR_FRONTIER_FACILITY, 1
+	setvar VAR_0x40CE, 0
+	goto BattleFrontier_BattleDomeLobby_EventScript_249A59
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47
+	lock
+	faceplayer
+	setvar VAR_FRONTIER_FACILITY, 1
+	setvar VAR_0x40CE, 1
+	goto BattleFrontier_BattleDomeLobby_EventScript_249A59
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59
+	special SavePlayerParty
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D06
+
+BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D0F
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D15
+	waitmessage
+	multichoice 17, 6, 23, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleDomeLobby_EventScript_249ABF
+	case 1, BattleFrontier_BattleDomeLobby_EventScript_249BFA
+	case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64
+	case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64
+
+BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
+	message BattleFrontier_BattleDomeLobby_Text_24A210
+	waitmessage
+	multichoice 17, 6, 24, 0
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64
+	case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64
+	setvar VAR_0x8004, 15
+	special sub_81A1780
+	compare VAR_0x8004, 1
+	goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C15
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, 4
+	fadescreen 1
+	call BattleFrontier_BattleDomeLobby_EventScript_23F2B7
+	copyvar VAR_0x8004, VAR_RESULT
+	setvar VAR_0x8005, 3
+	special sub_80F9490
+	waitstate
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C61
+	msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleDomeLobby_EventScript_249C61
+	case 1, BattleFrontier_BattleDomeLobby_EventScript_249B60
+	case 127, BattleFrontier_BattleDomeLobby_EventScript_249C61
+
+BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
+	setvar VAR_TEMP_0, 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	special sub_81A1780
+	setvar VAR_0x8004, 0
+	special sub_818E9AC
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special LoadPlayerParty
+	closemessage
+	delay 2
+	call BattleFrontier_BattleDomeLobby_EventScript_27134F
+	setvar VAR_TEMP_0, 255
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A
+	setvar VAR_0x8004, 22
+	special sub_818E9AC
+
+BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
+	special SavePlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	setvar VAR_0x8004, 15
+	special sub_818E9AC
+	msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4
+	closemessage
+	call BattleFrontier_BattleDomeLobby_EventScript_249C6E
+	special HealPlayerParty
+	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6
+	setvar VAR_TEMP_0, 0
+	waitstate
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D1B
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D24
+	goto BattleFrontier_BattleDomeLobby_EventScript_249A72
+
+BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleDomeLobby_EventScript_249C30
+	case 1, BattleFrontier_BattleDomeLobby_EventScript_249C3D
+
+BattleFrontier_BattleDomeLobby_EventScript_249C30:: @ 8249C30
+	msgbox BattleFrontier_BattleDomeLobby_Text_24A353, 4
+	goto BattleFrontier_BattleDomeLobby_EventScript_249C6C
+
+BattleFrontier_BattleDomeLobby_EventScript_249C3D:: @ 8249C3D
+	msgbox BattleFrontier_BattleDomeLobby_Text_24A2AB, 4
+	goto BattleFrontier_BattleDomeLobby_EventScript_249C6C
+
+BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	goto BattleFrontier_BattleDomeLobby_EventScript_249C64
+
+BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61
+	special LoadPlayerParty
+
+BattleFrontier_BattleDomeLobby_EventScript_249C64:: @ 8249C64
+	msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4
+
+BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C
+	release
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5
+	applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D45
+	waitmovement 0
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D33
+	waitdooranim
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5
+	applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D4E
+	waitmovement 0
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D3F
+	waitdooranim
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249CDD:: @ 8249CDD
+	applymovement 1, BattleFrontier_BattleDomeLobby_Movement_249D45
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249CE5:: @ 8249CE5
+	applymovement 6, BattleFrontier_BattleDomeLobby_Movement_249D45
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249CED:: @ 8249CED
+	applymovement 1, BattleFrontier_BattleDomeLobby_Movement_249D4B
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249CF5:: @ 8249CF5
+	applymovement 6, BattleFrontier_BattleDomeLobby_Movement_249D4B
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249CFD:: @ 8249CFD
+	msgbox BattleFrontier_BattleDomeLobby_Text_249EB7, 4
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249D06:: @ 8249D06
+	msgbox BattleFrontier_BattleDomeLobby_Text_24A664, 4
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249D0F:: @ 8249D0F
+	message BattleFrontier_BattleDomeLobby_Text_249F3A
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249D15:: @ 8249D15
+	message BattleFrontier_BattleDomeLobby_Text_24A6E7
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249D1B:: @ 8249D1B
+	msgbox BattleFrontier_BattleDomeLobby_Text_249F8E, 4
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249D24:: @ 8249D24
+	msgbox BattleFrontier_BattleDomeLobby_Text_24A721, 4
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249D2D:: @ 8249D2D
+	opendoor 5, 4
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249D33:: @ 8249D33
+	opendoor 17, 4
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249D39:: @ 8249D39
+	closedoor 5, 4
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249D3F:: @ 8249D3F
+	closedoor 17, 4
+	return
+
+BattleFrontier_BattleDomeLobby_Movement_249D45: @ 8249D45
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattleDomeLobby_Movement_249D4B: @ 8249D4B
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 9
+	special sub_818E9AC
+	compare VAR_RESULT, 0
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DC9
+	compare VAR_RESULT, 1
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DD2
+	compare VAR_RESULT, 2
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DDB
+	compare VAR_RESULT, 3
+	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DE4
+	fadescreen 1
+	setvar VAR_0x8004, 8
+	special sub_818E9AC
+	waitstate
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249DC9:: @ 8249DC9
+	msgbox BattleFrontier_BattleDomeLobby_Text_24A966, 3
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249DD2:: @ 8249DD2
+	msgbox BattleFrontier_BattleDomeLobby_Text_24A9A9, 3
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249DDB:: @ 8249DDB
+	msgbox BattleFrontier_BattleDomeLobby_Text_24A9EC, 3
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4
+	msgbox BattleFrontier_BattleDomeLobby_Text_24AA31, 3
+	return
+
+BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED
+	setvar VAR_0x8004, 20
+	special sub_818E9AC
+	msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, 2
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249DFE:: @ 8249DFE
+	msgbox BattleFrontier_BattleDomeLobby_Text_24AB94, 2
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249E07:: @ 8249E07
+	msgbox BattleFrontier_BattleDomeLobby_Text_24AC76, 2
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249E10:: @ 8249E10
+	msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_249E19:: @ 8249E19
+	msgbox BattleFrontier_OutsideWest_Text_24AB06, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_249E22:: @ 8249E22
+	loadword 0, BattleFrontier_OutsideWest_Text_24AB44
+	callstd 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_249E2B:: @ 8249E2B
+	loadword 0, BattleFrontier_OutsideWest_Text_24AB75
+	callstd 2
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249E34:: @ 8249E34
+	lockall
+	msgbox BattleFrontier_BattleDomeLobby_Text_24AE63, 4
+	goto BattleFrontier_BattleDomeLobby_EventScript_249E43
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249E43:: @ 8249E43
+	message BattleFrontier_BattleDomeLobby_Text_24AE8B
+	waitmessage
+	multichoice 17, 4, 98, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleDomeLobby_EventScript_249E8B
+	case 1, BattleFrontier_BattleDomeLobby_EventScript_249E99
+	case 2, BattleFrontier_BattleDomeLobby_EventScript_249EA7
+	case 3, BattleFrontier_BattleDomeLobby_EventScript_249EB5
+	case 127, BattleFrontier_BattleDomeLobby_EventScript_249EB5
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249E8B:: @ 8249E8B
+	msgbox BattleFrontier_BattleDomeLobby_Text_24AEAE, 4
+	goto BattleFrontier_BattleDomeLobby_EventScript_249E43
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249E99:: @ 8249E99
+	msgbox BattleFrontier_BattleDomeLobby_Text_24AF4C, 4
+	goto BattleFrontier_BattleDomeLobby_EventScript_249E43
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249EA7:: @ 8249EA7
+	msgbox BattleFrontier_BattleDomeLobby_Text_24B073, 4
+	goto BattleFrontier_BattleDomeLobby_EventScript_249E43
+	end
+
+BattleFrontier_BattleDomeLobby_EventScript_249EB5:: @ 8249EB5
+	releaseall
+	end
+
+BattleFrontier_BattleDomeLobby_Text_249EB7: @ 8249EB7
+	.string "Where the strategies of TRAINERS\n"
+	.string "are put to the test!\p"
+	.string "Welcome to the BATTLE DOME!\p"
+	.string "I am your guide to the SINGLE BATTLE\n"
+	.string "Tournament.$"
+
+BattleFrontier_BattleDomeLobby_Text_249F3A: @ 8249F3A
+	.string "Would you like to challenge\n"
+	.string "the SINGLE BATTLE Tournament?$"
+
+BattleFrontier_BattleDomeLobby_Text_249F74: @ 8249F74
+	.string "We hope to see you again.$"
+
+BattleFrontier_BattleDomeLobby_Text_249F8E: @ 8249F8E
+	.string "The SINGLE BATTLE Tournament\n"
+	.string "is exactly as the name suggests--\l"
+	.string "a tournament of SINGLE BATTLES.\p"
+	.string "All participating TRAINERS must\n"
+	.string "enter three POKéMON each.\p"
+	.string "In each battle, one of the three\n"
+	.string "POKéMON must be held in reserve.\p"
+	.string "The other two POKéMON can battle\n"
+	.string "one at a time.\p"
+	.string "Choose the two battling POKéMON after\n"
+	.string "examining the opponent’s trio.\p"
+	.string "You win the tournament by defeating\n"
+	.string "four TRAINERS.\p"
+	.string "Battle Points are awarded to\n"
+	.string "the tournament winner.\p"
+	.string "If you want to interrupt your\n"
+	.string "tournament, please save the game.\p"
+	.string "If you don’t save before interrupting,\n"
+	.string "you will be disqualified.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A1C6: @ 824A1C6
+	.string "Before I show you to the BATTLE DOME,\n"
+	.string "I must save the data. Is that okay?$"
+
+BattleFrontier_BattleDomeLobby_Text_24A210: @ 824A210
+	.string "The tournament offers two levels\n"
+	.string "of challenge, Level 50 and Open Level.\l"
+	.string "Which is your choice?$"
+
+BattleFrontier_BattleDomeLobby_Text_24A26E: @ 824A26E
+	.string "Now select the three POKéMON that\n"
+	.string "you wish to enter, please.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A2AB: @ 824A2AB
+	.string "Excuse me!\p"
+	.string "You don’t have three eligible POKéMON.\p"
+	.string "Also, the POKéMON must be holding\n"
+	.string "different kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Please come see me when you are ready.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A353: @ 824A353
+	.string "Excuse me!\p"
+	.string "You don’t have three eligible POKéMON.\p"
+	.string "You must have three different POKéMON\n"
+	.string "of Level 50 or less to enter.\p"
+	.string "They also must be holding different\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Please come see me when you are ready.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A437: @ 824A437
+	.string "I will now show you to\n"
+	.string "the BATTLE DOME.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A45F: @ 824A45F
+	.string "Excuse me!\p"
+	.string "You didn’t save before you quit your\n"
+	.string "challenge last time.\p"
+	.string "Because of that, your challenge so far\n"
+	.string "has been disqualified. Sorry!$"
+
+BattleFrontier_BattleDomeLobby_Text_24A4E9: @ 824A4E9
+	.string "Congratulations for winning\n"
+	.string "your Battle Tournament!$"
+
+BattleFrontier_BattleDomeLobby_Text_24A51D: @ 824A51D
+	.string "Here is your prize for your Battle\n"
+	.string "Tournament victory.$"
+
+VerdanturfTown_BattleTentLobby_Text_24A554: @ 824A554
+	.string "{PLAYER} received the prize\n"
+	.string "{STR_VAR_1}.$"
+
+VerdanturfTown_BattleTentLobby_Text_24A56E: @ 824A56E
+	.string "Oh, your BAG appears to be full.\p"
+	.string "Please make room in your BAG, then come\n"
+	.string "see me.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A5BF: @ 824A5BF
+	.string "Thank you for playing!$"
+
+BattleFrontier_BattleDomeLobby_Text_24A5D6: @ 824A5D6
+	.string "Your record will be saved.\n"
+	.string "Please wait.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A5FE: @ 824A5FE
+	.string "We’ve been waiting for you!$"
+
+BattleFrontier_BattleDomeLobby_Text_24A61A: @ 824A61A
+	.string "Before I show you to the BATTLE DOME,\n"
+	.string "I must save the data. Is that okay?$"
+
+BattleFrontier_BattleDomeLobby_Text_24A664: @ 824A664
+	.string "Where the strategies of TRAINERS\n"
+	.string "are put to the test!\p"
+	.string "Welcome to the BATTLE DOME!\p"
+	.string "I am your guide to the DOUBLE BATTLE\n"
+	.string "Tournament.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A6E7: @ 824A6E7
+	.string "Would you like to challenge\n"
+	.string "the DOUBLE BATTLE Tournament?$"
+
+BattleFrontier_BattleDomeLobby_Text_24A721: @ 824A721
+	.string "The DOUBLE BATTLE Tournament\n"
+	.string "is exactly as the name suggests--\l"
+	.string "a tournament of DOUBLE BATTLES.\p"
+	.string "All participating TRAINERS must\n"
+	.string "enter three POKéMON each.\p"
+	.string "In each battle, one of the three\n"
+	.string "POKéMON must be held in reserve.\p"
+	.string "The remaining two POKéMON must take\n"
+	.string "part in a DOUBLE BATTLE.\p"
+	.string "Choose the two battling POKéMON after\n"
+	.string "examining the opponent’s trio.\p"
+	.string "You win the tournament by defeating\n"
+	.string "four TRAINERS.\p"
+	.string "Battle Points are awarded to\n"
+	.string "the tournament winner.\p"
+	.string "If you want to interrupt your\n"
+	.string "tournament, please save the game.\p"
+	.string "If you don’t save before interrupting,\n"
+	.string "you will be disqualified.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A966: @ 824A966
+	.string "They’re the results of the last\n"
+	.string "Level 50 SINGLE BATTLE Tournament.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A9A9: @ 824A9A9
+	.string "They’re the results of the last\n"
+	.string "Level 50 DOUBLE BATTLE Tournament.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A9EC: @ 824A9EC
+	.string "They’re the results of the last\n"
+	.string "Open Level SINGLE BATTLE Tournament.$"
+
+BattleFrontier_BattleDomeLobby_Text_24AA31: @ 824AA31
+	.string "They’re the results of the last\n"
+	.string "Open Level DOUBLE BATTLE Tournament.$"
+
+BattleFrontier_BattleDomeLobby_Text_24AA76: @ 824AA76
+	.string "Did you see it?\n"
+	.string "The last Battle Tournament?\p"
+	.string "The winner, {STR_VAR_1}, was seriously\n"
+	.string "tough.\p"
+	.string "You should check out the results\n"
+	.string "on the monitor beside the PC.$"
+
+BattleFrontier_OutsideWest_Text_24AB06: @ 824AB06
+	.string "The BATTLE FRONTIER…\n"
+	.string "I’ve long dreamed about a place like it.$"
+
+BattleFrontier_OutsideWest_Text_24AB44: @ 824AB44
+	.string "The BATTLE DOME\n"
+	.string "Become the Unbeatable Superstar!$"
+
+BattleFrontier_OutsideWest_Text_24AB75: @ 824AB75
+	.string "The ??????\n"
+	.string "Under Construction!$"
+
+BattleFrontier_BattleDomeLobby_Text_24AB94: @ 824AB94
+	.string "When a TRAINER chains tournament\n"
+	.string "wins at the BATTLE DOME, he or she\l"
+	.string "gains a reputation as a star.\p"
+	.string "Tough TRAINERS are drawn by that\n"
+	.string "reputation to the BATTLE DOME.\p"
+	.string "A true superstar is a TRAINER who\n"
+	.string "can keep winning tournaments.$"
+
+BattleFrontier_BattleDomeLobby_Text_24AC76: @ 824AC76
+	.string "I ran into one of the tournament\n"
+	.string "favorites in the very first round.\p"
+	.string "Of course I got trashed…$"
+
+BattleFrontier_BattleDomeLobby_Text_24ACD3: @ 824ACD3
+	.string "I would’ve won if I’d kept this POKéMON\n"
+	.string "held in reserve.\p"
+	.string "You need to check your opponent’s\n"
+	.string "POKéMON carefully before choosing\l"
+	.string "your battling POKéMON.$"
+
+BattleFrontier_BattleDomeLobby_Text_24AD67: @ 824AD67
+	.string "Congratulations!\p"
+	.string "You defeated the DOME ACE and won\n"
+	.string "the Battle Tournament!$"
+
+BattleFrontier_BattleDomeLobby_Text_24ADB1: @ 824ADB1
+	.string "In recognition of your strategy--\n"
+	.string "a thing of beauty it was, too--\l"
+	.string "we award you these Battle Point(s)!$"
+
+BattleFrontier_BattleDomeLobby_Text_24AE17: @ 824AE17
+	.string "Would you like to record your\n"
+	.string "last BATTLE DOME match on your\l"
+	.string "FRONTIER PASS?$"
+
+BattleFrontier_BattleDomeLobby_Text_24AE63: @ 824AE63
+	.string "The Battle Tournament rules\n"
+	.string "are listed.$"
+
+BattleFrontier_BattleDomeLobby_Text_24AE8B: @ 824AE8B
+	.string "Which heading do you want to read?$"
+
+BattleFrontier_BattleDomeLobby_Text_24AEAE: @ 824AEAE
+	.string "The tournament matchups are drawn up\n"
+	.string "based on the toughness of POKéMON\l"
+	.string "held by TRAINERS.\p"
+	.string "The matchups avoid having tough\n"
+	.string "TRAINERS face each other right away.$"
+
+BattleFrontier_BattleDomeLobby_Text_24AF4C: @ 824AF4C
+	.string "The tournament chart, or as we call it,\n"
+	.string "the “Tree,” is available for viewing\l"
+	.string "in the Waiting Room from any guide.\p"
+	.string "The Tournament Tree will provide\n"
+	.string "several kinds of data.\p"
+	.string "The data on view includes the previous\n"
+	.string "tournament’s results, the POKéMON held\l"
+	.string "by TRAINERS, and the battle styles of\l"
+	.string "TRAINERS.$"
+
+BattleFrontier_BattleDomeLobby_Text_24B073: @ 824B073
+	.string "If battling POKéMON faint at the same\n"
+	.string "time--a double KO--in a tournament\l"
+	.string "match, the REFEREES will review\l"
+	.string "the match and declare the winner.$"
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc
new file mode 100644
index 000000000..7f2133ac5
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc
@@ -0,0 +1,10 @@
+BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0
+	warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+	warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_BattleDomePreBattleRoom_MapEvents:: @ 853C1B0
+	map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
index 7e06ab60a..e25a62ce8 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleDomePreBattleRoom: @ 848536C
-	.4byte BattleFrontier_BattleDomePreBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattleDomePreBattleRoom_Layout
 	.4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
new file mode 100644
index 000000000..024162cee
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
@@ -0,0 +1,417 @@
+BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9
+	map_script 2, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218
+	map_script 4, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204
+	.byte 0
+
+BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E
+	.2byte 0
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222
+	.2byte 0
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222
+	compare VAR_0x8006, 1
+	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	setvar VAR_TEMP_0, 1
+	applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652
+	waitmovement 0
+	lockall
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F
+	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB
+	waitmessage
+	switch VAR_RESULT
+	call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1
+	multichoice 16, 0, 73, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD
+	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5
+	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D
+	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D
+	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349
+	case 5, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377
+	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1:: @ 824B2C1
+	multichoice 16, 2, 107, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD
+	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5
+	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D
+	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349
+	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377
+	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D:: @ 824B30D
+	message BattleFrontier_BattleDomePreBattleRoom_Text_24BAF7
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F
+	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F:: @ 824B33F
+	call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8B4
+	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349:: @ 824B349
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA69, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB
+	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377
+	message BattleFrontier_BattleDomePreBattleRoom_Text_24BA93
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9
+	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9
+	setvar VAR_0x8004, 12
+	setvar VAR_0x8005, 9
+	special sub_818E9AC
+	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
+	message BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3
+	waitmessage
+	setvar VAR_0x8004, 13
+	setvar VAR_0x8005, 2
+	special sub_818E9AC
+	playse SE_SAVE
+	waitse
+	fadescreen 1
+	setvar VAR_0x8004, 4
+	special sub_81A1780
+	end
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, 4
+	fadescreen 1
+	setvar VAR_0x8004, 6
+	special sub_818E9AC
+	waitstate
+	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5
+	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A
+	fadescreen 1
+	setvar VAR_0x8004, 7
+	special sub_818E9AC
+	waitstate
+	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449
+	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452
+	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B
+	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449:: @ 824B449
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9, 4
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452:: @ 824B452
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD, 4
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B:: @ 824B45B
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA21, 4
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464:: @ 824B464
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA46, 4
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
+	message BattleFrontier_BattleDomePreBattleRoom_Text_24B70C
+	waitmessage
+	waitbuttonpress
+	fadescreen 1
+	call BattleFrontier_BattleDomePreBattleRoom_EventScript_23F2B7
+	copyvar VAR_0x8004, VAR_RESULT
+	setvar VAR_0x8005, 2
+	special sub_80F9490
+	waitstate
+	setvar VAR_0x8004, 21
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 8
+	special sub_818E9AC
+	setvar VAR_0x8004, 18
+	special sub_818E9AC
+	setvar VAR_0x8004, 9
+	special sub_818E9AC
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, 4
+	closemessage
+	applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F
+	waitmovement 0
+	applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657
+	waitmovement 0
+	opendoor 5, 1
+	waitdooranim
+	applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659
+	waitmovement 0
+	closedoor 5, 1
+	waitdooranim
+	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 255, 9, 5
+	setvar VAR_TEMP_0, 0
+	waitstate
+	end
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB:: @ 824B4FB
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A
+	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540
+	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546
+	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A:: @ 824B53A
+	message BattleFrontier_BattleDomePreBattleRoom_Text_24B65C
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540:: @ 824B540
+	message BattleFrontier_BattleDomePreBattleRoom_Text_24B689
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546:: @ 824B546
+	message BattleFrontier_BattleDomePreBattleRoom_Text_24B6B6
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C
+	setvar VAR_0x8004, 9
+	special sub_81A1780
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B
+	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0
+	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B
+	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0
+	message BattleFrontier_BattleDomePreBattleRoom_Text_24B6E3
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B
+	checkflag FLAG_0x001
+	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, 4
+	setflag FLAG_0x001
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0
+	checkflag FLAG_0x001
+	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, 4
+	setflag FLAG_0x001
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5:: @ 824B5B5
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A, 4
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE:: @ 824B5BE
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC63, 4
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
+	setvar VAR_TEMP_0, 1
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, 4
+	special LoadPlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600
+	fadescreen 1
+	setvar VAR_0x8004, 11
+	special sub_818E9AC
+	waitstate
+	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634
+	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D
+	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634:: @ 824B634
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3, 4
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D:: @ 824B63D
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1, 4
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646:: @ 824B646
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B83F, 4
+	return
+
+BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F: @ 824B64F
+	walk_right
+	face_left
+	step_end
+
+BattleFrontier_BattleDomePreBattleRoom_Movement_24B652: @ 824B652
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattleDomePreBattleRoom_Movement_24B657: @ 824B657
+	walk_up
+	step_end
+
+BattleFrontier_BattleDomePreBattleRoom_Movement_24B659: @ 824B659
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B65C: @ 824B65C
+	.string "Your 1st-round match is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B689: @ 824B689
+	.string "Your 2nd-round match is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B6B6: @ 824B6B6
+	.string "Your semifinal match is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B6E3: @ 824B6E3
+	.string "Your final match is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B70C: @ 824B70C
+	.string "Please choose the two POKéMON\n"
+	.string "that are to appear in battle.$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B748: @ 824B748
+	.string "Right this way, please.$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B760: @ 824B760
+	.string "Thank you for competing!\p"
+	.string "I’ll restore your POKéMON to\n"
+	.string "full health.$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3: @ 824B7A3
+	.string "All 1st-round matches have been\n"
+	.string "completed.\p"
+	.string "These are the teams that advanced!$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1: @ 824B7F1
+	.string "All 2nd-round matches have been\n"
+	.string "completed.\p"
+	.string "These are the teams that advanced!$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B83F: @ 824B83F
+	.string "All semifinal matches have been\n"
+	.string "completed.\p"
+	.string "These are the teams that advanced!$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B88D: @ 824B88D
+	.string "Congratulations for getting through\n"
+	.string "the 1st round.\p"
+	.string "The 2nd round is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B8E6: @ 824B8E6
+	.string "Congratulations for advancing\n"
+	.string "to the semifinals.\p"
+	.string "The best four teams meet in this round.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B94E: @ 824B94E
+	.string "Congratulations for advancing\n"
+	.string "to the final match.\p"
+	.string "You’re one win from the championship.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5: @ 824B9B5
+	.string "{PLAYER}’s next opponent\n"
+	.string "is this TRAINER.$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9: @ 824B9D9
+	.string "The tournament is in the 1st round.$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD: @ 824B9FD
+	.string "The tournament is in the 2nd round.$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24BA21: @ 824BA21
+	.string "The tournament is in the semifinals.$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24BA46: @ 824BA46
+	.string "The tournament is up to the final.$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24BA69: @ 824BA69
+	.string "Would you like to save and\n"
+	.string "quit the game?$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24BA93: @ 824BA93
+	.string "Would you like to retire from your\n"
+	.string "Battle Tournament challenge?$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3: @ 824BAD3
+	.string "I am saving your data.\n"
+	.string "Please wait.$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24BAF7: @ 824BAF7
+	.string "Should I record your last match\n"
+	.string "on your FRONTIER PASS?$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E: @ 824BB2E
+	.string "Congratulations for advancing\n"
+	.string "to the final match.\p"
+	.string "For the final match, you will challenge\n"
+	.string "the DOME ACE TUCKER.\p"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC: @ 824BBAC
+	.string "Congratulations for advancing\n"
+	.string "to the final match.\p"
+	.string "For the final match, you will challenge\n"
+	.string "the DOME ACE TUCKER.\p"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A: @ 824BC2A
+	.string "Your final battle against TUCKER is\n"
+	.string "next. Are you ready?$"
+
+BattleFrontier_BattleDomePreBattleRoom_Text_24BC63: @ 824BC63
+	.string "Your final battle against TUCKER is\n"
+	.string "next. Are you ready?$"
+
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
new file mode 100644
index 000000000..2ea1fbd41
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
@@ -0,0 +1,13 @@
+BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 8, 255, 0, 5, 11, 0, 7, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C
+	map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
index 51aa2cb06..f3050926a 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
-	.4byte BattleFrontier_BattleFactoryBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattleFactoryBattleRoom_Layout
 	.4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
new file mode 100644
index 000000000..5b6a674fb
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
@@ -0,0 +1,384 @@
+BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB
+	map_script 3, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB
+	map_script 4, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00
+	map_script 2, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31
+	.byte 0
+
+BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
+	setvar VAR_0x8004, 5
+	special sub_81A1780
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
+	compare VAR_RESULT, 1
+	call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
+	setvar VAR_0x8004, 9
+	special sub_81A1780
+	copyvar VAR_TEMP_F, VAR_RESULT
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3
+	end
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3:: @ 825ADF3
+	call BattleFrontier_BattleFactoryBattleRoom_EventScript_242170
+	setobjectxyperm 2, 7, 9
+	end
+
+BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A
+	.2byte 0
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A
+	setvar VAR_TEMP_1, 1
+	hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
+	compare VAR_TEMP_F, 0
+	goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24
+	hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24
+	end
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25:: @ 825AE25
+	setvar VAR_OBJ_GFX_ID_F, 100
+	return
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B:: @ 825AE2B
+	setvar VAR_OBJ_GFX_ID_F, 105
+	return
+
+BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67
+	.2byte 0
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, 4
+	closemessage
+	applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B
+	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
+	applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
+	waitmovement 0
+	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7
+	end
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67
+	compare VAR_TEMP_F, 0
+	goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B
+	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
+	applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
+	waitmovement 0
+	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4
+	setvar VAR_0x8004, 11
+	special sub_81A5E74
+	removeobject 2
+	setobjectxyperm 2, 7, 1
+	addobject 2
+	applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B184
+	waitmovement 0
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
+	compare VAR_TEMP_F, 0
+	goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C
+	setvar VAR_0x8004, 5
+	special sub_8195960
+	lockall
+	msgbox 0x2021fc4, 4
+	waitmessage
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special HealPlayerParty
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 0
+	special sub_8163AC4
+	waitstate
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8:: @ 825AEF8
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 4
+	special sub_81A1780
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190
+@ 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 3
+	special sub_81A5E74
+	compare VAR_RESULT, 9999
+	goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
+	addvar VAR_RESULT, 1
+	setorcopyvar VAR_0x8006, VAR_RESULT
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	special sub_81A5E74
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E
+	call BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	addvar VAR_RESULT, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	switch VAR_RESULT
+	case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85
+	setvar VAR_0x8006, 1
+	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8
+	waitstate
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 3
+	special sub_81A1780
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C
+	switch VAR_TEMP_F
+	case 2, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051
+	case 3, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
+	case 4, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, 4
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4
+	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C
+	setvar VAR_0x8004, 12
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, 4
+	closemessage
+	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182
+	waitmovement 0
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattleFactoryBattleRoom_Text_25B460
+	waitmessage
+	waitfanfare
+	setvar VAR_0x8004, 13
+	special sub_81A1780
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, 4
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, 4
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4
+	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
+	setvar VAR_0x8004, 12
+	special sub_81A1780
+	compare VAR_RESULT, 2
+	goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, 4
+	waitmessage
+	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182
+	waitmovement 0
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattleFactoryBattleRoom_Text_25B640
+	waitmessage
+	waitfanfare
+	setvar VAR_0x8004, 13
+	special sub_81A1780
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, 4
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special HealPlayerParty
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 0
+	special sub_8163AC4
+	waitstate
+	return
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 3
+	special sub_81A5E74
+	compare VAR_RESULT, 9999
+	goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
+	addvar VAR_RESULT, 1
+	setorcopyvar VAR_0x8006, VAR_RESULT
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	special sub_81A5E74
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	special sub_81A5E74
+	compare VAR_RESULT, 9999
+	goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43
+	addvar VAR_RESULT, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A5E74
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	addvar VAR_RESULT, 1
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85
+	end
+
+BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B: @ 825B17B
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	face_right
+	step_end
+
+BattleFrontier_BattleFactoryBattleRoom_Movement_25B182: @ 825B182
+	walk_right
+	step_end
+
+BattleFrontier_BattleFactoryBattleRoom_Movement_25B184: @ 825B184
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	face_left
+	step_end
+
+BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B
+	walk_up
+	walk_up
+	walk_up
+	face_left
+	step_end
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190
+	copyvar VAR_RESULT, VAR_0x40CE
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA
+	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8
+	waitstate
+	end
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA
+	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8
+	waitstate
+	end
+
+BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4
+	applymovement 1, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
+	applymovement 3, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
+	applymovement 4, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
+	applymovement 5, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
+	applymovement 6, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
+	applymovement 7, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
+	waitmovement 0
+	return
+
+BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2: @ 825B1E2
+	.string "Hey, hey!\n"
+	.string "Get a move on!$"
+
+BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB: @ 825B1FB
+	.string "Hey, my name’s NOLAND!\n"
+	.string "I’m basically in charge of this place,\l"
+	.string "which is why I’m the FACTORY HEAD!\p"
+	.string "I had a look at your Battle Swap data.\p"
+	.string "You seem to have the right idea,\n"
+	.string "but you’re still square in your head!\p"
+	.string "Listen up, okay? Knowledge isn’t only\n"
+	.string "about reading books or doing desk work.\p"
+	.string "Just doing that sort of thing…\n"
+	.string "It may as well be useless!\p"
+	.string "You have to experience things with\n"
+	.string "your heart and your body, understand?\p"
+	.string "I’ll take you on under the same\n"
+	.string "conditions as you.\p"
+	.string "I’ll be using rental POKéMON, too!$"
+
+BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1: @ 825B3F1
+	.string "Shake out every last bit of your\n"
+	.string "knowledge and bring it on!$"
+
+BattleFrontier_BattleFactoryBattleRoom_Text_25B42D: @ 825B42D
+	.string "NOLAND: Smart going!\n"
+	.string "Let’s see your FRONTIER PASS.$"
+
+BattleFrontier_BattleFactoryBattleRoom_Text_25B460: @ 825B460
+	.string "The Knowledge Symbol was embossed\n"
+	.string "on the FRONTIER PASS!$"
+
+BattleFrontier_BattleFactoryBattleRoom_Text_25B498: @ 825B498
+	.string "Heh…\n"
+	.string "You’re a pretty bright spark…\p"
+	.string "Next time, I’ll come after you hard.\n"
+	.string "No holds barred, understand?\p"
+	.string "You keep up your studies!$"
+
+BattleFrontier_BattleFactoryBattleRoom_Text_25B517: @ 825B517
+	.string "NOLAND: Hey, hey! How’s it going?\n"
+	.string "You keeping up with your studies?\p"
+	.string "…Oh?\p"
+	.string "You’ve taken on a harder look than\n"
+	.string "the last time I saw you.\p"
+	.string "Now, this should be fun!\n"
+	.string "I’m getting excited, hey!$"
+
+BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF: @ 825B5CF
+	.string "All right!\n"
+	.string "Bring it on!$"
+
+BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7: @ 825B5E7
+	.string "NOLAND: What the…\n"
+	.string "You’re getting out of my league!\p"
+	.string "Sheesh!\n"
+	.string "Let’s see that FRONTIER PASS!$"
+
+BattleFrontier_BattleFactoryBattleRoom_Text_25B640: @ 825B640
+	.string "The Knowledge Symbol took on\n"
+	.string "a golden shine!$"
+
+BattleFrontier_BattleFactoryBattleRoom_Text_25B66D: @ 825B66D
+	.string "Pfft, man!\p"
+	.string "That’s absolutely the last time\n"
+	.string "I lose to you!\p"
+	.string "We have to do this again, hey?$"
+
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc
new file mode 100644
index 000000000..13de4c539
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc
@@ -0,0 +1,20 @@
+BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, 10, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0
+	object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, 1, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0
+	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0
+
+BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68
+	warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+	warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78
+	bg_event 2, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587E1
+	bg_event 11, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587FA
+	bg_event 9, 4, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258839
+
+BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C
+	map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents
+
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
index f4304d579..7da242183 100644
--- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleFactoryLobby: @ 84854A0
-	.4byte BattleFrontier_BattleFactoryLobby_MapAttributes
+	.4byte BattleFrontier_BattleFactoryLobby_Layout
 	.4byte BattleFrontier_BattleFactoryLobby_MapEvents
 	.4byte BattleFrontier_BattleFactoryLobby_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
new file mode 100644
index 000000000..ec2483390
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
@@ -0,0 +1,611 @@
+BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8
+	map_script 2, BattleFrontier_BattleFactoryLobby_MapScript2_258407
+	map_script 4, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3
+	.byte 0
+
+BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2583FD
+	.2byte 0
+
+BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258431
+	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleFactoryLobby_EventScript_25843A
+	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleFactoryLobby_EventScript_258592
+	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleFactoryLobby_EventScript_25849B
+	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleFactoryLobby_EventScript_258506
+	.2byte 0
+
+BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431
+	setvar VAR_0x8004, 0
+	special sub_81A1780
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
+	lockall
+	msgbox BattleFrontier_BattleFactoryLobby_Text_258ECA, 4
+	closemessage
+	setvar VAR_0x8004, 8
+	special sub_81A5E74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A5E74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_81A5E74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 0
+	special sub_81A5E74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B
+	lockall
+	setvar VAR_0x8004, 10
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD
+	msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, 4
+	waitmessage
+	goto BattleFrontier_BattleFactoryLobby_EventScript_2584C6
+
+BattleFrontier_BattleFactoryLobby_EventScript_2584BD:: @ 82584BD
+	msgbox BattleFrontier_BattleFactoryLobby_Text_25926A, 4
+	waitmessage
+
+BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6
+	msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, 4
+	setvar VAR_0x8004, 11
+	special sub_81A1780
+	msgbox BattleFrontier_BattleFactoryLobby_Text_241520, 9
+	message BattleFrontier_BattleFactoryLobby_Text_259323
+	waitmessage
+	setvar VAR_0x8004, 8
+	special sub_81A1780
+	special LoadPlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 0
+	special sub_81A5E74
+	playse SE_SAVE
+	waitse
+	goto BattleFrontier_BattleFactoryLobby_EventScript_25853B
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506
+	lockall
+	message BattleFrontier_BattleFactoryLobby_Text_258CC7
+	waitmessage
+	setvar VAR_0x8004, 8
+	special sub_81A1780
+	special LoadPlayerParty
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 0
+	special sub_81A5E74
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 0
+	special sub_81A5E74
+	playse SE_SAVE
+	waitse
+
+BattleFrontier_BattleFactoryLobby_EventScript_25853B:: @ 825853B
+	call BattleFrontier_BattleFactoryLobby_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258582
+	message BattleFrontier_BattleFactoryLobby_Text_259388
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleFactoryLobby_EventScript_258582
+	case 0, BattleFrontier_BattleFactoryLobby_EventScript_25857D
+	case 127, BattleFrontier_BattleFactoryLobby_EventScript_258582
+
+BattleFrontier_BattleFactoryLobby_EventScript_25857D:: @ 825857D
+	call BattleFrontier_BattleFactoryLobby_EventScript_23E8B4
+
+BattleFrontier_BattleFactoryLobby_EventScript_258582:: @ 8258582
+	msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592
+	lockall
+	message BattleFrontier_BattleFactoryLobby_Text_258E77
+	waitmessage
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 1
+	special sub_81A5E74
+	playse SE_SAVE
+	waitse
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	setvar VAR_0x8006, 2
+	goto BattleFrontier_BattleFactoryLobby_EventScript_25871A
+
+BattleFrontier_BattleFactoryLobby_EventScript_2585CB:: @ 82585CB
+	lock
+	faceplayer
+	setvar VAR_FRONTIER_FACILITY, 4
+	setvar VAR_0x40CE, 0
+	goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD
+	setvar VAR_FRONTIER_FACILITY, 4
+	setvar VAR_0x40CE, 1
+	goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED
+	special SavePlayerParty
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587BA
+
+BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C3
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C9
+	waitmessage
+	multichoice 17, 6, 23, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleFactoryLobby_EventScript_258653
+	case 1, BattleFrontier_BattleFactoryLobby_EventScript_258768
+	case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D
+	case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879D
+
+BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653
+	message BattleFrontier_BattleFactoryLobby_Text_258BE9
+	waitmessage
+	multichoice 17, 6, 24, 0
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D
+	case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879D
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleFactoryLobby_EventScript_25879A
+	case 1, BattleFrontier_BattleFactoryLobby_EventScript_2586B9
+	case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879A
+
+BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
+	setvar VAR_TEMP_0, 0
+	setvar VAR_0x8004, 0
+	special sub_81A5E74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 1
+	special sub_81A5E74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	closemessage
+	delay 2
+	call BattleFrontier_BattleFactoryLobby_EventScript_27134F
+	setvar VAR_TEMP_0, 255
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258783
+	setvar VAR_0x8006, 0
+
+BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A
+	special SavePlayerParty
+	msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, 4
+	closemessage
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762
+	applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7
+	applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC
+	waitmovement 0
+	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13
+	setvar VAR_TEMP_0, 0
+	waitstate
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_25875C:: @ 825875C
+	setvar VAR_LAST_TALKED, 1
+	return
+
+BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762
+	setvar VAR_LAST_TALKED, 6
+	return
+
+BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587CF
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587D8
+	goto BattleFrontier_BattleFactoryLobby_EventScript_258606
+
+BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	goto BattleFrontier_BattleFactoryLobby_EventScript_25879D
+
+BattleFrontier_BattleFactoryLobby_EventScript_25879A:: @ 825879A
+	special LoadPlayerParty
+
+BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D
+	msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4
+	release
+	end
+
+BattleFrontier_BattleFactoryLobby_Movement_2587A7: @ 82587A7
+	walk_up
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleFactoryLobby_Movement_2587AC: @ 82587AC
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattleFactoryLobby_EventScript_2587B1:: @ 82587B1
+	msgbox BattleFrontier_BattleFactoryLobby_Text_2588EE, 4
+	return
+
+BattleFrontier_BattleFactoryLobby_EventScript_2587BA:: @ 82587BA
+	msgbox BattleFrontier_BattleFactoryLobby_Text_258F93, 4
+	return
+
+BattleFrontier_BattleFactoryLobby_EventScript_2587C3:: @ 82587C3
+	message BattleFrontier_BattleFactoryLobby_Text_25897A
+	return
+
+BattleFrontier_BattleFactoryLobby_EventScript_2587C9:: @ 82587C9
+	message BattleFrontier_BattleFactoryLobby_Text_25901F
+	return
+
+BattleFrontier_BattleFactoryLobby_EventScript_2587CF:: @ 82587CF
+	msgbox BattleFrontier_BattleFactoryLobby_Text_2589B3, 4
+	return
+
+BattleFrontier_BattleFactoryLobby_EventScript_2587D8:: @ 82587D8
+	msgbox BattleFrontier_BattleFactoryLobby_Text_259058, 4
+	return
+
+BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 4
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 4
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_258813:: @ 8258813
+	msgbox BattleFrontier_BattleFactoryLobby_Text_2593D7, 2
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_25881C:: @ 825881C
+	msgbox BattleFrontier_BattleFactoryLobby_Text_2594E5, 2
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_258825:: @ 8258825
+	lock
+	msgbox BattleFrontier_BattleFactoryLobby_Text_259547, 4
+	release
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_258830:: @ 8258830
+	msgbox BattleFrontier_BattleFactoryLobby_Text_2595C4, 2
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_258839:: @ 8258839
+	lockall
+	msgbox BattleFrontier_BattleFactoryLobby_Text_259721, 4
+	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_258848:: @ 8258848
+	message BattleFrontier_BattleFactoryLobby_Text_259743
+	waitmessage
+	multichoice 17, 0, 99, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleFactoryLobby_EventScript_2588A6
+	case 1, BattleFrontier_BattleFactoryLobby_EventScript_2588B4
+	case 2, BattleFrontier_BattleFactoryLobby_EventScript_2588C2
+	case 3, BattleFrontier_BattleFactoryLobby_EventScript_2588D0
+	case 4, BattleFrontier_BattleFactoryLobby_EventScript_2588DE
+	case 5, BattleFrontier_BattleFactoryLobby_EventScript_2588EC
+	case 127, BattleFrontier_BattleFactoryLobby_EventScript_2588EC
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_2588A6:: @ 82588A6
+	msgbox BattleFrontier_BattleFactoryLobby_Text_259766, 4
+	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_2588B4:: @ 82588B4
+	msgbox BattleFrontier_BattleFactoryLobby_Text_2597FB, 4
+	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_2588C2:: @ 82588C2
+	msgbox BattleFrontier_BattleFactoryLobby_Text_25987E, 4
+	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_2588D0:: @ 82588D0
+	msgbox BattleFrontier_BattleFactoryLobby_Text_259920, 4
+	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_2588DE:: @ 82588DE
+	msgbox BattleFrontier_BattleFactoryLobby_Text_259A5E, 4
+	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
+	end
+
+BattleFrontier_BattleFactoryLobby_EventScript_2588EC:: @ 82588EC
+	releaseall
+	end
+
+BattleFrontier_BattleFactoryLobby_Text_2588EE: @ 82588EE
+	.string "Where the intelligence of TRAINERS\n"
+	.string "is put to the test!\p"
+	.string "Welcome to the BATTLE FACTORY!\p"
+	.string "I am your guide to the Battle Swap\n"
+	.string "Single Tournament.$"
+
+BattleFrontier_BattleFactoryLobby_Text_25897A: @ 825897A
+	.string "Would you like to take the Battle\n"
+	.string "Swap Single challenge?$"
+
+BattleFrontier_BattleFactoryLobby_Text_2589B3: @ 82589B3
+	.string "The Battle Swap Single Tournament\n"
+	.string "is a SINGLE BATTLE competition using\l"
+	.string "only rental POKéMON.\p"
+	.string "First, you will be loaned three\n"
+	.string "POKéMON specifically for this event.\p"
+	.string "Using the supplied rental POKéMON,\n"
+	.string "you must conduct a SINGLE BATTLE.\p"
+	.string "If you win, you are permitted to trade\n"
+	.string "one of your rental POKéMON.\p"
+	.string "Repeat this cycle of battling and\n"
+	.string "trading--if you win seven times in\l"
+	.string "a row, you will earn Battle Points.\p"
+	.string "If you want to interrupt your\n"
+	.string "challenge, please save the game.\p"
+	.string "If you don’t save, you will be\n"
+	.string "disqualified from your challenge.$"
+
+BattleFrontier_BattleFactoryLobby_Text_258BC5: @ 8258BC5
+	.string "We look forward to your next visit.$"
+
+BattleFrontier_BattleFactoryLobby_Text_258BE9: @ 8258BE9
+	.string "Which level do you wish to challenge?\n"
+	.string "Level 50 or Open Level?$"
+
+BattleFrontier_BattleFactoryLobby_Text_258C27: @ 8258C27
+	.string "Before you begin your challenge,\n"
+	.string "I need to save the game. Is that okay?$"
+
+BattleFrontier_BattleFactoryLobby_Text_258C6F: @ 8258C6F
+	.string "Okay, I will hold your POKéMON for\n"
+	.string "safekeeping while you compete.$"
+
+BattleFrontier_BattleFactoryLobby_Text_258CB1: @ 8258CB1
+	.string "Please step this way.$"
+
+BattleFrontier_BattleFactoryLobby_Text_258CC7: @ 8258CC7
+	.string "Thank you for participating!\p"
+	.string "I will return your POKéMON in exchange\n"
+	.string "for our rental POKéMON.\p"
+	.string "I must also save the event results.\n"
+	.string "Please wait.$"
+
+BattleFrontier_BattleFactoryLobby_Text_258D54: @ 8258D54
+	.string "I will return your POKéMON in exchange\n"
+	.string "for our rental POKéMON.$"
+
+BattleFrontier_BattleFactoryLobby_Text_258D93: @ 8258D93
+	.string "Congratulations! You’ve won seven\n"
+	.string "straight Battle Swap matches!$"
+
+BattleFrontier_BattleFactoryLobby_Text_258DD3: @ 8258DD3
+	.string "In recognition of your 7-win streak,\n"
+	.string "we award you these Battle Point(s).$"
+
+BattleFrontier_BattleFactoryLobby_Text_258E1C: @ 8258E1C
+	.string "Oh, oh, oh!\p"
+	.string "Your Battle Points are maxed.\p"
+	.string "Please come back after using\n"
+	.string "some Battle Points.$"
+
+BattleFrontier_BattleFactoryLobby_Text_258E77: @ 8258E77
+	.string "We’ve been waiting for you!\p"
+	.string "Before we resume your challenge,\n"
+	.string "I must save the game.$"
+
+BattleFrontier_BattleFactoryLobby_Text_258ECA: @ 8258ECA
+	.string "I’m sorry to say this, but you didn’t\n"
+	.string "save before you quit playing last time.\p"
+	.string "As a result, you have been disqualified\n"
+	.string "from your challenge.$"
+
+BattleFrontier_BattleFactoryLobby_Text_258F55: @ 8258F55
+	.string "We’ll return your personal POKéMON.$"
+
+BattleFrontier_BattleFactoryLobby_Text_258F79: @ 8258F79
+	.string "{PLAYER} received the prize\n"
+	.string "{STR_VAR_1}.$"
+
+BattleFrontier_BattleFactoryLobby_Text_258F93: @ 8258F93
+	.string "Where the intelligence of TRAINERS\n"
+	.string "is put to the test!\p"
+	.string "Welcome to the BATTLE FACTORY!\p"
+	.string "I am your guide to the Battle Swap\n"
+	.string "Double Tournament.$"
+
+BattleFrontier_BattleFactoryLobby_Text_25901F: @ 825901F
+	.string "Would you like to take the Battle\n"
+	.string "Swap Double challenge?$"
+
+BattleFrontier_BattleFactoryLobby_Text_259058: @ 8259058
+	.string "The Battle Swap Double Tournament\n"
+	.string "is a DOUBLE BATTLE competition using\l"
+	.string "only rental POKéMON.\p"
+	.string "First, you will be loaned three\n"
+	.string "POKéMON specifically for this event.\p"
+	.string "Using the supplied rental POKéMON,\n"
+	.string "you must conduct a DOUBLE BATTLE.\p"
+	.string "If you win, you are permitted to trade\n"
+	.string "one of your rental POKéMON.\p"
+	.string "Repeat this cycle of battling and\n"
+	.string "trading--if you win seven times in\l"
+	.string "a row, you will earn Battle Points.\p"
+	.string "If you want to interrupt your\n"
+	.string "challenge, please save the game.\p"
+	.string "If you don’t save before interrupting,\n"
+	.string "you will be disqualified.$"
+
+BattleFrontier_BattleFactoryLobby_Text_25926A: @ 825926A
+	.string "Congratulations for defeating\n"
+	.string "the FACTORY HEAD and winning\l"
+	.string "seven matches in a row!$"
+
+BattleFrontier_BattleFactoryLobby_Text_2592BD: @ 82592BD
+	.string "In recognition of your wealth of\n"
+	.string "knowledge and keen intelligence,\l"
+	.string "we award you these Battle Point(s).$"
+
+BattleFrontier_BattleFactoryLobby_Text_259323: @ 8259323
+	.string "Let me exchange your POKéMON\n"
+	.string "for our rental POKéMON.\p"
+	.string "I need to save the battle data,\n"
+	.string "so please wait.$"
+
+BattleFrontier_BattleFactoryLobby_Text_259388: @ 8259388
+	.string "Would you like to record your last\n"
+	.string "BATTLE FACTORY match on your\l"
+	.string "FRONTIER PASS?$"
+
+BattleFrontier_BattleFactoryLobby_Text_2593D7: @ 82593D7
+	.string "Hi!\n"
+	.string "You, there!\p"
+	.string "Are you thinking that the events here\n"
+	.string "are easy since you don’t need to have\l"
+	.string "a raised team of POKéMON?\p"
+	.string "I wouldn’t be too sure about winning\n"
+	.string "that easily.\p"
+	.string "If you don’t have thorough knowledge\n"
+	.string "about POKéMON and their moves,\l"
+	.string "it will be tough to keep winning.$"
+
+BattleFrontier_BattleFactoryLobby_Text_2594E5: @ 82594E5
+	.string "I swapped for a weak POKéMON…\n"
+	.string "I thought it was a good kind to have…\p"
+	.string "They wiped the floor with us…$"
+
+BattleFrontier_BattleFactoryLobby_Text_259547: @ 8259547
+	.string "Things haven’t been going my way\n"
+	.string "at all.\p"
+	.string "You need to check your opponent’s\n"
+	.string "POKéMON during battle to see if\l"
+	.string "they’re any good.$"
+
+BattleFrontier_BattleFactoryLobby_Text_2595C4: @ 82595C4
+	.string "You know how the staff here give you\n"
+	.string "a few hints about your next opponent?\p"
+	.string "Well, I’m a full-grown man, but I have\n"
+	.string "trouble figuring out their hints.$"
+
+BattleFrontier_BattleFactoryLobby_Text_259658: @ 8259658
+	.string "Like, I’m really tough, but I get bored\n"
+	.string "really easily, so I just kept swapping\l"
+	.string "and battling over and over.\p"
+	.string "So anyway, when I kept entering\n"
+	.string "Battle Swap events, I noticed they\l"
+	.string "varied the rental POKéMON.$"
+
+BattleFrontier_BattleFactoryLobby_Text_259721: @ 8259721
+SlateportCity_BattleTentLobby_Text_259721: @ 8259721
+	.string "The Battle Swap rules are listed.$"
+
+BattleFrontier_BattleFactoryLobby_Text_259743: @ 8259743
+SlateportCity_BattleTentLobby_Text_259743: @ 8259743
+	.string "Which heading do you want to read?$"
+
+BattleFrontier_BattleFactoryLobby_Text_259766: @ 8259766
+	.string "In a Battle Swap event, you may use\n"
+	.string "only three POKéMON.\p"
+	.string "Whether you are renting or swapping,\n"
+	.string "your team may not have two or more\l"
+	.string "of the same POKéMON.$"
+
+BattleFrontier_BattleFactoryLobby_Text_2597FB: @ 82597FB
+	.string "You may swap POKéMON only with\n"
+	.string "the TRAINER you have just defeated.\p"
+	.string "You may swap for only those POKéMON\n"
+	.string "used by the beaten TRAINER.$"
+
+BattleFrontier_BattleFactoryLobby_Text_25987E: @ 825987E
+	.string "After every battle you win, you may\n"
+	.string "swap for one of your defeated\l"
+	.string "opponent’s POKéMON.\p"
+	.string "You will not be able to swap POKéMON\n"
+	.string "with the seventh TRAINER in the event.$"
+
+BattleFrontier_BattleFactoryLobby_Text_259920: @ 8259920
+	.string "There are two key points to be aware\n"
+	.string "of when swapping POKéMON.\p"
+	.string "First, when swapping, you can’t check\n"
+	.string "the stats of the POKéMON you are\l"
+	.string "about to receive.\p"
+	.string "Second, the POKéMON on your team\n"
+	.string "are lined up in sequence, depending on\l"
+	.string "the order in which you rented them.\p"
+	.string "This sequence remains unchanged\n"
+	.string "even when swaps are made.$"
+
+BattleFrontier_BattleFactoryLobby_Text_259A5E: @ 8259A5E
+	.string "In the Open Level, the rental POKéMON\n"
+	.string "and the opposing TRAINERS’ POKéMON\l"
+	.string "are all Level 100.$"
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc
new file mode 100644
index 000000000..b8ffbfc6d
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc
@@ -0,0 +1,6 @@
+BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, 7, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8
+	map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
index debeb0c12..eb6e06a0f 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
-	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout
 	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
new file mode 100644
index 000000000..e05c49885
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
@@ -0,0 +1,726 @@
+BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA
+	map_script 2, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF
+	map_script 4, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5
+	.byte 0
+
+BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF
+	.2byte 0
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF
+	setvar VAR_TEMP_1, 1
+	compare VAR_0x8006, 1
+	goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA
+	setobjectxy 1, 8, 7
+	turnobject 1, 1
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA
+	turnobject 255, 2
+	end
+
+BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9
+	.2byte 0
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9
+	compare VAR_0x8006, 1
+	goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5
+	setvar VAR_TEMP_0, 1
+	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC
+	applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A
+	waitmovement 0
+	compare VAR_0x8006, 2
+	goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69
+	setvar VAR_0x8004, 13
+	special sub_81A5E74
+	setvar VAR_0x8004, 12
+	special sub_81A5E74
+	setvar VAR_0x8004, 14
+	special sub_81A5E74
+	setorcopyvar VAR_0x8005, VAR_RESULT
+	setvar VAR_0x8004, 15
+	special sub_81A5E74
+	setorcopyvar VAR_0x8006, VAR_RESULT
+	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93
+	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8, 4
+	fadescreen 1
+	setvar VAR_0x8004, 8
+	special sub_81A5E74
+	setvar VAR_0x8004, 6
+	special sub_81A5E74
+	waitstate
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, 4
+	closemessage
+	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7
+	compare VAR_RESULT, 0
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C
+	compare VAR_RESULT, 1
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B
+	waitmovement 0
+	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11
+	waitstate
+	end
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
+	setvar VAR_0x8004, 9
+	special sub_81A5E74
+	setvar VAR_0x8004, 16
+	special sub_81A5E74
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, 4
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+	setvar VAR_0x8004, 9
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26
+	playse 263
+	waitse
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, 4
+	closemessage
+	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF
+	waitmovement 0
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58, 4
+	closemessage
+	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3
+	waitmovement 0
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89, 4
+	closemessage
+	delay 16
+	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
+	end
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13
+	setvar VAR_0x8004, 9
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D
+	compare VAR_RESULT, 2
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24
+	compare VAR_RESULT, 3
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B
+	compare VAR_RESULT, 4
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32
+	compare VAR_RESULT, 5
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39
+	compare VAR_RESULT, 6
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40
+	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6
+	multichoice 19, 4, 103, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC
+	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
+	case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
+	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6:: @ 8259CC6
+	multichoice 20, 6, 104, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
+	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
+	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC:: @ 8259CFC
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABD2
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E
+	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E:: @ 8259D2E
+	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8B4
+	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38:: @ 8259D38
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47
+	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66:: @ 8259D66
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A37A
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8
+	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98
+	setvar VAR_0x8004, 12
+	special sub_81A5E74
+	setvar VAR_0x8004, 14
+	special sub_81A5E74
+	setorcopyvar VAR_0x8005, VAR_RESULT
+	setvar VAR_0x8004, 15
+	special sub_81A5E74
+	setorcopyvar VAR_0x8006, VAR_RESULT
+	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93
+	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2
+	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2
+	fadescreen 1
+	setvar VAR_0x8004, 7
+	special sub_81A5E74
+	waitstate
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
+	setvar VAR_0x8004, 8
+	special sub_81A5E74
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, 4
+	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D:: @ 8259E1D
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A263
+	waitmessage
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24:: @ 8259E24
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A289
+	waitmessage
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B:: @ 8259E2B
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2AF
+	waitmessage
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32:: @ 8259E32
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2D5
+	waitmessage
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39:: @ 8259E39
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2FB
+	waitmessage
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40:: @ 8259E40
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A321
+	waitmessage
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABAE
+	waitmessage
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 2
+	special sub_81A5E74
+	playse SE_SAVE
+	waitse
+	fadescreen 1
+	setvar VAR_0x8004, 4
+	special sub_81A1780
+	end
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
+	special SavePlayerParty
+	setvar VAR_0x8004, 10
+	setvar VAR_0x8005, 0
+	special sub_81A5E74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	special CalculatePlayerPartyCount
+	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, 4
+	compare VAR_0x8005, 0
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62
+	compare VAR_0x8005, 1
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B
+	compare VAR_0x8005, 2
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74
+	compare VAR_0x8005, 3
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D
+	compare VAR_0x8005, 4
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86
+	compare VAR_0x8005, 5
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F
+	compare VAR_0x8005, 6
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98
+	compare VAR_0x8005, 7
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1
+	compare VAR_0x8005, 8
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA
+	compare VAR_0x8005, 10
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3
+	compare VAR_0x8005, 11
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC
+	compare VAR_0x8005, 12
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5
+	compare VAR_0x8005, 13
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE
+	compare VAR_0x8005, 14
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7
+	compare VAR_0x8005, 15
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0
+	compare VAR_0x8005, 16
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9
+	compare VAR_0x8005, 17
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2
+	compare VAR_0x8005, 18
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62:: @ 8259F62
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B:: @ 8259F6B
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74:: @ 8259F74
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D:: @ 8259F7D
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86:: @ 8259F86
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F:: @ 8259F8F
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98:: @ 8259F98
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1:: @ 8259FA1
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA:: @ 8259FAA
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3:: @ 8259FB3
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC:: @ 8259FBC
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5:: @ 8259FC5
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE:: @ 8259FCE
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7:: @ 8259FD7
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0:: @ 8259FE0
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9:: @ 8259FE9
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2:: @ 8259FF2
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004
+	compare VAR_0x8006, 0
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068
+	compare VAR_0x8006, 1
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071
+	compare VAR_0x8006, 2
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A
+	compare VAR_0x8006, 3
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083
+	compare VAR_0x8006, 4
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C
+	compare VAR_0x8006, 5
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095
+	compare VAR_0x8006, 6
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E
+	compare VAR_0x8006, 7
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7
+	compare VAR_0x8006, 8
+	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068:: @ 825A068
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAE6, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071:: @ 825A071
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A9CE, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A:: @ 825A07A
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A8D9, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083:: @ 825A083
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A912, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C:: @ 825A08C
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A94C, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095:: @ 825A095
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA16, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E:: @ 825A09E
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAA7, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7:: @ 825A0A7
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A98C, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0:: @ 825A0B0
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA5A, 4
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20
+	waitmessage
+	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110
+	multichoice 19, 4, 103, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC
+	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
+	case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
+	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110:: @ 825A110
+	multichoice 20, 6, 104, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
+	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
+	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, 4
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2
+	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C:: @ 825A17C
+	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3
+	applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B:: @ 825A18B
+	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9
+	applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6
+	return
+
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0: @ 825A1A0
+	walk_up
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6: @ 825A1A6
+	walk_up
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC: @ 825A1AC
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	face_down
+	step_end
+
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3: @ 825A1B3
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9: @ 825A1B9
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF: @ 825A1BF
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3: @ 825A1C3
+	walk_right
+	walk_right
+	walk_right
+	face_down
+	step_end
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8: @ 825A1C8
+SlateportCity_BattleTentCorridor_Text_25A1C8: @ 825A1C8
+	.string "First, we will hold your POKéMON for\n"
+	.string "safekeeping.\p"
+	.string "You may then choose from our\n"
+	.string "selection of POKéMON.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D: @ 825A22D
+SlateportCity_BattleTentCorridor_Text_25A22D: @ 825A22D
+	.string "Thank you for competing!\n"
+	.string "Let us restore your POKéMON!$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A263: @ 825A263
+SlateportCity_BattleTentCorridor_Text_25A263: @ 825A263
+	.string "The 2nd match is next!\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A289: @ 825A289
+SlateportCity_BattleTentCorridor_Text_25A289: @ 825A289
+	.string "The 3rd match is next!\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2AF: @ 825A2AF
+	.string "The 4th match is next!\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2D5: @ 825A2D5
+	.string "The 5th match is next!\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2FB: @ 825A2FB
+	.string "The 6th match is next!\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A321: @ 825A321
+	.string "Finally, the 7th match is next!\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350: @ 825A350
+SlateportCity_BattleTentCorridor_Text_25A350: @ 825A350
+	.string "Would you like to save and quit\n"
+	.string "the game?$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A37A: @ 825A37A
+SlateportCity_BattleTentCorridor_Text_25A37A: @ 825A37A
+	.string "Would you like to retire from your\n"
+	.string "Battle Swap challenge?$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4: @ 825A3B4
+	.string "I’ve conducted a little investigation\n"
+	.string "about your upcoming opponent.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8: @ 825A3F8
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the NORMAL type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E: @ 825A43E
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the FIRE type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482: @ 825A482
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the WATER type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7: @ 825A4C7
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the ELECTRIC type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F: @ 825A50F
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the GRASS type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554: @ 825A554
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the ICE type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597: @ 825A597
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the FIGHTING type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF: @ 825A5DF
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the POISON type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625: @ 825A625
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the GROUND type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B: @ 825A66B
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the FLYING type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1: @ 825A6B1
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the PSYCHIC type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8: @ 825A6F8
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the BUG type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B: @ 825A73B
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the ROCK type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F: @ 825A77F
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the GHOST type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4: @ 825A7C4
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the DRAGON type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A: @ 825A80A
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the DARK type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E: @ 825A84E
+	.string "The TRAINER is apparently skilled\n"
+	.string "in the handling of the STEEL type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893: @ 825A893
+	.string "The TRAINER appears to have no clear\n"
+	.string "favorites when it comes to type.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A8D9: @ 825A8D9
+	.string "The favorite battle style appears to\n"
+	.string "be slow and steady.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A912: @ 825A912
+	.string "The favorite battle style appears to\n"
+	.string "be one of endurance.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A94C: @ 825A94C
+	.string "The favorite battle style appears to\n"
+	.string "be high risk, high return.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A98C: @ 825A98C
+	.string "The favorite battle style appears to\n"
+	.string "depend on the battle’s flow.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25A9CE: @ 825A9CE
+	.string "The favorite battle style appears to\n"
+	.string "be one based on total preparation.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA16: @ 825AA16
+	.string "The favorite battle style appears\n"
+	.string "to be weakening the foe to start.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA5A: @ 825AA5A
+	.string "The favorite battle style appears to\n"
+	.string "be flexibly adaptable to the situation.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAA7: @ 825AAA7
+	.string "The favorite battle style appears to\n"
+	.string "be impossible to predict.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAE6: @ 825AAE6
+	.string "The favorite battle style appears to\n"
+	.string "be free-spirited and unrestrained.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E: @ 825AB2E
+SlateportCity_BattleTentCorridor_Text_25AB2E: @ 825AB2E
+	.string "Before starting the battle, would you\n"
+	.string "like to swap a POKéMON?$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C: @ 825AB6C
+SlateportCity_BattleTentCorridor_Text_25AB6C: @ 825AB6C
+	.string "Thank you!\n"
+	.string "Your POKéMON swap is complete.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96: @ 825AB96
+SlateportCity_BattleTentCorridor_Text_25AB96: @ 825AB96
+	.string "Right this way, please!$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABAE: @ 825ABAE
+SlateportCity_BattleTentCorridor_Text_25ABAE: @ 825ABAE
+	.string "I am saving your data.\n"
+	.string "Please wait.$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABD2: @ 825ABD2
+	.string "Would you like to record your latest\n"
+	.string "battle on your FRONTIER PASS?$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15: @ 825AC15
+	.string "Excuse me! Excuse me, please!\n"
+	.string "May I get you to wait a few moments?$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58: @ 825AC58
+	.string "…Uh-huh? What?! …Whoa!\n"
+	.string "Understood, sir! Will do!$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89: @ 825AC89
+	.string "Oh, my…\n"
+	.string "Sorry to keep you waiting!\p"
+	.string "I have a message from this facility’s\n"
+	.string "boss, the FACTORY HEAD.\p"
+	.string "He says, “We’re going to do it!\n"
+	.string "Come here right now!”$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20: @ 825AD20
+	.string "The FACTORY HEAD is demanding you.\n"
+	.string "Are you prepared to face him?$"
+
+BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61: @ 825AD61
+	.string "I’m terribly sorry, but I can’t tell you\n"
+	.string "anything about the FACTORY HEAD.$"
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
new file mode 100644
index 000000000..bc1d5a525
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
@@ -0,0 +1,14 @@
+BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
+	object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, 7, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 1, 4, 3, 10, 1, 1, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574
+	warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
+	warp_def 1, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
+
+BattleFrontier_BattlePalaceBattleRoom_MapEvents:: @ 853C584
+	map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
index 99c95d07d..b03d993fa 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
-	.4byte BattleFrontier_BattlePalaceBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattlePalaceBattleRoom_Layout
 	.4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents
 	.4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
new file mode 100644
index 000000000..2ae154927
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
@@ -0,0 +1,650 @@
+BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815
+	map_script 3, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825
+	map_script 2, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861
+	map_script 4, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34
+	.byte 0
+
+BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
+	setvar VAR_0x8004, 5
+	special sub_81A1780
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833
+	end
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856
+	return
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B
+	setvar VAR_OBJ_GFX_ID_1, 100
+	setvar VAR_OBJ_GFX_ID_0, 100
+	return
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856:: @ 824F856
+	setvar VAR_OBJ_GFX_ID_1, 105
+	setvar VAR_OBJ_GFX_ID_0, 105
+	return
+
+BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B
+	.2byte 0
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B
+	showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B
+	waitmovement 0
+	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
+	setvar VAR_TEMP_2, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92
+	waitmovement 0
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF
+	setvar VAR_0x8004, 3
+	special sub_8161F74
+	addobject 2
+	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1
+	waitmovement 0
+	setvar VAR_0x8004, 5
+	special sub_8195960
+	msgbox 0x2021fc4, 4
+	waitmessage
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA:: @ 824F8FA
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 4
+	special sub_81A1780
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	addvar VAR_RESULT, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	switch VAR_RESULT
+	case 7, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
+	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7
+	waitmovement 0
+	removeobject 2
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99
+	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
+	waitmovement 0
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, 4
+	special LoadPlayerParty
+	special SavePlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A
+	setvar VAR_0x8004, 9
+	special sub_81A1780
+	copyvar VAR_TEMP_F, VAR_RESULT
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66
+	compare VAR_RESULT, 2
+	call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D
+	compare VAR_RESULT, 3
+	call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74
+	compare VAR_RESULT, 4
+	call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B
+	compare VAR_RESULT, 5
+	call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82
+	compare VAR_RESULT, 6
+	call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42
+	multichoice 19, 4, 103, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78
+	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
+	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
+	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42:: @ 824FA42
+	multichoice 20, 6, 104, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
+	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
+	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78:: @ 824FA78
+	message BattleFrontier_BattlePalaceBattleRoom_Text_25009E
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA
+	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA:: @ 824FAAA
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8B4
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4:: @ 824FAB4
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250030, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F
+	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2:: @ 824FAE2
+	message BattleFrontier_BattlePalaceBattleRoom_Text_25005A
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
+	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14:: @ 824FB14
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97
+	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97
+	closemessage
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 3
+	special sub_81A1780
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
+	message BattleFrontier_BattlePalaceBattleRoom_Text_25007E
+	waitmessage
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 2
+	special sub_8195960
+	playse SE_SAVE
+	waitse
+	fadescreen 1
+	setvar VAR_0x8004, 4
+	special sub_81A1780
+	end
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61
+	compare VAR_TEMP_2, 1
+	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, 4
+	setvar VAR_TEMP_2, 1
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79
+	message BattleFrontier_BattlePalaceBattleRoom_Text_25014A
+	waitmessage
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0
+	multichoice 19, 4, 103, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78
+	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
+	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
+	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0:: @ 824FBD0
+	multichoice 20, 6, 104, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
+	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
+	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_242170
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25017C, 4
+	closemessage
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97
+	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97
+	setobjectxyperm 2, 15, 1
+	addobject 2
+	hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
+	setobjectxy 2, 13, 1
+	setobjectxyperm 2, 13, 1
+	applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF
+	applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7
+	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2
+	waitmovement 0
+	switch VAR_TEMP_F
+	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A
+	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
+	case 4, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, 4
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, 4
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
+	setvar VAR_0x8004, 6
+	special sub_8195960
+	setvar VAR_0x8004, 12
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, 4
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99
+	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25036D, 4
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattlePalaceBattleRoom_Text_2503DC
+	waitmessage
+	waitfanfare
+	setvar VAR_0x8004, 13
+	special sub_81A1780
+	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
+	waitmovement 0
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
+	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
+	waitmovement 0
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, 4
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, 4
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, 4
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
+	setvar VAR_0x8004, 6
+	special sub_8195960
+	setvar VAR_0x8004, 12
+	special sub_81A1780
+	compare VAR_RESULT, 2
+	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, 4
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99
+	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250629, 4
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattlePalaceBattleRoom_Text_250699
+	waitmessage
+	waitfanfare
+	setvar VAR_0x8004, 13
+	special sub_81A1780
+	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
+	waitmovement 0
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
+	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
+	waitmovement 0
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, 4
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7:: @ 824FDF7
+VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7
+	closemessage
+	setvar VAR_TEMP_2, 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special HealPlayerParty
+	setvar VAR_0x8004, 4
+	setvar VAR_0x8005, 0
+	special sub_8163AC4
+	waitstate
+	setvar VAR_0x8004, 18
+	special sub_81A1780
+	special HealPlayerParty
+	setvar VAR_0x8004, 21
+	special sub_81A1780
+	return
+
+BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E
+	.2byte 0
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E:: @ 824FE3E
+	hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833
+	setvar VAR_TEMP_1, 1
+	applymovement 255, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90
+	removeobject 2
+	applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90
+	applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90
+	end
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66:: @ 824FE66
+	message BattleFrontier_BattlePalaceBattleRoom_Text_24FF28
+	waitmessage
+	return
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D:: @ 824FE6D
+	message BattleFrontier_BattlePalaceBattleRoom_Text_24FF54
+	waitmessage
+	return
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74:: @ 824FE74
+	message BattleFrontier_BattlePalaceBattleRoom_Text_24FF80
+	waitmessage
+	return
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B:: @ 824FE7B
+	message BattleFrontier_BattlePalaceBattleRoom_Text_24FFAC
+	waitmessage
+	return
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82:: @ 824FE82
+	message BattleFrontier_BattlePalaceBattleRoom_Text_24FFD8
+	waitmessage
+	return
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89:: @ 824FE89
+	message BattleFrontier_BattlePalaceBattleRoom_Text_250004
+	waitmessage
+	return
+
+BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90: @ 824FE90
+	set_invisible
+	step_end
+
+BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92: @ 824FE92
+	set_visible
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+
+BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97: @ 824FE97
+	face_right
+	step_end
+
+BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99: @ 824FE99
+	face_up
+	step_end
+
+BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B: @ 824FE9B
+	set_visible
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1: @ 824FEA1
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	face_left
+	step_end
+
+BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7: @ 824FEA7
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC: @ 824FEAC
+	face_down
+	step_end
+
+BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAE: @ 824FEAE
+	set_visible
+	walk_slow_down
+	walk_slow_down
+	face_left
+	step_end
+
+BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB3: @ 824FEB3
+	set_visible
+	walk_slow_down
+	step_end
+
+BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	face_left
+	step_end
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB
+	copyvar VAR_RESULT, VAR_0x40CE
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5
+	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7
+	waitstate
+	end
+
+BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5:: @ 824FED5
+	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7
+	waitstate
+	end
+
+BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF: @ 824FEDF
+	delay_16
+	delay_16
+	set_visible
+	walk_down
+	walk_right
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7: @ 824FEE7
+	set_visible
+	walk_fast_down
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_in_place_fastest_left
+	delay_16
+	step_end
+
+BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2: @ 824FEF2
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	set_visible
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	face_left
+	step_end
+
+BattleFrontier_BattlePalaceBattleRoom_Text_24FF00: @ 824FF00
+VerdanturfTown_BattleTentBattleRoom_Text_24FF00: @ 824FF00
+	.string "Excellent…\n"
+	.string "Let me restore your POKéMON.$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_24FF28: @ 824FF28
+VerdanturfTown_BattleTentBattleRoom_Text_24FF28: @ 824FF28
+	.string "The 2nd opponent is next.\n"
+	.string "Are you prepared?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_24FF54: @ 824FF54
+VerdanturfTown_BattleTentBattleRoom_Text_24FF54: @ 824FF54
+	.string "The 3rd opponent is next.\n"
+	.string "Are you prepared?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_24FF80: @ 824FF80
+	.string "The 4th opponent is next.\n"
+	.string "Are you prepared?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_24FFAC: @ 824FFAC
+	.string "The 5th opponent is next.\n"
+	.string "Are you prepared?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_24FFD8: @ 824FFD8
+	.string "The 6th opponent is next.\n"
+	.string "Are you prepared?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_250004: @ 8250004
+	.string "The 7th opponent is next.\n"
+	.string "Are you prepared?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_250030: @ 8250030
+VerdanturfTown_BattleTentBattleRoom_Text_250030: @ 8250030
+	.string "Would you like to save and quit\n"
+	.string "the game?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_25005A: @ 825005A
+VerdanturfTown_BattleTentBattleRoom_Text_25005A: @ 825005A
+	.string "Do you wish to quit your challenge?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_25007E: @ 825007E
+VerdanturfTown_BattleTentBattleRoom_Text_25007E: @ 825007E
+	.string "Saving the data.\n"
+	.string "Have patience…$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_25009E: @ 825009E
+	.string "Do you wish to record your latest\n"
+	.string "match on your FRONTIER PASS?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_2500DD: @ 82500DD
+	.string "And now…\p"
+	.string "By winning consistently, you have\n"
+	.string "earned the privilege of challenging\l"
+	.string "our master, the PALACE MAVEN…$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_25014A: @ 825014A
+	.string "I shall send for the PALACE MAVEN.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_25017C: @ 825017C
+	.string "Let great fanfare announce the arrival\n"
+	.string "of the PALACE MAVEN, SPENSER!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_2501C1: @ 82501C1
+	.string "SPENSER: My physical being is with\n"
+	.string "POKéMON always!\p"
+	.string "My heart beats as one with\n"
+	.string "POKéMON always!\p"
+	.string "Young one of a TRAINER!\n"
+	.string "Do you believe in your POKéMON?\p"
+	.string "Can you believe them through\n"
+	.string "and through?\p"
+	.string "If your bonds of trust are frail,\n"
+	.string "you will never beat my brethren!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_2502C4: @ 82502C4
+	.string "The bond you share with your POKéMON!\n"
+	.string "Prove it to me here!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_2502FF: @ 82502FF
+	.string "SPENSER: Gwahahah!\p"
+	.string "Hah, you never fell for my bluster!\n"
+	.string "Sorry for trying that stunt!\p"
+	.string "Here!\n"
+	.string "Bring me the thing!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_25036D: @ 825036D
+	.string "My, my, if only you could maintain that\n"
+	.string "facade of distinguished authority…\p"
+	.string "Here!\n"
+	.string "Let’s see your FRONTIER PASS!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_2503DC: @ 82503DC
+	.string "The Spirits Symbol was embossed on\n"
+	.string "the FRONTIER PASS!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_250412: @ 8250412
+	.string "SPENSER: Your POKéMON’s eyes are \n"
+	.string "truly clear and unclouded.\p"
+	.string "I will eagerly await the next\n"
+	.string "opportunity to see you.$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_250485: @ 8250485
+	.string "SPENSER: Gwahahah!\n"
+	.string "You’ve battled your way up again?\p"
+	.string "You must have developed a truly\n"
+	.string "formidable bond with your POKéMON.\p"
+	.string "So be it!\p"
+	.string "This time, I won’t bluster or hold back.\n"
+	.string "This time, there’s no fooling around.\p"
+	.string "Ready now?\n"
+	.string "Prepare to lose!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_250572: @ 8250572
+	.string "… … …Kaaah!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_25057E: @ 825057E
+	.string "SPENSER: Well, that was some display!\n"
+	.string "Even fully unleashed, my brethren\l"
+	.string "could not overpower you.\p"
+	.string "Your team spirit is truly admirable!\p"
+	.string "Here!\n"
+	.string "Bring me that thing, will you?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_250629: @ 8250629
+	.string "My, my, if only you could maintain\n"
+	.string "a certain level of decorum…\p"
+	.string "Gaaah, here!\n"
+	.string "Hurry with that FRONTIER PASS, you!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_250699: @ 8250699
+	.string "The Spirits Symbol took on\n"
+	.string "a golden shine!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_2506C4: @ 82506C4
+	.string "SPENSER: Gwahahah!\p"
+	.string "Come see me time and again!\n"
+	.string "My brethren and I will be waiting!$"
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc
new file mode 100644
index 000000000..f6baf26f6
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc
@@ -0,0 +1,18 @@
+BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 12, 3, 7, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, 14, 0, 2, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, 14, 0, 2, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, 1, 0, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, 2, 1, 2, 0, 0, 0x0, 0
+
+BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8
+	warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
+	warp_def 9, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
+	warp_def 6, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
+	warp_def 10, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
+
+BattleFrontier_BattlePalaceCorridor_MapEvents:: @ 853C4E8
+	map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
index 4dec7d651..4b62687e7 100644
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePalaceCorridor: @ 84853C0
-	.4byte BattleFrontier_BattlePalaceCorridor_MapAttributes
+	.4byte BattleFrontier_BattlePalaceCorridor_Layout
 	.4byte BattleFrontier_BattlePalaceCorridor_MapEvents
 	.4byte BattleFrontier_BattlePalaceCorridor_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
new file mode 100644
index 000000000..c8142a207
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
@@ -0,0 +1,160 @@
+BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3
+	map_script 2, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9
+	.byte 0
+
+BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3
+	.2byte 0
+
+BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3
+	delay 16
+	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8
+	applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8
+	waitmovement 0
+	lockall
+	setvar VAR_0x8004, 3
+	special sub_8195960
+	compare VAR_RESULT, 0
+	call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F58B
+	compare VAR_RESULT, 1
+	call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F594
+	compare VAR_RESULT, 2
+	call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F59D
+	compare VAR_RESULT, 3
+	call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6
+	compare VAR_RESULT, 4
+	call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF
+	closemessage
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553
+	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD
+	applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4
+	waitmovement 0
+	opendoor 6, 3
+	waitdooranim
+	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA
+	applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9
+	waitmovement 0
+	closedoor 6, 3
+	waitdooranim
+	goto BattleFrontier_BattlePalaceCorridor_EventScript_24F581
+
+BattleFrontier_BattlePalaceCorridor_EventScript_24F553:: @ 824F553
+	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5CB
+	applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2
+	waitmovement 0
+	opendoor 10, 3
+	waitdooranim
+	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA
+	applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9
+	waitmovement 0
+	closedoor 10, 3
+	waitdooranim
+
+BattleFrontier_BattlePalaceCorridor_EventScript_24F581:: @ 824F581
+	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4
+	waitstate
+	end
+
+BattleFrontier_BattlePalaceCorridor_EventScript_24F58B:: @ 824F58B
+	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F5DD, 4
+	return
+
+BattleFrontier_BattlePalaceCorridor_EventScript_24F594:: @ 824F594
+	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F65B, 4
+	return
+
+BattleFrontier_BattlePalaceCorridor_EventScript_24F59D:: @ 824F59D
+	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F718, 4
+	return
+
+BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6:: @ 824F5A6
+	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F78C, 4
+	return
+
+BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF:: @ 824F5AF
+	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F7D4, 4
+	return
+
+BattleFrontier_BattlePalaceCorridor_Movement_24F5B8: @ 824F5B8
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattlePalaceCorridor_Movement_24F5BD: @ 824F5BD
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattlePalaceCorridor_Movement_24F5C4: @ 824F5C4
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_up
+	step_end
+
+BattleFrontier_BattlePalaceCorridor_Movement_24F5CB: @ 824F5CB
+	walk_up
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattlePalaceCorridor_Movement_24F5D2: @ 824F5D2
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattlePalaceCorridor_Movement_24F5D9: @ 824F5D9
+	walk_up
+
+BattleFrontier_BattlePalaceCorridor_Movement_24F5DA: @ 824F5DA
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattlePalaceCorridor_Text_24F5DD: @ 824F5DD
+	.string "People and POKéMON, they are but\n"
+	.string "the same…\p"
+	.string "Their individual nature makes them\n"
+	.string "good at certain things, and not good\l"
+	.string "at others.$"
+
+BattleFrontier_BattlePalaceCorridor_Text_24F65B: @ 824F65B
+	.string "Rather than trying to make a POKéMON\n"
+	.string "do what it dislikes, try to let it do\l"
+	.string "what it likes and is good at doing.\p"
+	.string "Put yourself in the POKéMON’s position\n"
+	.string "and consider what moves it would like.$"
+
+BattleFrontier_BattlePalaceCorridor_Text_24F718: @ 824F718
+	.string "A POKéMON’s nature is a remarkable\n"
+	.string "thing…\p"
+	.string "Some POKéMON behave in a completely\n"
+	.string "different way when they are cornered.$"
+
+BattleFrontier_BattlePalaceCorridor_Text_24F78C: @ 824F78C
+	.string "Are you beginning to understand how\n"
+	.string "a POKéMON’s nature makes it behave?$"
+
+BattleFrontier_BattlePalaceCorridor_Text_24F7D4: @ 824F7D4
+	.string "Ah… I see a strong, heartfelt bond\n"
+	.string "between you and your POKéMON…$"
+
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc
new file mode 100644
index 000000000..56da378cb
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc
@@ -0,0 +1,21 @@
+BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 6, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 18, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0
+	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0
+	object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 19, 6, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0
+
+BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0
+	warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+	warp_def 13, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+	warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
+
+BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8
+	bg_event 2, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC50
+	bg_event 16, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC69
+	bg_event 10, 4, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6
+
+BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C
+	map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents
+
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
index 4bf9326b7..8104eadfc 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePalaceLobby: @ 84853A4
-	.4byte BattleFrontier_BattlePalaceLobby_MapAttributes
+	.4byte BattleFrontier_BattlePalaceLobby_Layout
 	.4byte BattleFrontier_BattlePalaceLobby_MapEvents
 	.4byte BattleFrontier_BattlePalaceLobby_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
new file mode 100644
index 000000000..91c1abd0f
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
@@ -0,0 +1,729 @@
+BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E
+	map_script 2, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D
+	map_script 4, BattleFrontier_BattlePalaceLobby_MapScript2_24D789
+	.byte 0
+
+BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D793
+	.2byte 0
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D7C7
+	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePalaceLobby_EventScript_24D7D0
+	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePalaceLobby_EventScript_24D908
+	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePalaceLobby_EventScript_24D817
+	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePalaceLobby_EventScript_24D873
+	.2byte 0
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7
+	setvar VAR_0x8004, 0
+	special sub_81A1780
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
+	lockall
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, 4
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_8195960
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 0
+	special sub_8195960
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817
+	lockall
+	setvar VAR_0x8004, 10
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, 4
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24D840
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, 4
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, 4
+	setvar VAR_0x8004, 11
+	special sub_81A1780
+	msgbox BattleFrontier_BattlePalaceLobby_Text_241520, 9
+	message BattleFrontier_BattlePalaceLobby_Text_24E4F7
+	waitmessage
+	call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873
+	lockall
+	message BattleFrontier_BattlePalaceLobby_Text_24E41E
+	waitmessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 0
+	special sub_8195960
+	call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
+	setvar VAR_0x8004, 8
+	special sub_81A1780
+	special LoadPlayerParty
+	special HealPlayerParty
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 0
+	special sub_8195960
+	playse SE_SAVE
+	waitse
+	call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907
+	message BattleFrontier_BattlePalaceLobby_Text_24EF16
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24D907
+	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24D902
+	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24D907
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D902:: @ 824D902
+	call BattleFrontier_BattlePalaceLobby_EventScript_23E8B4
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D907:: @ 824D907
+	return
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908
+	lockall
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, 4
+	message BattleFrontier_BattlePalaceLobby_Text_24E5F6
+	waitmessage
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 1
+	special sub_8195960
+	playse SE_SAVE
+	waitse
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24DAF3
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D944:: @ 824D944
+	lock
+	faceplayer
+	setvar VAR_FRONTIER_FACILITY, 2
+	setvar VAR_0x40CE, 0
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24D968
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D956:: @ 824D956
+	lock
+	faceplayer
+	setvar VAR_FRONTIER_FACILITY, 2
+	setvar VAR_0x40CE, 1
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24D968
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 0
+	special sub_8195960
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817
+	special SavePlayerParty
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBA7
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB0
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB6
+	waitmessage
+	multichoice 17, 6, 23, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24D9E6
+	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB20
+	case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
+	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
+
+BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
+	message BattleFrontier_BattlePalaceLobby_Text_24E119
+	waitmessage
+	multichoice 17, 6, 24, 0
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
+	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
+	setvar VAR_0x8004, 15
+	special sub_81A1780
+	compare VAR_0x8004, 1
+	goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, 4
+	fadescreen 1
+	call BattleFrontier_BattlePalaceLobby_EventScript_23F2B7
+	copyvar VAR_0x8004, VAR_RESULT
+	setvar VAR_0x8005, 3
+	special sub_80F9490
+	waitstate
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB91
+	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DA87
+	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB91
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
+	setvar VAR_TEMP_0, 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	special sub_81A1780
+	setvar VAR_0x8004, 0
+	special sub_8195960
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 1
+	special sub_8195960
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special LoadPlayerParty
+	closemessage
+	delay 2
+	call BattleFrontier_BattlePalaceLobby_EventScript_27134F
+	setvar VAR_TEMP_0, 255
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3
+	special SavePlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, 4
+	closemessage
+	call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC
+	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13
+	setvar VAR_TEMP_0, 0
+	waitstate
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20
+	compare VAR_0x40CE, 1
+	goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, 4
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24D999
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DB38:: @ 824DB38
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24EBC2, 4
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24D999
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DB45:: @ 824DB45
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB60
+	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB6D
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DB60:: @ 824DB60
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24E173, 4
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DB6D:: @ 824DB6D
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24E29E, 4
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24DB94
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91
+	special LoadPlayerParty
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DB94:: @ 824DB94
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DB9C:: @ 824DB9C
+	release
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DB9E:: @ 824DB9E
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24DD5B, 4
+	return
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DBA7:: @ 824DBA7
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24EB06, 4
+	return
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DBB0:: @ 824DBB0
+	message BattleFrontier_BattlePalaceLobby_Text_24DDE1
+	return
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6
+	message BattleFrontier_BattlePalaceLobby_Text_24EB8C
+	return
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC23
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC29
+	applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47
+	applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC47
+	waitmovement 0
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC2F
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC35
+	waitdooranim
+	applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49
+	applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC4C
+	waitmovement 0
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC3B
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC41
+	waitdooranim
+	return
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DC23:: @ 824DC23
+	setvar VAR_LAST_TALKED, 1
+	return
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DC29:: @ 824DC29
+	setvar VAR_LAST_TALKED, 6
+	return
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DC2F:: @ 824DC2F
+	opendoor 5, 4
+	return
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DC35:: @ 824DC35
+	opendoor 19, 4
+	return
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DC3B:: @ 824DC3B
+	closedoor 5, 4
+	return
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DC41:: @ 824DC41
+	closedoor 19, 4
+	return
+
+BattleFrontier_BattlePalaceLobby_Movement_24DC47: @ 824DC47
+	walk_up
+	step_end
+
+BattleFrontier_BattlePalaceLobby_Movement_24DC49: @ 824DC49
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattlePalaceLobby_Movement_24DC4C: @ 824DC4C
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DC82:: @ 824DC82
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24E6E3, 2
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DC8B:: @ 824DC8B
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24E851, 2
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DC94:: @ 824DC94
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24E992, 2
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DC9D:: @ 824DC9D
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24EA4B, 2
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DCA6:: @ 824DCA6
+	lockall
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24EF66, 4
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DCB5:: @ 824DCB5
+	message BattleFrontier_BattlePalaceLobby_Text_24EF88
+	waitmessage
+	multichoice 16, 0, 100, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DD13
+	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DD21
+	case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DD2F
+	case 3, BattleFrontier_BattlePalaceLobby_EventScript_24DD3D
+	case 4, BattleFrontier_BattlePalaceLobby_EventScript_24DD4B
+	case 5, BattleFrontier_BattlePalaceLobby_EventScript_24DD59
+	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DD59
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DD13:: @ 824DD13
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24EFAB, 4
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DD21:: @ 824DD21
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24F049, 4
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DD2F:: @ 824DD2F
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24F190, 4
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DD3D:: @ 824DD3D
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24F2E8, 4
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DD4B:: @ 824DD4B
+	msgbox BattleFrontier_BattlePalaceLobby_Text_24F3F4, 4
+	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
+	end
+
+BattleFrontier_BattlePalaceLobby_EventScript_24DD59:: @ 824DD59
+	releaseall
+	end
+
+BattleFrontier_BattlePalaceLobby_Text_24DD5B: @ 824DD5B
+	.string "Where the hearts of TRAINERS\n"
+	.string "are put to the test.\p"
+	.string "I welcome you to the BATTLE PALACE.\p"
+	.string "I accept challenges to the SINGLE\n"
+	.string "BATTLE HALLS.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24DDE1: @ 824DDE1
+	.string "Do you wish to take\n"
+	.string "the SINGLE BATTLE HALL challenge?$"
+
+BattleFrontier_BattlePalaceLobby_Text_24DE17: @ 824DE17
+	.string "In the BATTLE PALACE, there are\n"
+	.string "several auditoriums for SINGLE BATTLES\l"
+	.string "that are named SINGLE BATTLE HALLS.\p"
+	.string "The SINGLE BATTLES are conducted in\n"
+	.string "the usual way, except with one crucial\l"
+	.string "rule that must be obeyed.\p"
+	.string "TRAINERS are permitted only to switch\n"
+	.string "their POKéMON in and out.\p"
+	.string "TRAINERS are otherwise forbidden to\n"
+	.string "command their POKéMON.\p"
+	.string "The POKéMON are to behave according\n"
+	.string "to their nature and battle on their own.\p"
+	.string "You must put your trust in your\n"
+	.string "POKéMON and watch over them.\p"
+	.string "If you achieve the honor of beating\n"
+	.string "seven TRAINERS in succession,\l"
+	.string "we will present you with Battle Points.\p"
+	.string "If you want to interrupt your\n"
+	.string "challenge, you must save the game.\p"
+	.string "If you don’t save before interrupting,\n"
+	.string "you will be disqualified.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E0D8: @ 824E0D8
+	.string "When you have fortified your heart\n"
+	.string "and POKéMON, you must return.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E119: @ 824E119
+	.string "There are two BATTLE HALLS,\n"
+	.string "Level 50 and Open Level.\l"
+	.string "Which is your choice of a challenge?$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E173: @ 824E173
+	.string "Sigh…\p"
+	.string "You do not have the three POKéMON\n"
+	.string "required for the challenge.\p"
+	.string "To enter, you must provide three\n"
+	.string "different kinds of POKéMON.\p"
+	.string "These POKéMON must all be of\n"
+	.string "Level 50 or lower.\p"
+	.string "They also must not be holding\n"
+	.string "the same kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Come back when you have made\n"
+	.string "your preparations.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E29E: @ 824E29E
+	.string "Sigh…\p"
+	.string "You do not have the three POKéMON\n"
+	.string "required for the challenge.\p"
+	.string "To enter, you must provide three\n"
+	.string "different kinds of POKéMON.\p"
+	.string "They also must not be holding\n"
+	.string "the same kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Come back when you have made\n"
+	.string "your preparations.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E399: @ 824E399
+	.string "Good. Now, you must select your\n"
+	.string "three POKéMON.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E3C8: @ 824E3C8
+	.string "I must save before I show you to\n"
+	.string "the BATTLE HALL. Is that okay?$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E408: @ 824E408
+	.string "Good.\n"
+	.string "Now, follow me.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E41E: @ 824E41E
+	.string "I feel privileged for having seen\n"
+	.string "your POKéMON’s exploits.\p"
+	.string "The results will be recorded.\n"
+	.string "I must ask you to briefly wait.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E497: @ 824E497
+	.string "To achieve a 7-win streak…\p"
+	.string "The bonds that bind your heart with\n"
+	.string "your POKéMON seem firm and true.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E4F7: @ 824E4F7
+	.string "Your feat will be recorded.\n"
+	.string "I must ask you to briefly wait.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E533: @ 824E5333
+    .string "For the feat of your 7-win streak,\n"
+    .string "we present you with Battle Point(s).$"
+
+VerdanturfTown_BattleTentLobby_Text_24E57B: @ 824E57B
+	.string "You seem to have no space for\n"
+	.string "our prize.\p"
+	.string "You should return when you have\n"
+	.string "organized your BAG.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E5D8: @ 824E5D8
+VerdanturfTown_BattleTentLobby_Text_24E5D8: @ 824E5D8
+	.string "We have been waiting for you…$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E5F6: @ 824E5F6
+VerdanturfTown_BattleTentLobby_Text_24E5F6: @ 824E5F6
+	.string "I must save before I show you to\n"
+	.string "the BATTLE HALL. Is that okay?$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E636: @ 824E636
+VerdanturfTown_BattleTentLobby_Text_24E636: @ 824E636
+	.string "Sigh…\p"
+	.string "You failed to save before you ended\n"
+	.string "your challenge the last time.\p"
+	.string "As a result, your challenge has been\n"
+	.string "disqualified. It is most unfortunate.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E6C9: @ 824E6C9
+	.string "{PLAYER} received the prize\n"
+	.string "{STR_VAR_1}.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E6E3: @ 824E6E3
+	.string "For a hardy fellow like me,\n"
+	.string "hardy POKéMON are the best.\p"
+	.string "Offense is the best defense!\n"
+	.string "A relentless attack is the ultimate!\p"
+	.string "But that’s not what I wanted to chat\n"
+	.string "about.\p"
+	.string "Every so often a really cute lady\n"
+	.string "swings by here.\p"
+	.string "She says that she can tell what\n"
+	.string "POKéMON are thinking.\p"
+	.string "I don’t know about that part,\n"
+	.string "but she is really cute.\p"
+	.string "Huh?\n"
+	.string "Why are you looking at me like that?$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E851: @ 824E851
+	.string "Hmm…\p"
+	.string "It appears that the nature of POKéMON\n"
+	.string "and the moves that they have been\l"
+	.string "taught are the keys to battle here.\p"
+	.string "To be more precise, it’s how well\n"
+	.string "the moves match the nature of\l"
+	.string "the POKéMON.\p"
+	.string "If your POKéMON is in trouble and\n"
+	.string "unable to live up to its potential,\l"
+	.string "you may need to examine how well\l"
+	.string "its moves match its nature.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E992: @ 824E992
+	.string "My POKéMON is usually very docile.\p"
+	.string "But when it’s in a BATTLE HALL,\n"
+	.string "it sometimes seems to become\l"
+	.string "transformed into something wicked!\p"
+	.string "It becomes totally intimidating.\n"
+	.string "It’s shocking, even.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EA4B: @ 824EA4B
+	.string "I wonder what sort of nature a POKéMON\n"
+	.string "would have if it favored enfeebling its\l"
+	.string "opponents and chipping away slowly.\p"
+	.string "I’d be surprised if it was a LAX nature.\p"
+	.string "But, nah, that can’t be right.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EB06: @ 824EB06
+	.string "Where the hearts of TRAINERS\n"
+	.string "are put to the test.\p"
+	.string "I welcome you to the BATTLE PALACE.\p"
+	.string "I accept challenges to the DOUBLE\n"
+	.string "BATTLE HALLS.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EB8C: @ 824EB8C
+	.string "Do you wish to take\n"
+	.string "the DOUBLE BATTLE HALL challenge?$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EBC2: @ 824EBC2
+	.string "In the BATTLE PALACE, there are\n"
+	.string "several auditoriums for DOUBLE BATTLES\l"
+	.string "that are named DOUBLE BATTLE HALLS.\p"
+	.string "The DOUBLE BATTLES are conducted in\n"
+	.string "the usual way, except with one crucial\l"
+	.string "rule that must be obeyed.\p"
+	.string "TRAINERS are permitted only to switch\n"
+	.string "their POKéMON in and out.\p"
+	.string "TRAINERS are otherwise forbidden to\n"
+	.string "command their POKéMON.\p"
+	.string "The POKéMON are to behave according\n"
+	.string "to their nature and battle on their own.\p"
+	.string "You must put your trust in your\n"
+	.string "POKéMON and watch over them.\p"
+	.string "If you achieve the honor of beating\n"
+	.string "seven TRAINERS in succession,\l"
+	.string "we will present you with Battle Points.\p"
+	.string "If you want to interrupt your\n"
+	.string "challenge, please save the game.\p"
+	.string "If you don’t save before interrupting,\n"
+	.string "you will be disqualified.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EE81: @ 824EE81
+	.string "To defeat the PALACE MAVEN\n"
+	.string "and seven TRAINERS in a row…$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EEB9: @ 824EEB9
+	.string "In honor of the bond you share with\n"
+	.string "your POKéMON, we present you with\l"
+	.string "these Battle Point(s).$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EF16: @ 824EF16
+	.string "Would you like to record your latest\n"
+	.string "BATTLE PALACE match on your\l"
+	.string "FRONTIER PASS?$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EF66: @ 824EF66
+	.string "The BATTLE HALL rules are listed.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EF88: @ 824EF88
+VerdanturfTown_BattleTentLobby_Text_24EF88: @ 824EF88
+	.string "Which heading do you want to read?$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EFAB: @ 824EFAB
+VerdanturfTown_BattleTentLobby_Text_24EFAB: @ 824EFAB
+	.string "Here, POKéMON are required to think\n"
+	.string "and battle by themselves.\p"
+	.string "Unlike in the wild, POKéMON that live\n"
+	.string "with people behave differently\l"
+	.string "depending on their nature.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24F049: @ 824F049
+VerdanturfTown_BattleTentLobby_Text_24F049: @ 824F049
+	.string "Depending on its nature, a POKéMON\n"
+	.string "may prefer to attack no matter what.\p"
+	.string "Another POKéMON may prefer to protect\n"
+	.string "itself from any harm.\p"
+	.string "Yet another may enjoy vexing or\n"
+	.string "confounding its foes.\p"
+	.string "Due to its nature, a POKéMON\n"
+	.string "will have favorite moves that it is good\l"
+	.string "at using.\p"
+	.string "It may also dislike certain moves that\n"
+	.string "it has trouble using.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24F190: @ 824F190
+VerdanturfTown_BattleTentLobby_Text_24F190: @ 824F190
+	.string "There are offensive moves that inflict\n"
+	.string "direct damage on the foe.\p"
+	.string "There are defensive moves that are\n"
+	.string "used to prepare for enemy attacks or\l"
+	.string "used to heal HP and so on.\p"
+	.string "There are also other somewhat-odd\n"
+	.string "moves that may enfeeble the foes with\l"
+	.string "stat problems including poison and \l"
+	.string "paralysis.\p"
+	.string "POKéMON will consider using moves in\n"
+	.string "these three categories.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24F2E8: @ 824F2E8
+VerdanturfTown_BattleTentLobby_Text_24F2E8: @ 824F2E8
+	.string "When not under command by its TRAINER,\n"
+	.string "a POKéMON may be unable to effectively\l"
+	.string "use certain moves.\p"
+	.string "A POKéMON is not good at using any\n"
+	.string "move that it dislikes.\p"
+	.string "If a POKéMON only knows moves that\n"
+	.string "do not match its nature, it will often\l"
+	.string "be unable to live up to its potential.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24F3F4: @ 824F3F4
+VerdanturfTown_BattleTentLobby_Text_24F3F4: @ 824F3F4
+	.string "Depending on its nature, a POKéMON may\n"
+	.string "start using moves that don’t match its\l"
+	.string "nature when it is in trouble.\p"
+	.string "If a POKéMON begins behaving oddly\n"
+	.string "in a pinch, watch it carefully.$"
+
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc
new file mode 100644
index 000000000..67ceaaae6
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc
@@ -0,0 +1,6 @@
+BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 6, 6, 3, 8, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C
+	map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
index f2bf0501b..a2b84a22c 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePikeCorridor: @ 8485510
-	.4byte BattleFrontier_BattlePikeCorridor_MapAttributes
+	.4byte BattleFrontier_BattlePikeCorridor_Layout
 	.4byte BattleFrontier_BattlePikeCorridor_MapEvents
 	.4byte BattleFrontier_BattlePikeCorridor_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
new file mode 100644
index 000000000..23ad26692
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
@@ -0,0 +1,69 @@
+BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771
+	map_script 2, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C
+	map_script 4, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7
+	.byte 0
+
+BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C786
+	.2byte 0
+
+BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
+	delay 16
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	setvar VAR_0x8004, 20
+	special sub_81A703C
+	setvar VAR_0x8004, 24
+	setvar VAR_0x8005, 1
+	special sub_81A703C
+	applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80B
+	applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812
+	waitmovement 0
+	lockall
+	msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, 4
+	closemessage
+	releaseall
+	applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80E
+	waitmovement 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 99
+	special sub_81A1780
+	call BattleFrontier_BattlePikeCorridor_EventScript_25BB49
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10
+	waitstate
+	end
+
+BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C801
+	.2byte 0
+
+BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattlePikeCorridor_Movement_25C80E: @ 825C80E
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattlePikeCorridor_Movement_25C812: @ 825C812
+	walk_up
+	walk_up
+	walk_left
+	face_down
+	step_end
+
+BattleFrontier_BattlePikeCorridor_Text_25C817: @ 825C817
+	.string "Your Battle Choice challenge\n"
+	.string "has now begun…$"
+
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/events.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc
new file mode 100644
index 000000000..45d3da103
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeLobby/events.inc
@@ -0,0 +1,18 @@
+BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 5, 5, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, 7, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 3, 9, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, 2, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0
+
+BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10
+	warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+	warp_def 4, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+	warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28
+	bg_event 8, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BA80
+	bg_event 1, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAC6
+
+BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40
+	map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents
+
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
index 2b7709152..96d249ab9 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePikeLobby: @ 84854F4
-	.4byte BattleFrontier_BattlePikeLobby_MapAttributes
+	.4byte BattleFrontier_BattlePikeLobby_Layout
 	.4byte BattleFrontier_BattlePikeLobby_MapEvents
 	.4byte BattleFrontier_BattlePikeLobby_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
new file mode 100644
index 000000000..5323c4a6b
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
@@ -0,0 +1,497 @@
+BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6
+	map_script 2, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1
+	map_script 4, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3
+	.byte 0
+
+BattleFrontier_BattlePikeLobby_MapScript2_25B6D1: @ 825B6D1
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B707
+	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePikeLobby_EventScript_25B710
+	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePikeLobby_EventScript_25B762
+	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePikeLobby_EventScript_25B806
+	.2byte 0
+
+BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeLobby_EventScript_25B6FD
+	.2byte 0
+
+BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
+	setvar VAR_0x8004, 0
+	special sub_81A1780
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
+	special HealPlayerParty
+	setvar VAR_0x8004, 27
+	special sub_81A703C
+	lockall
+	msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, 4
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_81A703C
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	setvar VAR_0x8006, 0
+	special sub_81A703C
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762
+	lockall
+	setvar VAR_0x8004, 10
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784
+	msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, 4
+	waitmessage
+	goto BattleFrontier_BattlePikeLobby_EventScript_25B78D
+
+BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784
+	msgbox BattleFrontier_BattlePikeLobby_Text_25C383, 4
+	waitmessage
+
+BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
+	msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, 4
+	setvar VAR_0x8004, 11
+	special sub_81A1780
+	msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9
+	setvar VAR_0x8004, 8
+	special sub_81A1780
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 3
+	special sub_81A703C
+	addvar VAR_RESULT, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A703C
+	special LoadPlayerParty
+	special HealPlayerParty
+	setvar VAR_0x8004, 27
+	special sub_81A703C
+	message BattleFrontier_BattlePikeLobby_Text_25C1DF
+	waitmessage
+	setvar VAR_0x8004, 8
+	setvar VAR_0x8005, 0
+	special sub_81A703C
+	playse SE_SAVE
+	waitse
+	msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
+	lockall
+	message BattleFrontier_BattlePikeLobby_Text_25C146
+	waitmessage
+	setvar VAR_0x8004, 8
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	setvar VAR_0x8006, 0
+	special sub_81A703C
+	special LoadPlayerParty
+	special HealPlayerParty
+	setvar VAR_0x8004, 27
+	special sub_81A703C
+	setvar VAR_0x8004, 8
+	setvar VAR_0x8005, 0
+	special sub_81A703C
+	playse SE_SAVE
+	waitse
+	msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868
+	lock
+	faceplayer
+	setvar VAR_FRONTIER_FACILITY, 5
+	setvar VAR_0x40CE, 0
+	special SavePlayerParty
+	msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, 4
+
+BattleFrontier_BattlePikeLobby_EventScript_25B87F:: @ 825B87F
+	message BattleFrontier_BattlePikeLobby_Text_25BBC1
+	waitmessage
+	multichoice 17, 6, 23, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePikeLobby_EventScript_25B8BB
+	case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA1A
+	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76
+	case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76
+
+BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
+	message BattleFrontier_BattlePikeLobby_Text_25BE35
+	waitmessage
+	multichoice 17, 6, 24, 0
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76
+	case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76
+	setvar VAR_0x8004, 15
+	special sub_81A1780
+	compare VAR_0x8004, 1
+	goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	msgbox BattleFrontier_BattlePikeLobby_Text_25C094, 4
+	fadescreen 1
+	call BattleFrontier_BattlePikeLobby_EventScript_23F2B7
+	copyvar VAR_0x8004, VAR_RESULT
+	setvar VAR_0x8005, 3
+	special sub_80F9490
+	waitstate
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73
+	msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA73
+	case 1, BattleFrontier_BattlePikeLobby_EventScript_25B95C
+	case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA73
+
+BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
+	setvar VAR_TEMP_0, 0
+	setvar VAR_TEMP_1, 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	special sub_81A1780
+	setvar VAR_0x8004, 28
+	special sub_81A703C
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	setvar VAR_0x8006, 1
+	special sub_81A703C
+	setvar VAR_0x8004, 26
+	special sub_81A703C
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special LoadPlayerParty
+	closemessage
+	delay 2
+	call BattleFrontier_BattlePikeLobby_EventScript_27134F
+	setvar VAR_TEMP_0, 255
+	setvar VAR_0x8004, 26
+	special sub_81A703C
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C
+	special SavePlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	msgbox BattleFrontier_BattlePikeLobby_Text_25C130, 4
+	closemessage
+	setvar VAR_0x8004, 5
+	special sub_81A1780
+	call BattleFrontier_BattlePikeLobby_EventScript_25BA94
+	special HealPlayerParty
+	call BattleFrontier_BattlePikeLobby_EventScript_25BB49
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7
+	setvar VAR_TEMP_0, 0
+	waitstate
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25BA1A:: @ 825BA1A
+	msgbox BattleFrontier_BattlePikeLobby_Text_25BBF5, 4
+	goto BattleFrontier_BattlePikeLobby_EventScript_25B87F
+
+BattleFrontier_BattlePikeLobby_EventScript_25BA27:: @ 825BA27
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA42
+	case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA4F
+
+BattleFrontier_BattlePikeLobby_EventScript_25BA42:: @ 825BA42
+	msgbox BattleFrontier_BattlePikeLobby_Text_25BE8C, 4
+	goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E
+
+BattleFrontier_BattlePikeLobby_EventScript_25BA4F:: @ 825BA4F
+	msgbox BattleFrontier_BattlePikeLobby_Text_25BF9A, 4
+	goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E
+
+BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	goto BattleFrontier_BattlePikeLobby_EventScript_25BA76
+
+BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73
+	special LoadPlayerParty
+
+BattleFrontier_BattlePikeLobby_EventScript_25BA76:: @ 825BA76
+	msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4
+
+BattleFrontier_BattlePikeLobby_EventScript_25BA7E:: @ 825BA7E
+	release
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 5
+	special sub_81A1780
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94
+	applymovement 1, BattleFrontier_BattlePikeLobby_Movement_25BAA7
+	applymovement 255, BattleFrontier_BattlePikeLobby_Movement_25BAA6
+	waitmovement 0
+	return
+
+BattleFrontier_BattlePikeLobby_Movement_25BAA6: @ 825BAA6
+	walk_up
+
+BattleFrontier_BattlePikeLobby_Movement_25BAA7: @ 825BAA7
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattlePikeLobby_EventScript_25BAAB:: @ 825BAAB
+	msgbox BattleFrontier_BattlePikeLobby_Text_25C422, 2
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25BAB4:: @ 825BAB4
+	msgbox BattleFrontier_BattlePikeLobby_Text_25C4A5, 2
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25BABD:: @ 825BABD
+	msgbox BattleFrontier_BattlePikeLobby_Text_25C4FD, 2
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25BAC6:: @ 825BAC6
+	lockall
+	msgbox BattleFrontier_BattlePikeLobby_Text_25C5FB, 4
+	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25BAD5:: @ 825BAD5
+	message BattleFrontier_BattlePikeLobby_Text_25C621
+	waitmessage
+	multichoice 16, 4, 102, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePikeLobby_EventScript_25BB1D
+	case 1, BattleFrontier_BattlePikeLobby_EventScript_25BB2B
+	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BB39
+	case 3, BattleFrontier_BattlePikeLobby_EventScript_25BB47
+	case 127, BattleFrontier_BattlePikeLobby_EventScript_25BB47
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25BB1D:: @ 825BB1D
+	msgbox BattleFrontier_BattlePikeLobby_Text_25C644, 4
+	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25BB2B:: @ 825BB2B
+	msgbox BattleFrontier_BattlePikeLobby_Text_25C68A, 4
+	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25BB39:: @ 825BB39
+	msgbox BattleFrontier_BattlePikeLobby_Text_25C6EB, 4
+	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
+	end
+
+BattleFrontier_BattlePikeLobby_EventScript_25BB47:: @ 825BB47
+	releaseall
+	end
+
+BattleFrontier_BattlePikeCorridor_EventScript_25BB49:: @ 825BB49
+BattleFrontier_BattlePikeLobby_EventScript_25BB49:: @ 825BB49
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49:: @ 825BB49
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49:: @ 825BB49
+	playse 267
+	special sub_813B880
+	waitstate
+	waitse
+	return
+
+BattleFrontier_BattlePikeLobby_Text_25BB52: @ 825BB52
+	.string "Where the luck of TRAINERS\n"
+	.string "is put to the test…\p"
+	.string "Welcome to the BATTLE PIKE…\p"
+	.string "I am your guide to the BATTLE PIKE…$"
+
+BattleFrontier_BattlePikeLobby_Text_25BBC1: @ 825BBC1
+	.string "Would you like to take the Battle\n"
+	.string "Choice challenge?$"
+
+BattleFrontier_BattlePikeLobby_Text_25BBF5: @ 825BBF5
+	.string "Here we conduct an event we call\n"
+	.string "the Battle Choice.\p"
+	.string "The Battle Choice rules are very\n"
+	.string "simple…\p"
+	.string "Choose one of three paths and make\n"
+	.string "your way to the goal room at the end\l"
+	.string "of the BATTLE PIKE. It’s that simple.\p"
+	.string "However, what happens on the chosen\n"
+	.string "path depends entirely on the luck\l"
+	.string "of the challenger…\p"
+	.string "If you reach the goal, you will be\n"
+	.string "rewarded with Battle Points.\p"
+	.string "If you want to interrupt your\n"
+	.string "challenge, please have a word with\l"
+	.string "our staff in the big rooms on the way.\p"
+	.string "If you don’t save before interrupting,\n"
+	.string "you will be disqualified.$"
+
+BattleFrontier_BattlePikeLobby_Text_25BE02: @ 825BE02
+	.string "We look forward to seeing you\n"
+	.string "on another occasion…$"
+
+BattleFrontier_BattlePikeLobby_Text_25BE35: @ 825BE35
+	.string "You have the choice of two courses,\n"
+	.string "Level 50 and Open Level.\l"
+	.string "Which will you challenge?$"
+
+BattleFrontier_BattlePikeLobby_Text_25BE8C: @ 825BE8C
+	.string "I beg your pardon, but…\p"
+	.string "You do not have three eligible\n"
+	.string "POKéMON for the Battle Choice event.\p"
+	.string "You must have three different POKéMON\n"
+	.string "of Level 50 or less to enter.\p"
+	.string "They also must be holding different\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Please come see me when\n"
+	.string "you are ready…$"
+
+BattleFrontier_BattlePikeLobby_Text_25BF9A: @ 825BF9A
+	.string "I beg your pardon, but…\p"
+	.string "You do not have three eligible\n"
+	.string "POKéMON for the Battle Choice event.\p"
+	.string "You must have three different\n"
+	.string "POKéMON to enter.\p"
+	.string "They also must be holding different\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Please come see me when\n"
+	.string "you are ready…$"
+
+BattleFrontier_BattlePikeLobby_Text_25C094: @ 825C094
+	.string "Please choose the three POKéMON\n"
+	.string "you wish to enter in the challenge…$"
+
+BattleFrontier_BattlePikeLobby_Text_25C0D8: @ 825C0D8
+	.string "Before starting your Battle Choice\n"
+	.string "challenge, I must save the game.\l"
+	.string "Is that acceptable?$"
+
+BattleFrontier_BattlePikeLobby_Text_25C130: @ 825C130
+	.string "Please step this way…$"
+
+BattleFrontier_BattlePikeLobby_Text_25C146: @ 825C146
+	.string "Your challenge has ended…\p"
+	.string "I shall record your results.\n"
+	.string "Please wait…$"
+
+BattleFrontier_BattlePikeLobby_Text_25C18A: @ 825C18A
+	.string "You have completed the challenge…\p"
+	.string "I must say… You seem to possess luck\n"
+	.string "in abundance…$"
+
+BattleFrontier_BattlePikeLobby_Text_25C1DF: @ 825C1DF
+	.string "I shall record your results.\n"
+	.string "Please wait…$"
+
+BattleFrontier_BattlePikeLobby_Text_25C209: @ 825C209
+	.string "To commemorate your completion of\n"
+	.string "the Battle Choice challenge, we award\l"
+	.string "you these Battle Point(s)…$"
+
+BattleFrontier_BattlePikeLobby_Text_25C26C: @ 825C26C
+	.string "You appear to have reached the limit\n"
+	.string "for Battle Points…\pPlease exchange some Battle Points\n"
+	.string "for prizes, then return…$"
+
+BattleFrontier_BattlePikeLobby_Text_25C2E0: @ 825C2E0
+	.string "I beg your pardon, but…\p"
+	.string "You failed to save before you quit\n"
+	.string "your challenge the last time.\p"
+	.string "Because of that, your challenge so far\n"
+	.string "has been disqualified. I am sorry…$"
+
+BattleFrontier_BattlePikeLobby_Text_25C383: @ 825C383
+	.string "Congratulations…\p"
+	.string "You have snatched victory from the\n"
+	.string "PIKE QUEEN and cleared the event…$"
+
+BattleFrontier_BattlePikeLobby_Text_25C3D9: @ 825C3D9
+	.string "In recognition of your amazing luck,\n"
+	.string "we award you these Battle Point(s)…$"
+
+BattleFrontier_BattlePikeLobby_Text_25C422: @ 825C422
+	.string "Arrgh! I blew my chance!\n"
+	.string "I was one room away from the goal!\p"
+	.string "In this place, you’d better watch out\n"
+	.string "for poison, freezing, and so on.$"
+
+BattleFrontier_BattlePikeLobby_Text_25C4A5: @ 825C4A5
+	.string "I’ve completed the challenge 10 times\n"
+	.string "now, but I’ve never had to battle\l"
+	.string "a TRAINER once.$"
+
+BattleFrontier_BattlePikeLobby_Text_25C4FD: @ 825C4FD
+	.string "Listen! Listen!\p"
+	.string "Don’t you think that the special\n"
+	.string "abilities of POKéMON will be useful\l"
+	.string "here?$"
+
+BattleFrontier_BattlePikeLobby_Text_25C558: @ 825C558
+	.string "What is this weird place?\n"
+	.string "I can’t figure it out at all!\p"
+	.string "I’ve taken the challenge a bunch\n"
+	.string "of times, but all I ever do is run into\l"
+	.string "TRAINERS whichever path I choose.$"
+
+BattleFrontier_BattlePikeLobby_Text_25C5FB: @ 825C5FB
+	.string "The Battle Choice’s rules are listed.$"
+
+BattleFrontier_BattlePikeLobby_Text_25C621: @ 825C621
+	.string "Which heading do you want to read?$"
+
+BattleFrontier_BattlePikeLobby_Text_25C644: @ 825C644
+	.string "The BAG and POKéNAV may not be used\n"
+	.string "during a Battle Choice challenge.$"
+
+BattleFrontier_BattlePikeLobby_Text_25C68A: @ 825C68A
+	.string "During a Battle Choice challenge,\n"
+	.string "any BERRY or HERB held by POKéMON\l"
+	.string "will be effective only once.$"
+
+BattleFrontier_BattlePikeLobby_Text_25C6EB: @ 825C6EB
+	.string "During a Battle Choice challenge,\n"
+	.string "the sequence of POKéMON cannot be\l"
+	.string "changed.\p"
+	.string "The sequence must be set before\n"
+	.string "starting your challenge.$"
+
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
new file mode 100644
index 000000000..80c1fc3bf
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
@@ -0,0 +1,16 @@
+BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
+	object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0
+
+BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
+	coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
+	coord_event 3, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
+	coord_event 3, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
+	coord_event 4, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
+	coord_event 5, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
+	coord_event 4, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
+	coord_event 5, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
+
+BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4
+	map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0
+
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
index 89c74c18a..58a662bb3 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePikeRandomRoom1: @ 8485548
-	.4byte BattleFrontier_BattlePikeRandomRoom1_MapAttributes
+	.4byte BattleFrontier_BattlePikeRandomRoom1_Layout
 	.4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents
 	.4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
new file mode 100644
index 000000000..509806531
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
@@ -0,0 +1,895 @@
+BattleFrontier_BattlePikeRandomRoom1_MapScripts:: @ 825D152
+	map_script 5, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E
+	map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25
+	map_script 2, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167
+	map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE
+	.byte 0
+
+BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171
+	.2byte 0
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171
+	setvar VAR_TEMP_0, 1
+	setvar VAR_0x8004, 5
+	special sub_81A703C
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6
+	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E
+	case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605
+	case 6, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231
+	case 7, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E
+	case 8, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6
+	lockall
+	delay 16
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
+	waitmovement 0
+	setvar VAR_0x8004, 21
+	setvar VAR_0x8005, 0
+	special sub_81A703C
+	msgbox 0x2021fc4, 4
+	waitmessage
+	closemessage
+	releaseall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 0
+	special sub_8163AC4
+	waitstate
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A:: @ 825D20A
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 4
+	special sub_81A1780
+	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
+	waitstate
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226:: @ 825D226
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798
+	waitmovement 0
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231
+	lockall
+	delay 16
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE, 4
+	waitmessage
+	closemessage
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
+	waitmovement 0
+	setvar VAR_0x8004, 21
+	setvar VAR_0x8005, 0
+	special sub_81A703C
+	msgbox 0x2021fc4, 4
+	waitmessage
+	closemessage
+	releaseall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 0
+	special sub_8163AC4
+	waitstate
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285
+	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798
+	waitmovement 0
+	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6
+	waitmovement 0
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, 4
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, 4
+	closemessage
+	release
+	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798
+	waitmovement 0
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF
+	delay 22
+	lockall
+	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF
+	waitmovement 0
+	setvar VAR_0x8004, 23
+	special sub_81A703C
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC
+	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA
+	case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, 4
+	closemessage
+	special SpawnScriptEventObject
+	applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0
+	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2
+	waitmovement 0
+	playse 267
+	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7
+	delay 4
+	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4
+	delay 4
+	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D
+	delay 4
+	waitse
+	delay 60
+	playse 268
+	delay 65
+	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4
+	showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
+	delay 4
+	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7
+	delay 4
+	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D92A
+	waitse
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7
+	waitmovement 0
+	setvar VAR_0x8004, 22
+	special sub_81A703C
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416
+	case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD
+	case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, 4
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, 4
+	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA
+	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA
+	setvar VAR_0x8004, 12
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4
+	waitmessage
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0
+	waitmessage
+	waitfanfare
+	setvar VAR_0x8004, 13
+	special sub_81A1780
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, 4
+	closemessage
+	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, 4
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, 4
+	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460
+	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460
+	setvar VAR_0x8004, 12
+	special sub_81A1780
+	compare VAR_RESULT, 2
+	goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4
+	waitmessage
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattlePikeRandomRoom1_Text_25E118
+	waitmessage
+	waitfanfare
+	setvar VAR_0x8004, 13
+	special sub_81A1780
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, 4
+	closemessage
+	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA
+	waitmovement 0
+	applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	special sub_81A703C
+	addvar VAR_RESULT, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A703C
+	call BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144
+	waitstate
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC:: @ 825D4DC
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E15D, 4
+	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA:: @ 825D4EA
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, 4
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC:: @ 825D4FC
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, 4
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E
+	lockall
+	delay 16
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
+	waitmovement 0
+	message BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6
+	waitmessage
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, 4
+	closemessage
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798
+	waitmovement 0
+	releaseall
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
+	lockall
+	delay 16
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1
+	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3
+	waitmovement 0
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5
+	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5
+	waitmovement 0
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8
+	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA
+	waitmovement 0
+	applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB
+	waitmovement 0
+	setvar VAR_0x8004, 21
+	setvar VAR_0x8005, 0
+	special sub_81A703C
+	msgbox 0x2021fc4, 4
+	closemessage
+	delay 16
+	applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
+	waitmovement 0
+	setvar VAR_0x8004, 21
+	setvar VAR_0x8005, 1
+	special sub_81A703C
+	msgbox 0x2021fc4, 4
+	closemessage
+	setvar VAR_0x8004, 9
+	setvar VAR_0x8005, 0
+	special sub_8163AC4
+	waitstate
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC
+	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC:: @ 825D5DC
+	applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
+	waitmovement 0
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC
+	waitmovement 0
+	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4
+	waitmovement 0
+	applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF
+	waitmovement 0
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605
+	lockall
+	message BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1
+	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA
+	waitmovement 0
+	setvar VAR_0x8004, 12
+	special sub_81A703C
+	copyvar VAR_0x8004, VAR_RESULT
+	compare VAR_0x8004, 0
+	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643
+	compare VAR_0x8004, 1
+	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, 4
+	closemessage
+	releaseall
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4, 4
+	closemessage
+	waitse
+	playmoncry SPECIES_KIRLIA, 0
+	waitmoncry
+	setvar VAR_0x8004, 11
+	special sub_81A703C
+	compare VAR_RESULT, 2
+	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751
+	compare VAR_RESULT, 1
+	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758
+	compare VAR_RESULT, 3
+	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F
+	compare VAR_RESULT, 4
+	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766
+	setvar VAR_0x8004, 15
+	special sub_81A703C
+	waitstate
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2
+	waitmovement 0
+	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_KIRLIA, 0
+	waitmoncry
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4
+	waitse
+	playmoncry SPECIES_KIRLIA, 0
+	waitmoncry
+	closemessage
+	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4
+	waitmovement 0
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF, 4
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DC01, 4
+	closemessage
+	waitse
+	playmoncry SPECIES_DUSCLOPS, 0
+	waitmoncry
+	setvar VAR_0x8004, 11
+	special sub_81A703C
+	compare VAR_RESULT, 0
+	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D
+	compare VAR_RESULT, 1
+	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774
+	setvar VAR_0x8004, 15
+	special sub_81A703C
+	waitstate
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2
+	waitmovement 0
+	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_DUSCLOPS, 0
+	waitmoncry
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4
+	waitse
+	playmoncry SPECIES_DUSCLOPS, 0
+	waitmoncry
+	closemessage
+	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4
+	waitmovement 0
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD06, 4
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751:: @ 825D751
+	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC20
+	waitmessage
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758:: @ 825D758
+	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC63
+	waitmessage
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F:: @ 825D75F
+	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC49
+	waitmessage
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766:: @ 825D766
+	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC33
+	waitmessage
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D:: @ 825D76D
+	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC97
+	waitmessage
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774:: @ 825D774
+	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC7C
+	waitmessage
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B
+	closemessage
+	applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
+	waitmovement 0
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 0
+	special sub_8163AC4
+	waitstate
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D795: @ 825D795
+	walk_down
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D798: @ 825D798
+	walk_up
+	walk_up
+	walk_up
+	set_invisible
+	walk_up
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E: @ 825D79E
+	walk_up
+	set_invisible
+	walk_up
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2: @ 825D7A2
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4: @ 825D7A4
+	walk_down
+	face_left
+	delay_16
+	delay_16
+	face_down
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA: @ 825D7AA
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_left
+	face_down
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1: @ 825D7B1
+	face_up
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3: @ 825D7B3
+	walk_left
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4: @ 825D7B4
+	face_right
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6: @ 825D7B6
+	walk_down
+	walk_down
+	walk_right
+	face_down
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB: @ 825D7BB
+	face_left
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD: @ 825D7BD
+	face_right
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF: @ 825D7BF
+	face_up
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1: @ 825D7C1
+	walk_right
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3: @ 825D7C3
+	walk_left
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5: @ 825D7C5
+	walk_down
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8: @ 825D7C8
+	face_right
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA: @ 825D7CA
+	face_left
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC: @ 825D7CC
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	set_invisible
+	walk_up
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4: @ 825D7D4
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_up
+	set_invisible
+	walk_up
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC: @ 825D7DC
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF: @ 825D7DF
+	walk_down
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2: @ 825D7E2
+	walk_up
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7: @ 825D7E7
+	set_visible
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA
+	walk_left
+	face_right
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED
+	setvar VAR_0x8004, 5
+	special sub_81A703C
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B
+	case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831
+	case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B
+	lock
+	faceplayer
+	setvar VAR_0x8004, 14
+	special sub_81A703C
+	msgbox 0x2021fc4, 4
+	waitmessage
+	closemessage
+	release
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3, 4
+	closemessage
+	release
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E
+	setvar VAR_0x8004, 13
+	special sub_81A703C
+	compare VAR_RESULT, 2
+	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881
+	compare VAR_RESULT, 1
+	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, 4
+	closemessage
+	release
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E
+	waitmovement 0
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875:: @ 825D875
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA51, 4
+	closemessage
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881:: @ 825D881
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E32E, 4
+	closemessage
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D:: @ 825D88D
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6, 4
+	closemessage
+	release
+	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4
+	waitmovement 0
+	end
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4:: @ 825D8A4
+	setmetatile 4, 1, 554, 1
+	setmetatile 3, 2, 561, 1
+	setmetatile 4, 2, 562, 1
+	setmetatile 5, 2, 563, 1
+	setmetatile 3, 3, 569, 1
+	setmetatile 4, 3, 570, 0
+	setmetatile 5, 3, 571, 1
+	special DrawWholeMapView
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7:: @ 825D8E7
+	setmetatile 4, 1, 522, 1
+	setmetatile 3, 2, 529, 1
+	setmetatile 4, 2, 530, 1
+	setmetatile 5, 2, 531, 1
+	setmetatile 3, 3, 537, 1
+	setmetatile 4, 3, 538, 0
+	setmetatile 5, 3, 539, 1
+	special DrawWholeMapView
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D92A:: @ 825D92A
+	setmetatile 4, 1, 683, 1
+	setmetatile 3, 2, 690, 1
+	setmetatile 4, 2, 691, 1
+	setmetatile 5, 2, 692, 1
+	setmetatile 3, 3, 698, 1
+	setmetatile 4, 3, 699, 0
+	setmetatile 5, 3, 700, 1
+	special DrawWholeMapView
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D:: @ 825D96D
+	setmetatile 4, 1, 586, 1
+	setmetatile 3, 2, 593, 1
+	setmetatile 4, 2, 594, 1
+	setmetatile 5, 2, 595, 1
+	setmetatile 3, 3, 601, 1
+	setmetatile 4, 3, 602, 0
+	setmetatile 5, 3, 603, 1
+	special DrawWholeMapView
+	return
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0: @ 825D9B0
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B3: @ 825D9B3
+	walk_down
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6: @ 825D9B6
+	.string "Welcome…\n"
+	.string "You must be commended for your luck…\p"
+	.string "Your POKéMON shall be restored\n"
+	.string "to full health…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DA13: @ 825DA13
+	.string "I urge you to enjoy the rest of your\n"
+	.string "Battle Choice challenge…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DA51: @ 825DA51
+	.string "Ah, you’re a lucky one.\n"
+	.string "I’m in somewhat-good spirits now.\p"
+	.string "I will restore one of your POKéMON\n"
+	.string "to full health.$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DABE: @ 825DABE
+	.string "The best of luck to you.\n"
+	.string "Farewell.$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DAE1: @ 825DAE1
+	.string "Excuse me…\p"
+	.string "Would you care for a battle?\n"
+	.string "I’ll restore your POKéMON if you win.$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DB2F: @ 825DB2F
+	.string "Very well…\n"
+	.string "Now, shall we?$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DB49: @ 825DB49
+	.string "I see…\n"
+	.string "How unsporting of you…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DB67: @ 825DB67
+	.string "Magnificent…\p"
+	.string "As promised, I shall restore your\n"
+	.string "POKéMON to full health.$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DBAE: @ 825DBAE
+	.string "The best of luck to you.\n"
+	.string "Farewell.$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1: @ 825DBD1
+	.string "Oh, my!\p"
+	.string "Watch out!$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4: @ 825DBE4
+	.string "Now, now!\n"
+	.string "KIRLIA, stop that!$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DC01: @ 825DC01
+	.string "Now, now!\n"
+	.string "DUSCLOPS, stop that!$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DC20: @ 825DC20
+	.string "KIRLIA used TOXIC!$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DC33: @ 825DC33
+	.string "KIRLIA used HYPNOSIS!$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DC49: @ 825DC49
+	.string "KIRLIA used THUNDER WAVE!$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DC63: @ 825DC63
+	.string "KIRLIA used WILL-O-WISP!$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DC7C: @ 825DC7C
+	.string "DUSCLOPS used WILL-O-WISP!$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DC97: @ 825DC97
+	.string "DUSCLOPS used ICE BEAM!$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF: @ 825DCAF
+	.string "Look here!\n"
+	.string "That’s quite enough!$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF: @ 825DCCF
+	.string "I must apologize to you…\p"
+	.string "My KIRLIA has a TIMID nature…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DD06: @ 825DD06
+	.string "I must apologize to you…\p"
+	.string "My DUSCLOPS has a TIMID nature…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F: @ 825DD3F
+	.string "It attacks without warning if it is\n"
+	.string "startled by another person…\p"
+	.string "Are you and your POKéMON all right?$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3: @ 825DDA3
+	.string "I do apologize for what happened…\n"
+	.string "I do hope your POKéMON are fine.$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6: @ 825DDE6
+	.string "… … … … … …\n"
+	.string "… … … … … …$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE: @ 825DDFE
+	.string "Welcome…\p"
+	.string "Here, we will have you battle\n"
+	.string "a somewhat-tough TRAINER…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F: @ 825DE3F
+	.string "How wonderful…\p"
+	.string "To honor your victory, your POKéMON\n"
+	.string "shall be restored to full health…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DE94: @ 825DE94
+	.string "I urge you to enjoy the rest of your\n"
+	.string "Battle Choice challenge…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DED2: @ 825DED2
+	.string "I am LUCY…\n"
+	.string "I am the law here…\l"
+	.string "For I am the PIKE QUEEN…\p"
+	.string "You already know it, but to advance,\n"
+	.string "you must defeat me…\p"
+	.string "…I’m not one for idle chatter.\n"
+	.string "Hurry. Come on…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DF71: @ 825DF71
+	.string "Your luck…\n"
+	.string "I hope you didn’t use it all up here…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2: @ 825DFA2
+	.string "LUCY: … … … … … …\n"
+	.string "Show me your FRONTIER PASS…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0: @ 825DFD0
+	.string "The Luck Symbol was embossed on\n"
+	.string "the FRONTIER PASS!$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25E003: @ 825E003
+	.string "…That’s all there is…\n"
+	.string "Disappear already…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25E02C: @ 825E02C
+	.string "LUCY: …You again…\p"
+	.string "… … … … … …\p"
+	.string "…I’ve trampled flowers and braved\n"
+	.string "storms to get to where I am…\p"
+	.string "I don’t feel any compulsion to keep\n"
+	.string "losing to the same opponent…\p"
+	.string "… … … … … …\n"
+	.string "Fine… I’ll do it…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8: @ 825E0E8
+	.string "Now!\n"
+	.string "Come on!$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6: @ 825E0F6
+	.string "LUCY: … … … … … …\p"
+	.string "…FRONTIER PASS…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25E118: @ 825E118
+	.string "The Luck Symbol took on\n"
+	.string "a golden shine!$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25E140: @ 825E140
+	.string "…You, I won’t forget…\n"
+	.string "…Ever…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25E15D: @ 825E15D
+	.string "I welcome you…\p"
+	.string "Giggle…\n"
+	.string "You seem to be bereft of luck…\p"
+	.string "If only you hadn’t chosen this room,\n"
+	.string "your POKéMON could have been healed…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD: @ 825E1DD
+	.string "I welcome you…\p"
+	.string "Since you have chosen this room, I will\n"
+	.string "restore one POKéMON to full health…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25E238: @ 825E238
+	.string "I welcome you…\p"
+	.string "Since you have chosen this room, I will\n"
+	.string "restore two POKéMON to full health…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25E293: @ 825E293
+	.string "I welcome you…\p"
+	.string "Giggle…\n"
+	.string "You should thank your lucky stars…\p"
+	.string "Since you have chosen this room,\n"
+	.string "all your POKéMON will be restored…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25E311: @ 825E311
+	.string "I shall go fetch our master…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25E32E: @ 825E32E
+	.string "Ah, you’re a lucky one!\n"
+	.string "I’m in good spirits now.\p"
+	.string "I will restore two of your POKéMON\n"
+	.string "to full health!$"
+
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
new file mode 100644
index 000000000..9cff20517
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
@@ -0,0 +1,6 @@
+BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, 8, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20
+	map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
index 425df7bcb..5dde0fc15 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePikeRandomRoom2: @ 8485564
-	.4byte BattleFrontier_BattlePikeRandomRoom2_MapAttributes
+	.4byte BattleFrontier_BattlePikeRandomRoom2_Layout
 	.4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents
 	.4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
new file mode 100644
index 000000000..4f0d4632b
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
@@ -0,0 +1,43 @@
+BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392
+	map_script 2, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D
+	map_script 4, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE
+	.byte 0
+
+BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7
+	.2byte 0
+
+BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7
+	delay 16
+	applymovement 1, BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB
+	waitmovement 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 3
+	special sub_81A1780
+	lockall
+	msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4
+	closemessage
+	releaseall
+	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
+	waitstate
+	end
+
+BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB: @ 825E3DB
+	walk_down
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE
+	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8
+	.2byte 0
+
+BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8
+	setvar VAR_TEMP_4, 1
+	turnobject 255, 2
+	end
+
+BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2
+	.string "Congratulations…\n"
+	.string "Now, this way, please…$"
+
diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc
index 20e6cb085..20e6cb085 100644
--- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
index e3518c68b..1d8848d23 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePikeRandomRoom3: @ 8485580
-	.4byte BattleFrontier_BattlePikeRandomRoom3_MapAttributes
+	.4byte BattleFrontier_BattlePikeRandomRoom3_Layout
 	.4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents
 	.4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
new file mode 100644
index 000000000..9256764e8
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
@@ -0,0 +1,50 @@
+BattleFrontier_BattlePikeRandomRoom3_MapScripts:: @ 825E41A
+	map_script 5, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A
+	map_script 2, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A
+	map_script 4, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466
+	.byte 0
+
+BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C
+	map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A
+	.2byte 0
+
+BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C
+	setvar VAR_TEMP_0, 1
+	setvar VAR_0x8004, 6
+	special sub_81A703C
+	end
+
+BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 4
+	special sub_81A1780
+	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
+	waitstate
+	end
+
+BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466
+	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470
+	.2byte 0
+
+BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470
+	setvar VAR_TEMP_4, 1
+	turnobject 255, 2
+	end
+
+BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A
+	call BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 5
+	special sub_81A1780
+	compare VAR_RESULT, 2
+	goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3
+	compare VAR_RESULT, 3
+	goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3
+	end
+
+BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3:: @ 825E4A3
+	setvar VAR_TEMP_1, 1
+	end
+
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
new file mode 100644
index 000000000..7a23ba892
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
@@ -0,0 +1,18 @@
+BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0
+
+BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
+	coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E
+	coord_event 6, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59
+	coord_event 10, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64
+	coord_event 5, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
+	coord_event 6, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
+	coord_event 6, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
+	coord_event 5, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
+	coord_event 7, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
+	coord_event 7, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
+
+BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40
+	map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0
+
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
index a9e768832..b1178e0a0 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePikeThreePathRoom: @ 848552C
-	.4byte BattleFrontier_BattlePikeThreePathRoom_MapAttributes
+	.4byte BattleFrontier_BattlePikeThreePathRoom_Layout
 	.4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents
 	.4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
new file mode 100644
index 000000000..a4725036b
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
@@ -0,0 +1,393 @@
+BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843
+	map_script 5, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E
+	map_script 2, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853
+	map_script 4, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D
+	.byte 0
+
+BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891
+	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A
+	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4
+	map_script_2 VAR_TEMP_5, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78
+	map_script_2 VAR_TEMP_5, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97
+	.2byte 0
+
+BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D
+	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887
+	.2byte 0
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887
+	setvar VAR_TEMP_4, 1
+	turnobject 255, 2
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891
+	setvar VAR_0x8004, 0
+	special sub_81A1780
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A:: @ 825C89A
+	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
+	waitstate
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
+	lockall
+	message BattleFrontier_BattlePikeThreePathRoom_Text_25CD75
+	waitmessage
+	setvar VAR_0x8004, 8
+	setvar VAR_0x8005, 1
+	special sub_81A703C
+	playse SE_SAVE
+	waitse
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	special SavePlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, 4
+	closemessage
+	releaseall
+	setvar VAR_0x8004, 5
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 99
+	special sub_81A1780
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968
+	case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978
+	case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988
+	case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998
+	case 9, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8
+	case 11, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8
+	case 13, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968:: @ 825C968
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD, 4
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978:: @ 825C978
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC00, 4
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988:: @ 825C988
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC23, 4
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998:: @ 825C998
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC46, 4
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8:: @ 825C9A8
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC69, 4
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8:: @ 825C9B8
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C, 4
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8:: @ 825C9C8
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0, 4
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A
+	case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A
+	release
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
+	setvar VAR_0x8004, 6
+	special sub_81A1780
+	message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08
+	waitmessage
+	special LoadPlayerParty
+	setvar VAR_0x8004, 8
+	setvar VAR_0x8005, 2
+	special sub_81A703C
+	playse SE_SAVE
+	waitse
+	fadescreen 1
+	setvar VAR_0x8004, 4
+	special sub_81A1780
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB, 5
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD
+	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A
+	case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A
+	release
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A
+	message BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222
+	release
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78
+	setvar VAR_0x8004, 17
+	special sub_81A703C
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91
+	setvar VAR_TEMP_5, 255
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91:: @ 825CA91
+	setvar VAR_TEMP_5, 1
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97
+	applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE
+	waitmovement 0
+	lockall
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D094, 4
+	releaseall
+	applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5
+	waitmovement 0
+	setvar VAR_TEMP_5, 255
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB
+	setvar VAR_0x8004, 19
+	special sub_81A703C
+	compare VAR_RESULT, 4
+	goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, 5
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A
+	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00
+	case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00
+	release
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB, 4
+	release
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A
+	setvar VAR_0x8004, 18
+	special sub_81A703C
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39
+	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46
+	case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39:: @ 825CB39
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF64, 4
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46:: @ 825CB46
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF23, 4
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3, 4
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60
+	setvar VAR_0x8004, 19
+	special sub_81A703C
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A
+	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4
+	case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE
+	case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A:: @ 825CB9A
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D054, 4
+	release
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4:: @ 825CBA4
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D017, 4
+	release
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE:: @ 825CBAE
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3, 4
+	release
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8:: @ 825CBB8
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5, 4
+	release
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2:: @ 825CBC2
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D125, 4
+	release
+	end
+
+BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE: @ 825CBCE
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5: @ 825CBD5
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	face_down
+	step_end
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD: @ 825CBDD
+	.string "You are currently in\n"
+	.string "the 1st room…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CC00: @ 825CC00
+	.string "You are currently in\n"
+	.string "the 3rd room…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CC23: @ 825CC23
+	.string "You are currently in\n"
+	.string "the 5th room…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CC46: @ 825CC46
+	.string "You are currently in\n"
+	.string "the 7th room…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CC69: @ 825CC69
+	.string "You are currently in\n"
+	.string "the 9th room…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C: @ 825CC8C
+	.string "You are currently in\n"
+	.string "the 11th room…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0: @ 825CCB0
+	.string "You are currently in\n"
+	.string "the 13th room…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4: @ 825CCD4
+	.string "Will you continue with\n"
+	.string "your challenge?$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB: @ 825CCFB
+	.string "Would you like to save your challenge\n"
+	.string "and quit the game for now?$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C: @ 825CD3C
+	.string "Do you wish to retire from your\n"
+	.string "Battle Choice challenge?$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CD75: @ 825CD75
+	.string "We’ve been awaiting your return…\p"
+	.string "Before resuming your Battle Choice\n"
+	.string "challenge, let me save the game…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA: @ 825CDDA
+	.string "Please do enjoy your Battle Choice\n"
+	.string "challenge…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CE08: @ 825CE08
+	.string "I am saving your data…\n"
+	.string "A little time, please…$"
+
+BattleFrontier_BattlePikeRandomRoom1_Text_25CE36: @ 825CE36
+BattleFrontier_BattlePikeRandomRoom3_Text_25CE36: @ 825CE36
+BattleFrontier_BattlePikeThreePathRoom_Text_25CE36: @ 825CE36
+	.string "The path is blocked!\n"
+	.string "And there is no turning back…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CE69: @ 825CE69
+	.string "I beg your pardon, but…\p"
+	.string "Are you perhaps finding it difficult\n"
+	.string "to choose your path?$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB: @ 825CEBB
+	.string "I see…\n"
+	.string "I apologize for my impertinence…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3: @ 825CEE3
+	.string "Ah, let me see… There is something\n"
+	.string "about the path on the right…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CF23: @ 825CF23
+	.string "Ah, let me see… There is something\n"
+	.string "about the path in the center…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CF64: @ 825CF64
+	.string "Ah, let me see… There is something\n"
+	.string "about the path on the left…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3: @ 825CFA3
+	.string "It seems to have the distinct aroma\n"
+	.string "of POKéMON wafting around it…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5: @ 825CFE5
+	.string "Is it… A TRAINER?\n"
+	.string "I sense the presence of people…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25D017: @ 825D017
+	.string "I seem to have heard something…\n"
+	.string "It may have been whispering…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25D054: @ 825D054
+	.string "For some odd reason, I felt a wave\n"
+	.string "of nostalgia coming from it…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25D094: @ 825D094
+	.string "I am sorry to say…\p"
+	.string "A terrifying event, yes, a horrible one,\n"
+	.string "is about to befall you…\p"
+	.string "I urge you to pay the utmost care\n"
+	.string "and prepare for the worst…$"
+
+BattleFrontier_BattlePikeThreePathRoom_Text_25D125: @ 825D125
+	.string "From every path I sense a dreadful\n"
+	.string "presence…$"
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc
new file mode 100644
index 000000000..7a8c584ac
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc
@@ -0,0 +1,19 @@
+BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 0, 10, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0
+	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 9, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0
+	object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0
+	object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0
+	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0
+	object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0
+
+BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0
+	warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+	warp_def 6, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+	warp_def 8, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: @ 853D108
+	map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
index 150d9cc03..069dc6f76 100644
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes
+	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout
 	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents
 	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
index 5bb6a87e0..5bb6a87e0 100644
--- a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc
new file mode 100644
index 000000000..f7d22a5ed
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc
@@ -0,0 +1,21 @@
+BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, 1, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC
+	map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
index ead91f494..f2eccb9f4 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePyramidEmptySquare: @ 8485414
-	.4byte BattleFrontier_BattlePyramidEmptySquare_MapAttributes
+	.4byte BattleFrontier_BattlePyramidEmptySquare_Layout
 	.4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents
 	.4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
new file mode 100644
index 000000000..eacee4cf3
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
@@ -0,0 +1,784 @@
+BattleFrontier_BattlePyramidEmptySquare_MapScripts:: @ 8252A33
+	map_script 5, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2
+	map_script 2, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43
+	map_script 3, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA
+	.byte 0
+
+BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43
+	map_script_2 VAR_TEMP_D, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D
+	map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98
+	map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F
+	.2byte 0
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D
+	lockall
+	setvar VAR_0x8004, 13
+	setvar VAR_0x8005, 4
+	setvar VAR_0x8006, 1
+	setvar VAR_0x8007, 55
+	setvar VAR_RESULT, 0
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77
+	special sub_81A8E7C
+	delay 2
+	compare VAR_RESULT, 2
+	goto_if 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77
+	setvar VAR_TEMP_D, 0
+	releaseall
+	end
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F:: @ 8252A8F
+	special ShowMapNamePopup
+	setvar VAR_TEMP_F, 0
+	end
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98
+	playbgm MUS_PYRAMID, 0
+	setvar VAR_TEMP_E, 1
+	end
+
+BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
+	setvar VAR_0x8004, 15
+	special sub_81A8E7C
+	setvar VAR_0x8004, 0
+	special sub_81A1780
+	switch VAR_TEMP_0
+	case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
+	case 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66
+	case 2, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 5
+	special sub_81A1780
+	compare VAR_RESULT, 4
+	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
+	compare VAR_RESULT, 5
+	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
+	compare VAR_RESULT, 2
+	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
+	compare VAR_RESULT, 3
+	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
+	compare VAR_RESULT, 9
+	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
+	setvar VAR_0x8004, 14
+	setvar VAR_0x8005, 8
+	special sub_81A1780
+	setvar VAR_TEMP_D, 1
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39
+	setvar VAR_0x8004, 17
+	special sub_81A8E7C
+	end
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42
+BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 4
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	setvar VAR_0x8006, 255
+	special sub_81A8E7C
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66
+BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
+	setvar VAR_0x8004, 13
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A8E7C
+	setvar VAR_0x8004, 14
+	special sub_81A8E7C
+	special HealPlayerParty
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
+	waitstate
+	end
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 1
+	special sub_81A8E7C
+	special SavePlayerParty
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_0x8004, 9
+	special sub_81A8E7C
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	setvar VAR_TEMP_F, 1
+	end
+
+BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA
+	call BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5
+	setvar VAR_TEMP_F, 1
+	end
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5
+	setvar VAR_0x8004, 13
+	setvar VAR_0x8005, 32
+	setvar VAR_0x8006, 0
+	special sub_81A8E7C
+	return
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	addvar VAR_RESULT, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	compare VAR_RESULT, 7
+	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
+	setvar VAR_0x8004, 6
+	special sub_81A8E7C
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_RESULT, 0
+	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
+	waitstate
+	end
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
+	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17
+	waitstate
+	end
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F
+	trainerbattle 9, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
+	setvar VAR_0x8004, 10
+	special sub_81A8E7C
+	waitmessage
+	waitbuttonpress
+	closemessage
+	releaseall
+	end
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A
+	setvar VAR_0x8004, 7
+	special sub_81A8E7C
+	callstd 1
+	compare VAR_0x8007, 0
+	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87
+	setvar VAR_0x8004, 8
+	special sub_81A8E7C
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87:: @ 8252C87
+	end
+
+BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88
+	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252C8D: @ 8252C8D
+	.string "This is a sample message.$"
+
+gText_BattlePyramidConfirmRest:: @ 8252CA7
+	.string "Your BATTLE PYRAMID quest will be\n"
+	.string "saved so that you may quit for now.\l"
+	.string "Is that okay?$"
+
+gText_BattlePyramidConfirmRetire:: @ 8252CFB
+	.string "Are you sure you want to quit your\n"
+	.string "PYRAMID quest?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252D2D:: @ 8252D2D
+	.string "This floor’s exit is in\n"
+	.string "that direction: {UP_ARROW}$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252D57:: @ 8252D57
+	.string "This floor’s exit is in\n"
+	.string "that direction: {LEFT_ARROW}$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252D81:: @ 8252D81
+	.string "This floor’s exit is in\n"
+	.string "that direction: {RIGHT_ARROW}$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252DAB:: @ 8252DAB
+	.string "This floor’s exit is in\n"
+	.string "that direction: {DOWN_ARROW}$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252DD5:: @ 8252DD5
+	.string "The exit on this floor is in\n"
+	.string "the {UP_ARROW} direction.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252E03:: @ 8252E03
+	.string "The exit on this floor is in\n"
+	.string "the {LEFT_ARROW} direction.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252E31:: @ 8252E31
+	.string "The exit on this floor is in\n"
+	.string "the {RIGHT_ARROW} direction.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252E5F:: @ 8252E5F
+	.string "The exit on this floor is in\n"
+	.string "the {DOWN_ARROW} direction.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252E8D:: @ 8252E8D
+	.string "The exit is over\n"
+	.string "that {UP_ARROW} way.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252EAA:: @ 8252EAA
+	.string "The exit is over\n"
+	.string "that {LEFT_ARROW} way.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252EC7:: @ 8252EC7
+	.string "The exit is over\n"
+	.string "that {RIGHT_ARROW} way.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252EE4:: @ 8252EE4
+	.string "The exit is over\n"
+	.string "that {DOWN_ARROW} way.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252F01:: @ 8252F01
+	.string "On this floor, the exit is somewhere\n"
+	.string "in the {UP_ARROW} direction.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252F3A:: @ 8252F3A
+	.string "On this floor, the exit is somewhere\n"
+	.string "in the {LEFT_ARROW} direction.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252F73:: @ 8252F73
+	.string "On this floor, the exit is somewhere\n"
+	.string "in the {RIGHT_ARROW} direction.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252FAC:: @ 8252FAC
+	.string "On this floor, the exit is somewhere\n"
+	.string "in the {DOWN_ARROW} direction.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_252FE5:: @ 8252FE5
+	.string "The exit?\n"
+	.string "It’s that {UP_ARROW} way.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253000:: @ 8253000
+	.string "The exit?\n"
+	.string "It’s that {LEFT_ARROW} way.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25301B:: @ 825301B
+	.string "The exit?\n"
+	.string "It’s that {RIGHT_ARROW} way.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253036:: @ 8253036
+	.string "The exit?\n"
+	.string "It’s that {DOWN_ARROW} way.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253051:: @ 8253051
+	.string "The exit happens to be in\n"
+	.string "the {UP_ARROW} direction.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25307C:: @ 825307C
+	.string "The exit happens to be in\n"
+	.string "the {LEFT_ARROW} direction.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2530A7:: @ 82530A7
+	.string "The exit happens to be in\n"
+	.string "the {RIGHT_ARROW} direction.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2530D2:: @ 82530D2
+	.string "The exit happens to be in\n"
+	.string "the {DOWN_ARROW} direction.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2530FD:: @ 82530FD
+	.string "Are you looking for items?\p"
+	.string "There are eight items left to\n"
+	.string "be found.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253140:: @ 8253140
+	.string "Are you looking for items?\p"
+	.string "There are seven items left to\n"
+	.string "be found.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253183:: @ 8253183
+	.string "Are you looking for items?\p"
+	.string "There are six items left to\n"
+	.string "be found.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2531C4:: @ 82531C4
+	.string "Are you looking for items?\p"
+	.string "There are five items left to\n"
+	.string "be found.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253206:: @ 8253206
+	.string "Are you looking for items?\p"
+	.string "There are four items left to\n"
+	.string "be found.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253248:: @ 8253248
+	.string "Are you looking for items?\p"
+	.string "There are three items left to\n"
+	.string "be found.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25328B:: @ 825328B
+	.string "Are you looking for items?\p"
+	.string "There are two items left to\n"
+	.string "be found.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2532CC:: @ 82532CC
+	.string "Are you looking for items?\p"
+	.string "There is one item left to\n"
+	.string "be found.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25330B:: @ 825330B
+	.string "Are you looking for items?\p"
+	.string "There isn’t anything left to\n"
+	.string "be found!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25334D:: @ 825334D
+	.string "Because you won, I’ll tell you\n"
+	.string "a little secret!\p"
+	.string "There are eight items\n"
+	.string "lying around here.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2533A6:: @ 82533A6
+	.string "Because you won, I’ll tell you\n"
+	.string "a little secret!\p"
+	.string "There are seven items left\n"
+	.string "lying around here.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253404:: @ 8253404
+	.string "Because you won, I’ll tell you\n"
+	.string "a little secret!\p"
+	.string "There are six items left\n"
+	.string "lying around here.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253460:: @ 8253460
+	.string "Because you won, I’ll tell you\n"
+	.string "a little secret!\p"
+	.string "There are five items left\n"
+	.string "lying around here.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2534BD:: @ 82534BD
+	.string "Because you won, I’ll tell you\n"
+	.string "a little secret!\p"
+	.string "There are four items left\n"
+	.string "lying around here.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25351A:: @ 825351A
+	.string "Because you won, I’ll tell you\n"
+	.string "a little secret!\p"
+	.string "There are three items left\n"
+	.string "lying around here.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253578:: @ 8253578
+	.string "Because you won, I’ll tell you\n"
+	.string "a little secret!\p"
+	.string "There are two items left\n"
+	.string "lying around here.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2535D4:: @ 82535D4
+	.string "Because you won, I’ll tell you\n"
+	.string "a little secret!\p"
+	.string "There is just one item\n"
+	.string "lying around here.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25362E:: @ 825362E
+	.string "Because you won, I’ll tell you\n"
+	.string "a little secret!\p"
+	.string "There isn’t anything left\n"
+	.string "lying around here.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25368B:: @ 825368B
+	.string "How’s your stock of items holding up?\p"
+	.string "I reckon there are eight items left\n"
+	.string "waiting to be found on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2536F8:: @ 82536F8
+	.string "How’s your stock of items holding up?\p"
+	.string "I reckon there are seven items left\n"
+	.string "waiting to be found on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253765:: @ 8253765
+	.string "How’s your stock of items holding up?\p"
+	.string "I reckon there are six items left\n"
+	.string "waiting to be found on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2537D0:: @ 82537D0
+	.string "How’s your stock of items holding up?\p"
+	.string "I reckon there are five items left\n"
+	.string "waiting to be found on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25383C:: @ 825383C
+	.string "How’s your stock of items holding up?\p"
+	.string "I reckon there are four items left\n"
+	.string "waiting to be found on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2538A8:: @ 82538A8
+	.string "How’s your stock of items holding up?\p"
+	.string "I reckon there are three items left\n"
+	.string "waiting to be found on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253915:: @ 8253915
+	.string "How’s your stock of items holding up?\p"
+	.string "I reckon there are two items left\n"
+	.string "waiting to be found on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253980:: @ 8253980
+	.string "How’s your stock of items holding up?\p"
+	.string "I reckon there’s but one item left\n"
+	.string "waiting to be found on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2539EC:: @ 82539EC
+	.string "How’s your stock of items holding up?\p"
+	.string "I reckon there are no more items\n"
+	.string "waiting to be found on this floor.\l"
+	.string "You take care now!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253A69:: @ 8253A69
+	.string "You’re strong, so you’ve earned\n"
+	.string "a hint!\p"
+	.string "There appear to be eight more\n"
+	.string "items on the ground.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253AC4:: @ 8253AC4
+	.string "You’re strong, so you’ve earned\n"
+	.string "a hint!\p"
+	.string "There appear to be seven more\n"
+	.string "items on the ground.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253B1F:: @ 8253B1F
+	.string "You’re strong, so you’ve earned\n"
+	.string "a hint!\p"
+	.string "There appear to be six more\n"
+	.string "items on the ground.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253B78:: @ 8253B78
+	.string "You’re strong, so you’ve earned\n"
+	.string "a hint!\p"
+	.string "There appear to be five more\n"
+	.string "items on the ground.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253BD2:: @ 8253BD2
+	.string "You’re strong, so you’ve earned\n"
+	.string "a hint!\p"
+	.string "There appear to be four more\n"
+	.string "items on the ground.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253C2C:: @ 8253C2C
+	.string "You’re strong, so you’ve earned\n"
+	.string "a hint!\p"
+	.string "There appear to be three more\n"
+	.string "items on the ground.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253C87:: @ 8253C87
+	.string "You’re strong, so you’ve earned\n"
+	.string "a hint!\p"
+	.string "There appear to be two more\n"
+	.string "items on the ground.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253CE0:: @ 8253CE0
+	.string "You’re strong, so you’ve earned\n"
+	.string "a hint!\p"
+	.string "There appears to be only one more\n"
+	.string "item on the ground.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253D3E:: @ 8253D3E
+	.string "You’re strong, so you’ve earned\n"
+	.string "a hint!\p"
+	.string "There appear to be no more\n"
+	.string "items on the ground.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253D96:: @ 8253D96
+	.string "On this floor of the PYRAMID,\n"
+	.string "I hear there are eight items…$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253DD2:: @ 8253DD2
+	.string "On this floor of the PYRAMID,\n"
+	.string "I hear there are seven items…$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253E0E:: @ 8253E0E
+	.string "On this floor of the PYRAMID,\n"
+	.string "I hear there are six items…$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253E48:: @ 8253E48
+	.string "On this floor of the PYRAMID,\n"
+	.string "I hear there are five items…$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253E83:: @ 8253E83
+	.string "On this floor of the PYRAMID,\n"
+	.string "I hear there are four items…$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253EBE:: @ 8253EBE
+	.string "On this floor of the PYRAMID,\n"
+	.string "I hear there are three items…$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253EFA:: @ 8253EFA
+	.string "On this floor of the PYRAMID,\n"
+	.string "I hear there are two items…$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253F34:: @ 8253F34
+	.string "On this floor of the PYRAMID,\n"
+	.string "I hear there is one item…$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253F6C:: @ 8253F6C
+	.string "On this floor of the PYRAMID,\n"
+	.string "I hear there are no items…$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253FA5:: @ 8253FA5
+	.string "Have you collected any items?\p"
+	.string "I believe there are eight more\n"
+	.string "items on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_253FF7:: @ 8253FF7
+	.string "Have you collected any items?\p"
+	.string "I believe there are seven more\n"
+	.string "items on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254049:: @ 8254049
+	.string "Have you collected any items?\p"
+	.string "I believe there are six more\n"
+	.string "items on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254099:: @ 8254099
+	.string "Have you collected any items?\p"
+	.string "I believe there are five more\n"
+	.string "items on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2540EA:: @ 82540EA
+	.string "Have you collected any items?\p"
+	.string "I believe there are four more\n"
+	.string "items on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25413B:: @ 825413B
+	.string "Have you collected any items?\p"
+	.string "I believe there are three more\n"
+	.string "items on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25418D:: @ 825418D
+	.string "Have you collected any items?\p"
+	.string "I believe there are two more\n"
+	.string "items on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2541DD:: @ 82541DD
+	.string "Have you collected any items?\p"
+	.string "I believe there is one more\n"
+	.string "item on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25422B:: @ 825422B
+	.string "Have you collected any items?\p"
+	.string "I believe there are no more\n"
+	.string "items on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25427A:: @ 825427A
+	.string "You were really awesome!\p"
+	.string "But there are still seven tough\n"
+	.string "TRAINERS other than me!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2542CB:: @ 82542CB
+	.string "You were really awesome!\p"
+	.string "But there are still six tough\n"
+	.string "TRAINERS other than me!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25431A:: @ 825431A
+	.string "You were really awesome!\p"
+	.string "But there are still five tough\n"
+	.string "TRAINERS other than me!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25436A:: @ 825436A
+	.string "You were really awesome!\p"
+	.string "But there are still four tough\n"
+	.string "TRAINERS other than me!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2543BA:: @ 82543BA
+	.string "You were really awesome!\p"
+	.string "But there are still three tough\n"
+	.string "TRAINERS other than me!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25440B:: @ 825440B
+	.string "You were really awesome!\p"
+	.string "But there are still two tough\n"
+	.string "TRAINERS other than me!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25445A:: @ 825445A
+	.string "You were really awesome!\p"
+	.string "But there’s still one tough\n"
+	.string "TRAINER other than me!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2544A6:: @ 82544A6
+	.string "You were really awesome!\p"
+	.string "There’s no one left that\n"
+	.string "can beat you!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2544E6:: @ 82544E6
+	.string "This is so upsetting!\p"
+	.string "But there are seven TRAINERS left!\n"
+	.string "Someone will humble you!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254538:: @ 8254538
+	.string "This is so upsetting!\p"
+	.string "But there are six TRAINERS left!\n"
+	.string "Someone will humble you!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254588:: @ 8254588
+	.string "This is so upsetting!\p"
+	.string "But there are five TRAINERS left!\n"
+	.string "Someone will humble you!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2545D9:: @ 82545D9
+	.string "This is so upsetting!\p"
+	.string "But there are four TRAINERS left!\n"
+	.string "Someone will humble you!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25462A:: @ 825462A
+	.string "This is so upsetting!\p"
+	.string "But there are three TRAINERS left!\n"
+	.string "Someone will humble you!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25467C:: @ 825467C
+	.string "This is so upsetting!\p"
+	.string "But there are two TRAINERS left!\n"
+	.string "Someone will humble you!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2546CC:: @ 82546CC
+	.string "This is so upsetting!\p"
+	.string "But there’s one TRAINER left!\n"
+	.string "I’m sure you will be humbled!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25471E:: @ 825471E
+	.string "This is so upsetting!\p"
+	.string "But there are no more TRAINERS\n"
+	.string "who can engage you!$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254767:: @ 8254767
+	.string "That’s pretty impressive!\p"
+	.string "But there are seven more TRAINERS\n"
+	.string "on this floor. Can you beat them all?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2547C9:: @ 82547C9
+	.string "That’s pretty impressive!\p"
+	.string "But there are six more TRAINERS\n"
+	.string "on this floor. Can you beat them all?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254829:: @ 8254829
+	.string "That’s pretty impressive!\p"
+	.string "But there are five more TRAINERS\n"
+	.string "on this floor. Can you beat them all?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25488A:: @ 825488A
+	.string "That’s pretty impressive!\p"
+	.string "But there are four more TRAINERS\n"
+	.string "on this floor. Can you beat them all?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2548EB:: @ 82548EB
+	.string "That’s pretty impressive!\p"
+	.string "But there are three more TRAINERS\n"
+	.string "on this floor. Can you beat them all?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25494D:: @ 825494D
+	.string "That’s pretty impressive!\p"
+	.string "But there are two more TRAINERS\n"
+	.string "on this floor. Can you beat them both?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_2549AE:: @ 82549AE
+	.string "That’s pretty impressive!\p"
+	.string "But there’s still one more TRAINER\n"
+	.string "on this floor. Can you prevail?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254A0B:: @ 8254A0B
+	.string "That’s pretty impressive!\p"
+	.string "You’ve gone through all the TRAINERS\n"
+	.string "on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254A59:: @ 8254A59
+	.string "Maybe you could sweep through\n"
+	.string "the seven TRAINERS left on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254A9E:: @ 8254A9E
+	.string "Maybe you could sweep through\n"
+	.string "the six TRAINERS left on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254AE1:: @ 8254AE1
+	.string "Maybe you could sweep through\n"
+	.string "the five TRAINERS left on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254B25:: @ 8254B25
+	.string "Maybe you could sweep through\n"
+	.string "the four TRAINERS left on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254B69:: @ 8254B69
+	.string "Maybe you could sweep through\n"
+	.string "the three TRAINERS left on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254BAE:: @ 8254BAE
+	.string "Maybe you could sweep through\n"
+	.string "the two TRAINERS left on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254BF1:: @ 8254BF1
+	.string "Maybe you could complete your sweep\n"
+	.string "with the one TRAINER left on this floor.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254C3E:: @ 8254C3E
+	.string "There isn’t a single person left who\n"
+	.string "can defeat you now…$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254C77:: @ 8254C77
+	.string "You may have what it takes to beat\n"
+	.string "the seven expert TRAINERS who remain.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254CC0:: @ 8254CC0
+	.string "You may have what it takes to beat\n"
+	.string "the six expert TRAINERS who remain.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254D07:: @ 8254D07
+	.string "You may have what it takes to beat\n"
+	.string "the five expert TRAINERS who remain.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254D4F:: @ 8254D4F
+	.string "You may have what it takes to beat\n"
+	.string "the four expert TRAINERS who remain.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254D97:: @ 8254D97
+	.string "You may have what it takes to beat\n"
+	.string "the three expert TRAINERS who remain.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254DE0:: @ 8254DE0
+	.string "You may have what it takes to beat\n"
+	.string "the two expert TRAINERS who remain.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254E27:: @ 8254E27
+	.string "You may have what it takes to beat\n"
+	.string "the one expert TRAINER who remains.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254E6E:: @ 8254E6E
+	.string "Your skills are beyond reproach.\p"
+	.string "There are no more TRAINERS here\n"
+	.string "who have any chance of beating you.$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254ED3:: @ 8254ED3
+	.string "Can you keep winning against\n"
+	.string "the seven remaining TRAINERS?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254F0E:: @ 8254F0E
+	.string "Can you keep winning against\n"
+	.string "the six remaining TRAINERS?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254F47:: @ 8254F47
+	.string "Can you keep winning against\n"
+	.string "the five remaining TRAINERS?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254F81:: @ 8254F81
+	.string "Can you keep winning against\n"
+	.string "the four remaining TRAINERS?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254FBB:: @ 8254FBB
+	.string "Can you keep winning against\n"
+	.string "the three remaining TRAINERS?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_254FF6:: @ 8254FF6
+	.string "Can you keep winning against\n"
+	.string "the two remaining TRAINERS?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_25502F:: @ 825502F
+	.string "Can you keep winning against\n"
+	.string "the last remaining TRAINER?$"
+
+BattleFrontier_BattlePyramidEmptySquare_Text_255068:: @ 8255068
+	.string "There aren’t any TRAINERS left that\n"
+	.string "can take you on now…$"
+
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc
new file mode 100644
index 000000000..28b5f5c61
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc
@@ -0,0 +1,16 @@
+BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598
+	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, 8, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0
+	object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, 9, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 15, 4, 2, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0
+	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, 2, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0
+
+BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8
+	warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600
+	bg_event 5, 12, 0, 1, 0, BattleFrontier_BattlePyramidLobby_EventScript_250D42
+	bg_event 1, 12, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E95
+
+BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618
+	map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents
+
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
index ab9d35d81..ed68e86c7 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePyramidLobby: @ 84853F8
-	.4byte BattleFrontier_BattlePyramidLobby_MapAttributes
+	.4byte BattleFrontier_BattlePyramidLobby_Layout
 	.4byte BattleFrontier_BattlePyramidLobby_MapEvents
 	.4byte BattleFrontier_BattlePyramidLobby_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
new file mode 100644
index 000000000..07b9fee47
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
@@ -0,0 +1,970 @@
+BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716
+	map_script 2, BattleFrontier_BattlePyramidLobby_MapScript2_250735
+	map_script 4, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB
+	.byte 0
+
+BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidLobby_EventScript_25072B
+	.2byte 0
+
+BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePyramidLobby_EventScript_25075F
+	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePyramidLobby_EventScript_250768
+	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePyramidLobby_EventScript_2508AC
+	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePyramidLobby_EventScript_2507B1
+	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePyramidLobby_EventScript_250852
+	.2byte 0
+
+BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F
+	setvar VAR_0x8004, 0
+	special sub_81A1780
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
+	lockall
+	message BattleFrontier_BattlePyramidLobby_Text_2516D6
+	waitmessage
+	playse SE_EXPMAX
+	waitse
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_81A8E7C
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 0
+	special sub_81A8E7C
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1
+	lockall
+	setvar VAR_0x8004, 10
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, 4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA
+
+BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, 4
+
+BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
+	special sub_81B95E0
+	compare VAR_RESULT, 1
+	call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB
+	clearflag FLAG_SPECIAL_FLAG_0x4004
+	setvar VAR_0x8004, 8
+	special sub_81A1780
+	special LoadPlayerParty
+	setvar VAR_0x8004, 14
+	special sub_81A8E7C
+	special HealPlayerParty
+	message BattleFrontier_BattlePyramidLobby_Text_2519F8
+	waitmessage
+	playse SE_EXPMAX
+	waitse
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252662, 4
+	setvar VAR_0x8004, 11
+	special sub_81A1780
+	msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9
+	message BattleFrontier_BattlePyramidLobby_Text_251A77
+	waitmessage
+	setvar VAR_0x8004, 4
+	special sub_81A8E7C
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 0
+	special sub_81A8E7C
+	playse SE_SAVE
+	waitse
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
+	setvar VAR_0x8004, 8
+	special sub_81A1780
+	special LoadPlayerParty
+	setvar VAR_0x8004, 14
+	special sub_81A8E7C
+	special HealPlayerParty
+	lockall
+	message BattleFrontier_BattlePyramidLobby_Text_251B5A
+	waitmessage
+	playse SE_EXPMAX
+	waitse
+	message BattleFrontier_BattlePyramidLobby_Text_251A77
+	waitmessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 0
+	special sub_81A8E7C
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 0
+	special sub_81A8E7C
+	playse SE_SAVE
+	waitse
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_2508AC:: @ 82508AC
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250A21
+
+BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1
+	lock
+	faceplayer
+	setvar VAR_FRONTIER_FACILITY, 6
+	setvar VAR_0x40CE, 0
+	special SavePlayerParty
+	msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, 4
+
+BattleFrontier_BattlePyramidLobby_EventScript_2508C8:: @ 82508C8
+	message BattleFrontier_BattlePyramidLobby_Text_250FA7
+	waitmessage
+	multichoice 17, 6, 23, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250904
+	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A68
+	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
+	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
+
+BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
+	message BattleFrontier_BattlePyramidLobby_Text_251248
+	waitmessage
+	multichoice 17, 6, 24, 0
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
+	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
+	setvar VAR_0x8004, 15
+	special sub_81A1780
+	compare VAR_0x8004, 1
+	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251297, 4
+	fadescreen 1
+	call BattleFrontier_BattlePyramidLobby_EventScript_23F2B7
+	copyvar VAR_0x8004, VAR_RESULT
+	setvar VAR_0x8005, 3
+	special sub_80F9490
+	waitstate
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250AC1
+	case 1, BattleFrontier_BattlePyramidLobby_EventScript_2509A5
+	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC1
+
+BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
+	setvar VAR_TEMP_0, 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	special sub_81A1780
+	setvar VAR_0x8004, 0
+	special sub_81A8E7C
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 1
+	special sub_81A8E7C
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_0x8004, 6
+	special sub_81A8E7C
+	setvar VAR_0x8004, 9
+	special sub_81A8E7C
+	special LoadPlayerParty
+	closemessage
+	delay 2
+	call BattleFrontier_BattlePyramidLobby_EventScript_27134F
+	setvar VAR_TEMP_0, 255
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA
+
+BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21
+	special SavePlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251531, 4
+	closemessage
+	call BattleFrontier_BattlePyramidLobby_EventScript_250D56
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_RESULT, 0
+	special HealPlayerParty
+	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
+	setvar VAR_TEMP_0, 0
+	waitstate
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250A68:: @ 8250A68
+	msgbox BattleFrontier_BattlePyramidLobby_Text_25100C, 4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_2508C8
+
+BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250A90
+	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A9D
+
+BattleFrontier_BattlePyramidLobby_EventScript_250A90:: @ 8250A90
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, 4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC
+
+BattleFrontier_BattlePyramidLobby_EventScript_250A9D:: @ 8250A9D
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2512E2, 4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC
+
+BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250AC4
+
+BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1
+	special LoadPlayerParty
+
+BattleFrontier_BattlePyramidLobby_EventScript_250AC4:: @ 8250AC4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, 4
+
+BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC
+	release
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE
+	lockall
+	applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E
+	waitmovement 0
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, 4
+	call BattleFrontier_BattlePyramidLobby_EventScript_250AF0
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252461, 4
+	releaseall
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250AF0:: @ 8250AF0
+	multichoice 17, 6, 24, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250B28
+	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250B66
+	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250B27
+	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250B27
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 5
+	special sub_81A8E7C
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B53
+	setvar VAR_RESULT, 0
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 3
+	special sub_81A8E7C
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 6
+	special sub_81A8E7C
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B91
+	setvar VAR_RESULT, 0
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 4
+	special sub_81A8E7C
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250BA4:: @ 8250BA4
+	copyvar VAR_0x8004, VAR_RESULT
+	special sub_813B968
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250C8E
+	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250C97
+	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250CA0
+	case 3, BattleFrontier_BattlePyramidLobby_EventScript_250CA9
+	case 4, BattleFrontier_BattlePyramidLobby_EventScript_250CB2
+	case 5, BattleFrontier_BattlePyramidLobby_EventScript_250CBB
+	case 6, BattleFrontier_BattlePyramidLobby_EventScript_250CC4
+	case 7, BattleFrontier_BattlePyramidLobby_EventScript_250CCD
+	case 8, BattleFrontier_BattlePyramidLobby_EventScript_250CD6
+	case 9, BattleFrontier_BattlePyramidLobby_EventScript_250CDF
+	case 10, BattleFrontier_BattlePyramidLobby_EventScript_250CE8
+	case 11, BattleFrontier_BattlePyramidLobby_EventScript_250CF1
+	case 12, BattleFrontier_BattlePyramidLobby_EventScript_250CFA
+	case 13, BattleFrontier_BattlePyramidLobby_EventScript_250D03
+	case 14, BattleFrontier_BattlePyramidLobby_EventScript_250D0C
+	case 15, BattleFrontier_BattlePyramidLobby_EventScript_250D15
+	case 16, BattleFrontier_BattlePyramidLobby_EventScript_250D1E
+	case 17, BattleFrontier_BattlePyramidLobby_EventScript_250D27
+	case 18, BattleFrontier_BattlePyramidLobby_EventScript_250D30
+	case 19, BattleFrontier_BattlePyramidLobby_EventScript_250D39
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250C8E:: @ 8250C8E
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251CB3, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250C97:: @ 8250C97
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251D07, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250CA0:: @ 8250CA0
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251D54, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250CA9:: @ 8250CA9
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251D9C, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250CB2:: @ 8250CB2
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251E3D, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250CBB:: @ 8250CBB
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251EA1, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250CC4:: @ 8250CC4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251F17, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250CCD:: @ 8250CCD
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251F6E, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250CD6:: @ 8250CD6
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251FC7, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250CDF:: @ 8250CDF
+	msgbox BattleFrontier_BattlePyramidLobby_Text_25201B, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250CE8:: @ 8250CE8
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252068, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250CF1:: @ 8250CF1
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2520BA, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250CFA:: @ 8250CFA
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252158, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250D03:: @ 8250D03
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2521B4, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250D0C:: @ 8250D0C
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252206, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250D15:: @ 8250D15
+	msgbox BattleFrontier_BattlePyramidLobby_Text_25225A, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250D1E:: @ 8250D1E
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2522AE, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250D27:: @ 8250D27
+	msgbox BattleFrontier_BattlePyramidLobby_Text_25230B, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250D30:: @ 8250D30
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252364, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250D39:: @ 8250D39
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252403, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 6
+	special sub_81A1780
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56
+	applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4
+	applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DCD
+	waitmovement 0
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251569, 4
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	special sub_81A8E7C
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, 4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C
+
+BattleFrontier_BattlePyramidLobby_EventScript_250D94:: @ 8250D94
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, 4
+
+BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C
+	message BattleFrontier_BattlePyramidLobby_Text_25161E
+	waitmessage
+	playse SE_EXPMAX
+	waitse
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251647, 4
+	closemessage
+	applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5
+	waitmovement 0
+	applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DD8
+	waitmovement 0
+	return
+
+BattleFrontier_BattlePyramidLobby_Movement_250DC4: @ 8250DC4
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	face_down
+	step_end
+
+BattleFrontier_BattlePyramidLobby_Movement_250DCD: @ 8250DCD
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattlePyramidLobby_Movement_250DD5: @ 8250DD5
+	walk_right
+	face_left
+	step_end
+
+BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, 4
+	setflag FLAG_SPECIAL_FLAG_0x4004
+	special sub_81C6A94
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00
+	message BattleFrontier_BattlePyramidLobby_Text_2518C6
+	waitmessage
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250E09
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250E00:: @ 8250E00
+	msgbox BattleFrontier_BattlePyramidLobby_Text_251881, 4
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250E09:: @ 8250E09
+	multichoice 17, 6, 83, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250E40
+	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250E50
+	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250E60
+	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250E60
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250E40:: @ 8250E40
+	special sub_81C4F24
+	waitstate
+	message BattleFrontier_BattlePyramidLobby_Text_25197E
+	waitmessage
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250E09
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50
+	special sub_81B9620
+	waitstate
+	message BattleFrontier_BattlePyramidLobby_Text_25197E
+	waitmessage
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250E09
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60
+	special sub_81B95E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F
+	return
+
+BattleFrontier_BattlePyramidLobby_EventScript_250E6F:: @ 8250E6F
+	msgbox BattleFrontier_BattlePyramidLobby_Text_25194F, 4
+	message BattleFrontier_BattlePyramidLobby_Text_25197E
+	waitmessage
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250E09
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250E83:: @ 8250E83
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2524DA, 2
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250E8C:: @ 8250E8C
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252595, 2
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250E95:: @ 8250E95
+	lockall
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2526B6, 4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250EA4:: @ 8250EA4
+	message BattleFrontier_BattlePyramidLobby_Text_2526D9
+	waitmessage
+	multichoice 15, 2, 101, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250EF7
+	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250F05
+	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250F13
+	case 3, BattleFrontier_BattlePyramidLobby_EventScript_250F21
+	case 4, BattleFrontier_BattlePyramidLobby_EventScript_250F2F
+	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250F2F
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250EF7:: @ 8250EF7
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2526FC, 4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250F05:: @ 8250F05
+	msgbox BattleFrontier_BattlePyramidLobby_Text_2527A9, 4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250F13:: @ 8250F13
+	msgbox BattleFrontier_BattlePyramidLobby_Text_25285A, 4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250F21:: @ 8250F21
+	msgbox BattleFrontier_BattlePyramidLobby_Text_252924, 4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
+	end
+
+BattleFrontier_BattlePyramidLobby_EventScript_250F2F:: @ 8250F2F
+	releaseall
+	end
+
+BattleFrontier_BattlePyramidLobby_Text_250F31: @ 8250F31
+	.string "Where the courage of TRAINERS\n"
+	.string "is put to the test!\p"
+	.string "Welcome to the BATTLE PYRAMID!\p"
+	.string "I am your guide to\n"
+	.string "the Battle Quest.$"
+
+BattleFrontier_BattlePyramidLobby_Text_250FA7: @ 8250FA7
+	.string "Have you the courage to embark on\n"
+	.string "the Battle Quest challenge?$"
+
+BattleFrontier_BattlePyramidLobby_Text_250FE5: @ 8250FE5
+	.string "We await your challenge in the future!$"
+
+BattleFrontier_BattlePyramidLobby_Text_25100C: @ 825100C
+	.string "The Battle Quest is a battling\n"
+	.string "event in which you must explore\l"
+	.string "the PYRAMID and try to reach the top.\p"
+	.string "In the PYRAMID are seven floors of\n"
+	.string "mazes, all of them filled with not only\l"
+	.string "skilled TRAINERS but also wild POKéMON.\p"
+	.string "You must enter with three POKéMON,\n"
+	.string "none of them holding an item.\p"
+	.string "On your ascent, you will be provided\n"
+	.string "with a BATTLE BAG for items.\p"
+	.string "If you fail in your challenge, any item\n"
+	.string "placed in the BATTLE BAG disappears.\p"
+	.string "If you want to interrupt your\n"
+	.string "challenge, you must select “REST”\l"
+	.string "and save the game.\p"
+	.string "If you don’t save before interrupting,\n"
+	.string "you will be disqualified.$"
+
+BattleFrontier_BattlePyramidLobby_Text_251248: @ 8251248
+	.string "The PYRAMID offers two courses,\n"
+	.string "Level 50 and Open Level.\l"
+	.string "Which will you enter?$"
+
+BattleFrontier_BattlePyramidLobby_Text_251297: @ 8251297
+	.string "Very good. Now, please select the three\n"
+	.string "POKéMON you wish to accompany you.$"
+
+BattleFrontier_BattlePyramidLobby_Text_2512E2: @ 82512E2
+	.string "A slight problem, adventurer!\p"
+	.string "You seem to not have the three\n"
+	.string "POKéMON qualified for the challenge.\p"
+	.string "Please also remember to take all\n"
+	.string "items from your POKéMON.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "When you are ready, please have\n"
+	.string "a word with me.$"
+
+BattleFrontier_BattlePyramidLobby_Text_2513C1: @ 82513C1
+	.string "A slight problem, adventurer!\p"
+	.string "You seem to not have the three\n"
+	.string "POKéMON qualified for the challenge.\p"
+	.string "The three POKéMON must be different\n"
+	.string "and each no higher than Level 50.\p"
+	.string "Please also remember to take all\n"
+	.string "items from your POKéMON.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "When you are ready, please have\n"
+	.string "a word with me.$"
+
+BattleFrontier_BattlePyramidLobby_Text_2514E6: @ 82514E6
+	.string "Before you enter the BATTLE PYRAMID,\n"
+	.string "the game must be saved. Is that okay?$"
+
+BattleFrontier_BattlePyramidLobby_Text_251531: @ 8251531
+	.string "Very good. I will now show you into\n"
+	.string "the BATTLE PYRAMID.$"
+
+BattleFrontier_BattlePyramidLobby_Text_251569: @ 8251569
+	.string "We will hold your BAG for safekeeping,\n"
+	.string "{PLAYER}, while you are exploring.$"
+
+BattleFrontier_BattlePyramidLobby_Text_2515AD: @ 82515AD
+	.string "In exchange, please take this BATTLE\n"
+	.string "BAG, the one you used previously.$"
+
+BattleFrontier_BattlePyramidLobby_Text_2515F4: @ 82515F4
+	.string "In exchange, please take this\n"
+	.string "BATTLE BAG.$"
+
+BattleFrontier_BattlePyramidLobby_Text_25161E: @ 825161E
+	.string "{PLAYER} exchanged the BAG for\n"
+	.string "the BATTLE BAG.$"
+
+BattleFrontier_BattlePyramidLobby_Text_251647: @ 8251647
+	.string "When you step on this floor panel,\n"
+	.string "you will be transported to a higher\l"
+	.string "floor in the PYRAMID.\p"
+	.string "I hope for your sake that your\n"
+	.string "quest goes safely!$"
+
+BattleFrontier_BattlePyramidLobby_Text_2516D6: @ 82516D6
+	.string "A major problem, explorer!\p"
+	.string "You did not save before ending\n"
+	.string "your challenge the last time.\p"
+	.string "Consequently, your challenge has\n"
+	.string "been disqualified, I’m sorry to say.\p"
+	.string "Here is the BAG we’ve been holding\n"
+	.string "for you.\p"
+	.string "{PLAYER} got the BAG back.$"
+
+BattleFrontier_BattlePyramidLobby_Text_2517B5: @ 82517B5
+	.string "Excellent to see you back!\p"
+	.string "You’ve conquered the PYRAMID!\n"
+	.string "How splendid!$"
+
+BattleFrontier_BattlePyramidLobby_Text_2517FC: @ 82517FC
+	.string "Ah, a slight problem.\p"
+	.string "At least one POKéMON is holding\n"
+	.string "an item.\p"
+	.string "I’m sorry to say, items obtained in\n"
+	.string "the PYRAMID cannot be taken away.$"
+
+BattleFrontier_BattlePyramidLobby_Text_251881: @ 8251881
+	.string "All items held by your POKéMON will be\n"
+	.string "moved to your BATTLE BAG, {PLAYER}.$"
+
+BattleFrontier_BattlePyramidLobby_Text_2518C6: @ 82518C6
+	.string "The BATTLE BAG cannot hold all your\n"
+	.string "items, I’m sorry to say.\p"
+	.string "Please pick the items you’ll keep in the\n"
+	.string "BATTLE BAG, and with your POKéMON.$"
+
+BattleFrontier_BattlePyramidLobby_Text_25194F: @ 825194F
+	.string "At least one POKéMON is still\n"
+	.string "holding an item.$"
+
+BattleFrontier_BattlePyramidLobby_Text_25197E: @ 825197E
+	.string "Please pick the items you’ll keep in the\n"
+	.string "BATTLE BAG, and with your POKéMON.$"
+
+BattleFrontier_BattlePyramidLobby_Text_2519CA: @ 82519CA
+	.string "{PLAYER} returned everything that\n"
+	.string "the POKéMON held.$"
+
+BattleFrontier_BattlePyramidLobby_Text_2519F8: @ 82519F8
+	.string "The BATTLE BAG you used will be kept\n"
+	.string "in readiness for your next challenge.\p"
+	.string "{PLAYER} turned the BATTLE BAG over\n"
+	.string "for the BAG’s return.$"
+
+BattleFrontier_BattlePyramidLobby_Text_251A77: @ 8251A77
+	.string "I must record your results.\n"
+	.string "Please wait.$"
+
+BattleFrontier_BattlePyramidLobby_Text_251AA0: @ 8251AA0
+	.string "As a memento for conquering\n"
+	.string "the BATTLE PYRAMID, please take this.$"
+
+BattleFrontier_BattlePyramidLobby_Text_251AE2: @ 8251AE2
+	.string "{PLAYER} received the prize\n"
+	.string "{STR_VAR_1}.$"
+
+BattleFrontier_BattlePyramidLobby_Text_251AFC: @ 8251AFC
+	.string "…Ah…\n"
+	.string "Your BAG appears to be filled.\p"
+	.string "Please return after you’ve organized\n"
+	.string "your BAG’s contents.$"
+
+BattleFrontier_BattlePyramidLobby_Text_251B5A: @ 8251B5A
+	.string "How disappointing for you…\p"
+	.string "Here is the BAG we’ve been holding\n"
+	.string "for you.\p"
+	.string "{PLAYER} got the BAG back.$"
+
+BattleFrontier_BattlePyramidLobby_Text_251BB6: @ 8251BB6
+	.string "We look forward to your\n"
+	.string "next challenge!$"
+
+BattleFrontier_BattlePyramidLobby_Text_251BDE: @ 8251BDE
+	.string "We have been looking forward to\n"
+	.string "your arrival!\p"
+	.string "Here is your prize for conquering\n"
+	.string "the PYRAMID.$"
+
+BattleFrontier_BattlePyramidLobby_Text_251C3B: @ 8251C3B
+	.string "Welcome…\p"
+	.string "I shall be pleased to tell you what\n"
+	.string "misfortunes await in the PYRAMID…$"
+
+BattleFrontier_BattlePyramidLobby_Text_251C8A: @ 8251C8A
+	.string "… … … … … …\n"
+	.string "… … … … … …\p"
+	.string "… … … … … …\n"
+	.string "Aah!$"
+
+BattleFrontier_BattlePyramidLobby_Text_251CB3: @ 8251CB3
+	.string "I see a shower of sparks…\p"
+	.string "…And in it, I see your POKéMON\n"
+	.string "struggling with paralysis…$"
+
+BattleFrontier_BattlePyramidLobby_Text_251D07: @ 8251D07
+	.string "I see poison…\p"
+	.string "…And, I see your POKéMON suffering\n"
+	.string "from the effects of poison…$"
+
+BattleFrontier_BattlePyramidLobby_Text_251D54: @ 8251D54
+	.string "I see bright red flames…\p"
+	.string "…And, I see your POKéMON suffering\n"
+	.string "from burns…$"
+
+BattleFrontier_BattlePyramidLobby_Text_251D9C: @ 8251D9C
+	.string "I sense the tremendous pressure of\n"
+	.string "unrequited anger…\p"
+	.string "It is a curse…\p"
+	.string "…And, I see your POKéMON drained of\n"
+	.string "Power Points and having no recourse\l"
+	.string "but to use STRUGGLE…$"
+
+BattleFrontier_BattlePyramidLobby_Text_251E3D: @ 8251E3D
+	.string "I see POKéMON loftily airborne…\p"
+	.string "…And, I see your POKéMON frustrated\n"
+	.string "by powerless GROUND-type moves…$"
+
+BattleFrontier_BattlePyramidLobby_Text_251EA1: @ 8251EA1
+	.string "I sense terrific energy rising from\n"
+	.string "the ground below…\p"
+	.string "…And, I see your POKéMON unable to\n"
+	.string "escape the power’s clutches…$"
+
+BattleFrontier_BattlePyramidLobby_Text_251F17: @ 8251F17
+	.string "I see ICE-type POKéMON…\p"
+	.string "…And, I see your POKéMON fighting\n"
+	.string "the freezing effects of ice…$"
+
+BattleFrontier_BattlePyramidLobby_Text_251F6E: @ 8251F6E
+	.string "I see a flurry of moves that imperil\n"
+	.string "the user…\p"
+	.string "…And, I see your POKéMON falling\n"
+	.string "to them…$"
+
+BattleFrontier_BattlePyramidLobby_Text_251FC7: @ 8251FC7
+	.string "I see PSYCHIC-type POKéMON…\p"
+	.string "…And, I see your POKéMON in torment\n"
+	.string "from PSYCHIC moves…$"
+
+BattleFrontier_BattlePyramidLobby_Text_25201B: @ 825201B
+	.string "I see ROCK-type POKéMON…\p"
+	.string "…And, I see your POKéMON suffering\n"
+	.string "from ROCK moves…$"
+
+BattleFrontier_BattlePyramidLobby_Text_252068: @ 8252068
+	.string "I see FIGHTING-type POKéMON…\p"
+	.string "…And, I see your POKéMON pummeled\n"
+	.string "by FIGHTING moves…$"
+
+BattleFrontier_BattlePyramidLobby_Text_2520BA: @ 82520BA
+	.string "RAIN DANCE… SUNNY DAY…\n"
+	.string "SANDSTORM… HAIL…\p"
+	.string "I see POKéMON that become stronger\n"
+	.string "with the weather…\p"
+	.string "…And, I see your POKéMON confounded\n"
+	.string "by different types of moves…$"
+
+BattleFrontier_BattlePyramidLobby_Text_252158: @ 8252158
+	.string "I see BUG-type POKéMON…\p"
+	.string "…And, I see your POKéMON suffering\n"
+	.string "from different kinds of attacks…$"
+
+BattleFrontier_BattlePyramidLobby_Text_2521B4: @ 82521B4
+	.string "I see DARK-type POKéMON…\p"
+	.string "…And, I see your POKéMON suffering\n"
+	.string "from DARK-type moves…$"
+
+BattleFrontier_BattlePyramidLobby_Text_252206: @ 8252206
+	.string "I see WATER-type POKéMON…\p"
+	.string "…And, I see your POKéMON suffering\n"
+	.string "from WATER-type moves…$"
+
+BattleFrontier_BattlePyramidLobby_Text_25225A: @ 825225A
+	.string "I see GHOST-type POKéMON…\p"
+	.string "…And, I see your POKéMON suffering\n"
+	.string "from GHOST-type moves…$"
+
+BattleFrontier_BattlePyramidLobby_Text_2522AE: @ 82522AE
+	.string "I see STEEL-type POKéMON…\p"
+	.string "…And, I see your POKéMON suffering\n"
+	.string "from enormously powerful moves…$"
+
+BattleFrontier_BattlePyramidLobby_Text_25230B: @ 825230B
+	.string "I see flying POKéMON…\p"
+	.string "…And, I see your POKéMON suffering\n"
+	.string "from enormously powerful moves…$"
+
+BattleFrontier_BattlePyramidLobby_Text_252364: @ 8252364
+	.string "I see those that have evolved from\n"
+	.string "the power of stones…\p"
+	.string "I also sense fire, water,\n"
+	.string "and electricity…\p"
+	.string "…And, I see your POKéMON suffering\n"
+	.string "from those three powers…$"
+
+BattleFrontier_BattlePyramidLobby_Text_252403: @ 8252403
+	.string "I see NORMAL-type POKéMON…\p"
+	.string "…And, I see your POKéMON suffering\n"
+	.string "from enormously powerful moves…$"
+
+BattleFrontier_BattlePyramidLobby_Text_252461: @ 8252461
+	.string "Whether you believe my fortunes\n"
+	.string "or not, the choice is yours…\p"
+	.string "The future can be changed anytime…\n"
+	.string "I wish you safe passage…$"
+
+BattleFrontier_BattlePyramidLobby_Text_2524DA: @ 82524DA
+	.string "Did you know?\p"
+	.string "If you run fast, TRAINERS may notice\n"
+	.string "and come after you for a battle.\p"
+	.string "So, if you want to avoid TRAINERS,\n"
+	.string "don’t catch their eyes, but sneak\l"
+	.string "cautiously and quietly past them.$"
+
+BattleFrontier_BattlePyramidLobby_Text_252595: @ 8252595
+	.string "Awaaaaaaarrrrgh!\p"
+	.string "I had a whole lot of items, but I lost\n"
+	.string "them all when I lost!\p"
+	.string "Awaaaaaaarrrrgh!$"
+
+BattleFrontier_BattlePyramidLobby_Text_2525F4: @ 82525F4
+	.string "Welcome back!\n"
+	.string "You’ve done the unthinkable!\p"
+	.string "You’ve defeated the PYRAMID KING\n"
+	.string "and conquered the BATTLE PYRAMID!$"
+
+BattleFrontier_BattlePyramidLobby_Text_252662: @ 8252662
+	.string "Young explorer!\n"
+	.string "In commendation of your courage,\l"
+	.string "we give you these Battle Point(s)!$"
+
+BattleFrontier_BattlePyramidLobby_Text_2526B6: @ 82526B6
+	.string "The Battle Quest rules are listed.$"
+
+BattleFrontier_BattlePyramidLobby_Text_2526D9: @ 82526D9
+	.string "Which heading do you want to read?$"
+
+BattleFrontier_BattlePyramidLobby_Text_2526FC: @ 82526FC
+	.string "When the PYRAMID is conquered,\n"
+	.string "the wild POKéMON that appear in it\l"
+	.string "are replaced by different kinds.\p"
+	.string "Explore, observe, and learn what kinds\n"
+	.string "of wild POKéMON you may encounter.$"
+
+BattleFrontier_BattlePyramidLobby_Text_2527A9: @ 82527A9
+	.string "TRAINERS are lying in wait for you\n"
+	.string "inside the PYRAMID.\p"
+	.string "On each floor, there are up to\n"
+	.string "eight TRAINERS.\p"
+	.string "When you defeat a TRAINER, you will\n"
+	.string "get a helpful hint for your adventure.$"
+
+BattleFrontier_BattlePyramidLobby_Text_25285A: @ 825285A
+	.string "The mazes in the PYRAMID rearrange\n"
+	.string "themselves every time you enter it.\p"
+	.string "The mazes are poorly lit.\n"
+	.string "You must advance with caution.\p"
+	.string "The light grows brighter whenever you\n"
+	.string "defeat a wild POKéMON or a TRAINER.$"
+
+BattleFrontier_BattlePyramidLobby_Text_252924: @ 8252924
+	.string "The BATTLE BAG serves as your BAG\n"
+	.string "while in the PYRAMID.\p"
+	.string "There are two separate BATTLE BAGS--\n"
+	.string "one each for the Level 50 and\l"
+	.string "Open Level adventures.\p"
+	.string "They each can hold up to 99 pieces\n"
+	.string "of ten kinds of items.\p"
+	.string "The contents of the BATTLE BAG are\n"
+	.string "lost if you fail in your quest.$"
+
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc
new file mode 100644
index 000000000..f724f4f9f
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidTop/events.inc
@@ -0,0 +1,10 @@
+BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0
+	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, 8, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0
+	object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, 7, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0
+	coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256
+
+BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800
+	map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0
+
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
index fe3964510..9e9508e7e 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattlePyramidTop: @ 8485430
-	.4byte BattleFrontier_BattlePyramidTop_MapAttributes
+	.4byte BattleFrontier_BattlePyramidTop_Layout
 	.4byte BattleFrontier_BattlePyramidTop_MapEvents
 	.4byte BattleFrontier_BattlePyramidTop_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
new file mode 100644
index 000000000..886b3fe01
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
@@ -0,0 +1,379 @@
+BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
+	map_script 5, BattleFrontier_BattlePyramidTop_MapScript1_2550F4
+	map_script 2, BattleFrontier_BattlePyramidTop_MapScript2_25516E
+	map_script 3, BattleFrontier_BattlePyramidTop_MapScript1_2550B6
+	map_script 4, BattleFrontier_BattlePyramidTop_MapScript2_2550CE
+	.byte 0
+
+BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6
+	setvar VAR_0x8004, 13
+	setvar VAR_0x8005, 200
+	setvar VAR_0x8006, 0
+	special sub_81A8E7C
+	setvar VAR_TEMP_F, 1
+	end
+
+BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidTop_EventScript_2550D8
+	.2byte 0
+
+BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	compare VAR_TEMP_C, 0
+	goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2550F3
+	setobjectxyperm 2, 0, 0
+
+BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3
+	end
+
+BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4
+	setvar VAR_0x8004, 9
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattlePyramidTop_EventScript_25510C
+	call BattleFrontier_BattlePyramidTop_EventScript_242170
+
+BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C
+	copyvar VAR_TEMP_C, VAR_RESULT
+	setvar VAR_0x8004, 0
+	special sub_81A1780
+	switch VAR_TEMP_0
+	case 0, BattleFrontier_BattlePyramidTop_EventScript_255193
+	case 1, BattleFrontier_BattlePyramidTop_EventScript_252B66
+	case 2, BattleFrontier_BattlePyramidTop_EventScript_255193
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 5
+	special sub_81A1780
+	compare VAR_RESULT, 2
+	goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
+	compare VAR_RESULT, 3
+	goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
+	compare VAR_RESULT, 9
+	goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
+	end
+
+BattleFrontier_BattlePyramidTop_MapScript2_25516E: @ 825516E
+	map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidTop_EventScript_255180
+	map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidTop_EventScript_25518A
+	.2byte 0
+
+BattleFrontier_BattlePyramidTop_EventScript_255180:: @ 8255180
+	playbgm MUS_PYRAMID_TOP, 0
+	setvar VAR_TEMP_E, 1
+	end
+
+BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A
+	special ShowMapNamePopup
+	setvar VAR_TEMP_F, 0
+	end
+
+BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 1
+	special sub_81A8E7C
+	special SavePlayerParty
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_0x8004, 9
+	special sub_81A8E7C
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	setvar VAR_TEMP_F, 1
+	end
+
+BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0
+	lock
+	faceplayer
+	compare VAR_TEMP_D, 0
+	goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255236
+	compare VAR_TEMP_C, 0
+	goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255240
+	msgbox BattleFrontier_BattlePyramidTop_Text_255410, 4
+	closemessage
+	applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD
+	waitmovement 0
+	applymovement 255, BattleFrontier_BattlePyramidTop_Movement_255403
+	waitmovement 0
+	applymovement 1, BattleFrontier_BattlePyramidTop_Movement_255400
+	waitmovement 0
+	message BattleFrontier_BattlePyramidTop_Text_2554E8
+	waitmessage
+	playfanfare MUS_ME_POINTGET
+	waitfanfare
+	closemessage
+
+BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 3
+	special sub_81A1780
+	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
+	waitstate
+	end
+
+BattleFrontier_BattlePyramidTop_EventScript_255236:: @ 8255236
+	msgbox BattleFrontier_BattlePyramidTop_Text_255BFE, 4
+	closemessage
+	end
+
+BattleFrontier_BattlePyramidTop_EventScript_255240:: @ 8255240
+	msgbox BattleFrontier_BattlePyramidTop_Text_25551F, 4
+	applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD
+	setvar VAR_TEMP_D, 1
+	closemessage
+	end
+
+BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256
+	lockall
+	switch VAR_TEMP_C
+	case 2, BattleFrontier_BattlePyramidTop_EventScript_255335
+	case 3, BattleFrontier_BattlePyramidTop_EventScript_2552D0
+	case 4, BattleFrontier_BattlePyramidTop_EventScript_255388
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0
+	special SpawnScriptEventObject
+	applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C
+	waitmovement 0
+	msgbox BattleFrontier_BattlePyramidTop_Text_255669, 4
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
+	waitmovement 0
+	msgbox BattleFrontier_BattlePyramidTop_Text_25573E, 4
+	goto BattleFrontier_BattlePyramidTop_EventScript_2552DA
+	end
+
+BattleFrontier_BattlePyramidTop_EventScript_2552D0:: @ 82552D0
+	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
+	waitmovement 0
+
+BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA
+	msgbox BattleFrontier_BattlePyramidTop_Text_255846, 4
+	call BattleFrontier_BattlePyramidTop_EventScript_2553ED
+	playbgm MUS_PYRAMID_TOP, 0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB
+	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
+
+BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB
+	setvar VAR_0x8004, 12
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A
+	msgbox BattleFrontier_BattlePyramidTop_Text_255873, 4
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattlePyramidTop_Text_2558E9
+	waitmessage
+	waitfanfare
+	setvar VAR_0x8004, 13
+	special sub_81A1780
+	msgbox BattleFrontier_BattlePyramidTop_Text_25591D, 4
+	goto BattleFrontier_BattlePyramidTop_EventScript_25521A
+
+BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388
+	special SpawnScriptEventObject
+	applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C
+	waitmovement 0
+	msgbox BattleFrontier_BattlePyramidTop_Text_255951, 4
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
+	waitmovement 0
+	msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, 4
+	goto BattleFrontier_BattlePyramidTop_EventScript_255392
+	end
+
+BattleFrontier_BattlePyramidTop_EventScript_255388:: @ 8255388
+	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
+	waitmovement 0
+
+BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392
+	msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, 4
+	call BattleFrontier_BattlePyramidTop_EventScript_2553ED
+	playbgm MUS_PYRAMID_TOP, 0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3
+	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
+
+BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
+	setvar VAR_0x8004, 12
+	special sub_81A1780
+	compare VAR_RESULT, 2
+	goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A
+	msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, 4
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattlePyramidTop_Text_255B59
+	waitmessage
+	waitfanfare
+	setvar VAR_0x8004, 13
+	special sub_81A1780
+	msgbox BattleFrontier_BattlePyramidTop_Text_255B82, 4
+	goto BattleFrontier_BattlePyramidTop_EventScript_25521A
+
+BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED
+	closemessage
+	setvar VAR_0x8004, 10
+	setvar VAR_0x8005, 0
+	special sub_8163AC4
+	waitstate
+	return
+
+BattleFrontier_BattlePyramidTop_Movement_2553FD: @ 82553FD
+	walk_right
+	walk_in_place_fastest_left
+	step_end
+
+BattleFrontier_BattlePyramidTop_Movement_255400: @ 8255400
+	walk_left
+	walk_in_place_fastest_up
+	step_end
+
+BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	step_end
+
+BattleFrontier_BattlePyramidTop_Movement_25540A: @ 825540A
+	walk_fast_down
+	step_end
+
+BattleFrontier_BattlePyramidTop_Movement_25540C: @ 825540C
+	walk_slow_up
+	walk_slow_up
+	delay_16
+	step_end
+
+BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410
+	.string "It is a delight to see you here!\n"
+	.string "You have reached the summit of\l"
+	.string "the BATTLE PYRAMID!\p"
+	.string "Above here is the PYRAMID’s\n"
+	.string "lookout point.\p"
+	.string "It is a place open only to those\n"
+	.string "who have conquered the PYRAMID.\p"
+	.string "Now, please!\n"
+	.string "Up you go!$"
+
+BattleFrontier_BattlePyramidTop_Text_2554E8: @ 82554E8
+	.string "The PYRAMID’s new conqueror!\n"
+	.string "Let the name {PLAYER} be known!$"
+
+BattleFrontier_BattlePyramidTop_Text_25551F: @ 825551F
+	.string "It is a delight to see you here!\p"
+	.string "Unfortunately, you were second by\n"
+	.string "a mere fraction of time!\p"
+	.string "Our chief has already conquered\n"
+	.string "the PYRAMID ahead of you.\p"
+	.string "However, my young explorer…\n"
+	.string "You are a TRAINER!\p"
+	.string "Assert your power and take the glory\n"
+	.string "of the pinnacle from our chief!\p"
+	.string "Now, please! When you are ready,\n"
+	.string "take one more step of courage!$"
+
+BattleFrontier_BattlePyramidTop_Text_255669: @ 8255669
+	.string "Young adventurer…\p"
+	.string "Wouldn’t you agree that explorations\n"
+	.string "are the grandest of adventures?\p"
+	.string "Your own wits!\p"
+	.string "Your own strength!\p"
+	.string "Your own POKéMON!\p"
+	.string "And, above all, only your own courage\n"
+	.string "to lead you through unknown worlds…$"
+
+BattleFrontier_BattlePyramidTop_Text_25573E: @ 825573E
+	.string "Aah, yes, indeed this life is grand!\n"
+	.string "Grand, it is! Eh?\p"
+	.string "I’m BRANDON!\p"
+	.string "I’m the PYRAMID KING, which means\n"
+	.string "I’m in charge here.\p"
+	.string "Most people call me the chief!\p"
+	.string "You coming here means you have\n"
+	.string "that much confidence in yourself,\l"
+	.string "am I right?\p"
+	.string "Hahahah!\n"
+	.string "This should be exciting!$"
+
+BattleFrontier_BattlePyramidTop_Text_255846: @ 8255846
+	.string "Now, then!\n"
+	.string "Bring your courage to our battle!$"
+
+BattleFrontier_BattlePyramidTop_Text_255873: @ 8255873
+	.string "BRANDON: Hahahah! Grand it was!\n"
+	.string "Grand, yes, indeed!\p"
+	.string "Well done! You’ve earned recognition!\n"
+	.string "Your FRONTIER PASS, please!$"
+
+BattleFrontier_BattlePyramidTop_Text_2558E9: @ 82558E9
+	.string "The Brave Symbol was embossed on\n"
+	.string "the FRONTIER PASS!$"
+
+BattleFrontier_BattlePyramidTop_Text_25591D: @ 825591D
+	.string "Young explorer!\n"
+	.string "I look forward to our next meeting!$"
+
+BattleFrontier_BattlePyramidTop_Text_255951: @ 8255951
+	.string "BRANDON: …You’ve finally returned,\n"
+	.string "young explorer…\p"
+	.string "Your love of adventure seems to come\n"
+	.string "deep from within your heart…\p"
+	.string "Yes… You are exactly as I was in\n"
+	.string "my own youth…\p"
+	.string "… … …Ah…\p"
+	.string "The passionate!\p"
+	.string "The dangerous!\p"
+	.string "The desperate!\p"
+	.string "Those days of death-defying,\n"
+	.string "life-affirming adventures are back…$"
+
+BattleFrontier_BattlePyramidTop_Text_255A6D: @ 8255A6D
+	.string "Now, then!\p"
+	.string "I sense my own courage is off\n"
+	.string "the meter!$"
+
+BattleFrontier_BattlePyramidTop_Text_255AA1: @ 8255AA1
+	.string "Everything you have!\n"
+	.string "I’m braced for it all!$"
+
+BattleFrontier_BattlePyramidTop_Text_255ACD: @ 8255ACD
+	.string "BRANDON: Hahahah!\n"
+	.string "Remarkable!\l"
+	.string "Yes, it’s grand, indeed!\p"
+	.string "Young explorer!\p"
+	.string "You’ve bested me through and through!\n"
+	.string "Here! I want you to have this!$"
+
+BattleFrontier_BattlePyramidTop_Text_255B59: @ 8255B59
+	.string "The Brave Symbol took on\n"
+	.string "a golden shine!$"
+
+BattleFrontier_BattlePyramidTop_Text_255B82: @ 8255B82
+	.string "Ah, yes! It just goes to show that\n"
+	.string "I have much to learn still!\p"
+	.string "May our paths cross again!\n"
+	.string "Farewell for now, young explorer!$"
+
+BattleFrontier_BattlePyramidTop_Text_255BFE: @ 8255BFE
+	.string "Now, when you are ready, take courage\n"
+	.string "and step forward.$"
+
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
new file mode 100644
index 000000000..0bc8d0434
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
@@ -0,0 +1,12 @@
+BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0
+
+BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818
+	warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
+	warp_def 6, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
+
+BattleFrontier_BattleTowerBattleRoom_MapEvents:: @ 853B828
+	map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
index bc54d421a..32b789720 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleTowerBattleRoom: @ 848521C
-	.4byte BattleFrontier_BattleTowerBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattleTowerBattleRoom_Layout
 	.4byte BattleFrontier_BattleTowerBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleTowerBattleRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
new file mode 100644
index 000000000..f684e215d
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
@@ -0,0 +1,651 @@
+BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40
+	map_script 2, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62
+	map_script 4, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B
+	.byte 0
+
+BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B: @ 8241B4B
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B55
+	.2byte 0
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241B55:: @ 8241B55
+	setvar VAR_TEMP_1, 1
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_242198
+	end
+
+BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62: @ 8241B62
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C
+	.2byte 0
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
+	setvar VAR_TEMP_0, 1
+	applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242179
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
+	waitmovement 0
+	applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E
+	waitmovement 0
+	setvar VAR_TEMP_2, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
+	setvar VAR_0x8004, 3
+	special sub_8161F74
+	addobject 1
+	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242182
+	waitmovement 0
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 0
+	special sub_8161F74
+	msgbox 0x2021fc4, 4
+	waitmessage
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 4
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	special sub_8161F74
+	setvar VAR_0x8004, 3
+	special sub_813BF7C
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
+	setvar VAR_0x8004, 4
+	special sub_8161F74
+	switch VAR_RESULT
+	case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
+	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242188
+	waitmovement 0
+	removeobject 1
+	setvar VAR_0x8004, 9
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
+	waitmovement 0
+	applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E
+	waitmovement 0
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, 4
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F
+	setvar VAR_0x8004, 9
+	special sub_81A1780
+	copyvar VAR_TEMP_F, VAR_RESULT
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A
+	multichoice 19, 4, 103, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40
+	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
+	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
+	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A:: @ 8241D0A
+	multichoice 20, 6, 104, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
+	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
+	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241D40:: @ 8241D40
+	message BattleFrontier_BattleTowerBattleRoom_Text_2423A3
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241D72
+	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E22
+	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA
+	message BattleFrontier_BattleTowerBattleRoom_Text_24244C
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_24220E
+	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC
+	closemessage
+	applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242180
+	waitmovement 0
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192
+	waitmovement 0
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 3
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	special sub_8161F74
+	setvar VAR_0x8004, 3
+	special sub_813BF7C
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22
+	message BattleFrontier_BattleTowerBattleRoom_Text_242426
+	waitmessage
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 2
+	special sub_8161F74
+	playse SE_SAVE
+	waitse
+	fadescreen 1
+	setvar VAR_0x8004, 4
+	special sub_81A1780
+	end
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241E44:: @ 8241E44
+	copyvar VAR_TEMP_F, VAR_RESULT
+	switch VAR_TEMP_F
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E90
+	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241E97
+	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E
+	case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_241EA5
+	case 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EAC
+	case 6, BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241E90:: @ 8241E90
+	message BattleFrontier_BattleTowerBattleRoom_Text_242277
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241E97:: @ 8241E97
+	message BattleFrontier_BattleTowerBattleRoom_Text_2422A9
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E:: @ 8241E9E
+	message BattleFrontier_BattleTowerBattleRoom_Text_2422DB
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241EA5:: @ 8241EA5
+	message BattleFrontier_BattleTowerBattleRoom_Text_24230D
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241EAC:: @ 8241EAC
+	message BattleFrontier_BattleTowerBattleRoom_Text_24233F
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3:: @ 8241EB3
+	message BattleFrontier_BattleTowerBattleRoom_Text_242371
+	waitmessage
+	return
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_241EBA:: @ 8241EBA
+BattleFrontier_BattleDomeLobby_EventScript_241EBA:: @ 8241EBA
+BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA:: @ 8241EBA
+BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA:: @ 8241EBA
+BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA:: @ 8241EBA
+BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA
+	setvar VAR_0x8004, 17
+	special sub_81A1780
+	return
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_24219A
+	waitmovement 0
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6
+	waitmovement 0
+	playse SE_PIN
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_272598
+	waitmovement 0
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_27259A
+	waitmovement 0
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB
+	waitmovement 0
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A1
+	waitmovement 0
+	return
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A
+	compare VAR_TEMP_2, 1
+	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, 4
+	setvar VAR_TEMP_2, 1
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22
+	message BattleFrontier_BattleTowerBattleRoom_Text_242542
+	waitmessage
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79
+	multichoice 19, 4, 103, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40
+	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
+	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
+	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79
+	multichoice 20, 6, 104, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF
+	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
+	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
+	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_242170
+	closemessage
+	applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242180
+	waitmovement 0
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192
+	waitmovement 0
+	addobject 1
+	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_2421B2
+	waitmovement 0
+	switch VAR_TEMP_F
+	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_242085
+	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_242029
+	case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, 4
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, 4
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
+	setvar VAR_0x8004, 12
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, 4
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattleTowerBattleRoom_Text_24270E
+	waitmessage
+	waitfanfare
+	setvar VAR_0x8004, 13
+	special sub_81A1780
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, 4
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, 4
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, 4
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF
+	call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
+	setvar VAR_0x8004, 12
+	special sub_81A1780
+	compare VAR_RESULT, 2
+	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, 4
+	playfanfare MUS_ME_SYMBOLGET
+	message BattleFrontier_BattleTowerBattleRoom_Text_242932
+	waitmessage
+	waitfanfare
+	setvar VAR_0x8004, 13
+	special sub_81A1780
+	msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, 4
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E
+BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
+	closemessage
+	setvar VAR_TEMP_2, 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special HealPlayerParty
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8005, 0
+	special sub_8163AC4
+	waitstate
+	copyvar VAR_0x8004, VAR_0x40CE
+	compare VAR_0x8004, 3
+	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A
+	setvar VAR_0x8004, 18
+	special sub_81A1780
+	special HealPlayerParty
+	setvar VAR_0x8004, 21
+	special sub_81A1780
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A
+	setvar VAR_0x8004, 15
+	special sub_8161F74
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 5
+	special sub_81A1780
+	return
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_242170:: @ 8242170
+BattleFrontier_BattleDomeBattleRoom_EventScript_242170:: @ 8242170
+BattleFrontier_BattleFactoryBattleRoom_EventScript_242170:: @ 8242170
+BattleFrontier_BattlePalaceBattleRoom_EventScript_242170:: @ 8242170
+BattleFrontier_BattlePyramidTop_EventScript_242170:: @ 8242170
+BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170
+	setvar VAR_0x8004, 22
+	special sub_81A1780
+	return
+
+BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179
+	walk_up
+	walk_up
+	walk_up
+	face_right
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom_Movement_24217E: @ 824217E
+	face_down
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom_Movement_242180: @ 8242180
+	face_right
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	face_left
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom_Movement_242188: @ 8242188
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom_Movement_24218D: @ 824218D
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	face_right
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom_Movement_242198: @ 8242198
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A
+	set_visible
+	delay_16
+	walk_up
+	walk_left
+	walk_left
+	delay_8
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom_Movement_2421A1: @ 82421A1
+	walk_right
+	walk_right
+	walk_down
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom_Movement_2421A6: @ 82421A6
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB
+	face_right
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_right
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	face_left
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8
+BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8
+	copyvar VAR_RESULT, VAR_0x40CE
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8
+	compare VAR_RESULT, 2
+	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2
+	compare VAR_RESULT, 3
+	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6
+	waitstate
+	end
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8:: @ 82421E8
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6
+	waitstate
+	end
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2:: @ 82421F2
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6
+	waitstate
+	end
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC:: @ 82421FC
+	setvar VAR_0x8004, 13
+	special sub_8161F74
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6
+	waitstate
+	end
+
+BattleFrontier_BattleTowerBattleRoom_EventScript_24220E:: @ 824220E
+	setflag FLAG_0x077
+	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_Text_242217: @ 8242217
+BattleFrontier_BattleTowerBattleRoom_Text_242217: @ 8242217
+	.string "We will restore your POKéMON to\n"
+	.string "full health.$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_242244: @ 8242244
+	.string "You will be facing opponent no. {STR_VAR_1}.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_242277: @ 8242277
+	.string "You will be facing opponent no. 2.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_2422A9: @ 82422A9
+	.string "You will be facing opponent no. 3.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_2422DB: @ 82422DB
+	.string "You will be facing opponent no. 4.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_24230D: @ 824230D
+	.string "You will be facing opponent no. 5.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_24233F: @ 824233F
+	.string "You will be facing opponent no. 6.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_242371: @ 8242371
+	.string "You will be facing opponent no. 7.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_2423A3: @ 82423A3
+BattleFrontier_BattleTowerBattleRoom_Text_2423A3: @ 82423A3
+	.string "Record your battle on your\n"
+	.string "FRONTIER PASS?$"
+
+BattleFrontier_BattleTowerLobby_Text_2423CD: @ 82423CD
+	.string "{PLAYER}’s battle was recorded\n"
+	.string "on the FRONTIER PASS.$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_2423FC: @ 82423FC
+BattleFrontier_BattleTowerBattleRoom_Text_2423FC: @ 82423FC
+	.string "Would you like to save and\n"
+	.string "quit the game?$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_242426: @ 8242426
+BattleFrontier_BattleTowerBattleRoom_Text_242426: @ 8242426
+	.string "Saving your battle data.\n"
+	.string "Please wait.$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_24244C: @ 824244C
+BattleFrontier_BattleTowerBattleRoom_Text_24244C: @ 824244C
+	.string "Would you like to cancel your BATTLE\n"
+	.string "ROOM challenge?$"
+
+gText_BattleRecordCouldntBeSaved:: @ 8242481
+	.string "There was an error of some sort.\n"
+	.string "Your record could not be saved.$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_2424C2: @ 82424C2
+	.string "Excuse me, but…\p"
+	.string "Our leader, the SALON MAIDEN, is on\n"
+	.string "her way here in hopes of battling you.\p"
+	.string "She should be arriving very shortly.$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_242542: @ 8242542
+	.string "You will be facing the SALON MAIDEN.\n"
+	.string "Are you prepared?$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_242579: @ 8242579
+	.string "Greetings…\n"
+	.string "My name is ANABEL.\p"
+	.string "I am the SALON MAIDEN, and I am in\n"
+	.string "charge of running the BATTLE TOWER…\p"
+	.string "I have heard several rumors\n"
+	.string "about you…\p"
+	.string "In all honesty, what I have heard does\n"
+	.string "not seem attractive in any way…\p"
+	.string "The reason I’ve come to see you…\n"
+	.string "Well, there is but one reason…$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_24268C: @ 824268C
+	.string "Let me see your talent in\n"
+	.string "its entirety…$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_2426B4: @ 82426B4
+	.string "ANABEL: Fufufu, nicely done…\p"
+	.string "Your FRONTIER PASS, please…\n"
+	.string "Your talent shall be recognized.$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_24270E: @ 824270E
+	.string "The Ability Symbol was embossed on\n"
+	.string "the FRONTIER PASS!$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_242744: @ 8242744
+	.string "… … … … … …\p"
+	.string "You have confidence in your POKéMON\n"
+	.string "battling talent, don’t you?\p"
+	.string "I urge you to keep battling and\n"
+	.string "keep on winning.\p"
+	.string "I will be waiting for you.\n"
+	.string "Until the next time we meet…$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_2427F9: @ 82427F9
+	.string "ANABEL: You really did come back to\n"
+	.string "see me…\p"
+	.string "… … … … … …\p"
+	.string "You’ve won straight matches to see me…\n"
+	.string "I won’t have to hold back against you…\p"
+	.string "It’s been too long now…\p"
+	.string "Too long since I’ve been able to battle\n"
+	.string "without thinking about anything…$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_2428E0: @ 82428E0
+	.string "Let’s begin, shall we?$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_2428F7: @ 82428F7
+	.string "ANABEL: Fufu, congratulations…\n"
+	.string "Your FRONTIER PASS, please…$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_242932: @ 8242932
+	.string "The Ability Symbol took on\n"
+	.string "a golden shine!$"
+
+BattleFrontier_BattleTowerBattleRoom_Text_24295D: @ 824295D
+	.string "That was fun…\p"
+	.string "I have never had a POKéMON battle\n"
+	.string "so enjoyable before…\p"
+	.string "I wish I could battle with you again…$"
+
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
new file mode 100644
index 000000000..f97d8ad0c
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
@@ -0,0 +1,11 @@
+BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888
+	object_event 5, 255, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0
+	object_event 6, 254, 0, 5, 8, 3, 7, 0, 0, 0, 0, 0x0, 0
+
+BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054
+	map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
index b9e17e9aa..a9eb2b2c5 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleTowerBattleRoom2: @ 8485318
-	.4byte BattleFrontier_BattleTowerBattleRoom2_MapAttributes
+	.4byte BattleFrontier_BattleTowerBattleRoom_Layout
 	.4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents
 	.4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
new file mode 100644
index 000000000..d1b07451c
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
@@ -0,0 +1,540 @@
+BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8
+	map_script 3, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8
+	map_script 4, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33
+	map_script 2, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43
+	.byte 0
+
+BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8
+	compare VAR_0x40CE, 2
+	call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F
+	compare VAR_0x40CE, 3
+	call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
+	setvar VAR_0x8004, 14
+	special sub_8161F74
+	checkplayergender
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
+	setvar VAR_OBJ_GFX_ID_F, 0
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29
+	setvar VAR_OBJ_GFX_ID_F, 89
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F
+	special sub_813A76C
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D
+	.2byte 0
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D
+	hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D
+	.2byte 0
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
+	setvar VAR_TEMP_0, 1
+	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518
+	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
+	waitmovement 0
+	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
+	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
+	waitmovement 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
+	setvar VAR_0x8004, 3
+	special sub_8161F74
+	addobject 1
+	addobject 4
+	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528
+	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E
+	waitmovement 0
+	compare VAR_0x40CE, 3
+	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 0
+	special sub_8161F74
+	delay 15
+	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
+	waitmovement 0
+	msgbox 0x2021fc4, 4
+	waitmessage
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 1
+	special sub_8161F74
+	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
+	waitmovement 0
+	msgbox 0x2021fc4, 4
+	waitmessage
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249026:: @ 8249026
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 0
+	special sub_8161F74
+	delay 15
+	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
+	waitmovement 0
+	messageautoscroll 0x2021fc4
+	waitmessage
+	delay 48
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 1
+	special sub_8161F74
+	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
+	waitmovement 0
+	messageautoscroll 0x2021fc4
+	waitmessage
+	delay 48
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069
+	call BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 4
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	special sub_8161F74
+	setvar VAR_0x8004, 3
+	special sub_813BF7C
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA
+	call BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA
+	setvar VAR_0x8004, 4
+	special sub_8161F74
+	switch VAR_RESULT
+	case 7, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF
+	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249534
+	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249539
+	waitmovement 0
+	removeobject 1
+	removeobject 4
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
+	waitmovement 0
+	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
+	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
+	waitmovement 0
+	compare VAR_0x40CE, 3
+	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118
+	msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, 4
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118
+	messageautoscroll BattleFrontier_BattleTowerBattleRoom2_Text_242217
+	waitmessage
+	delay 48
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
+	special LoadPlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	compare VAR_0x40CE, 3
+	call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD
+	compare VAR_0x40CE, 3
+	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
+	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1
+	multichoice 19, 4, 103, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7
+	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
+	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
+	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1:: @ 82491B1
+	multichoice 20, 6, 104, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
+	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
+	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7
+	message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249219
+	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219
+	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223
+	msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB
+	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251
+	message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
+	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
+	closemessage
+	clearflag FLAG_0x002
+	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
+	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
+	waitmovement 0
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_249541
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_249541
+	waitmovement 0
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 3
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	special sub_8161F74
+	setvar VAR_0x8004, 3
+	special sub_813BF7C
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
+	message BattleFrontier_BattleTowerBattleRoom2_Text_242426
+	waitmessage
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 2
+	special sub_8161F74
+	playse SE_SAVE
+	waitse
+	fadescreen 1
+	setvar VAR_0x8004, 4
+	special sub_81A1780
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD
+	compare VAR_0x40CE, 3
+	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E
+	copyvar VAR_TEMP_F, VAR_RESULT
+	switch VAR_TEMP_F
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354
+	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B
+	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249362
+	case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_249369
+	case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_249370
+	case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249377
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249354:: @ 8249354
+	message BattleFrontier_BattleTowerBattleRoom2_Text_249547
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B:: @ 824935B
+	message BattleFrontier_BattleTowerBattleRoom2_Text_249578
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249362:: @ 8249362
+	message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249369:: @ 8249369
+	message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249370:: @ 8249370
+	message BattleFrontier_BattleTowerBattleRoom2_Text_24960B
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249377:: @ 8249377
+	message BattleFrontier_BattleTowerBattleRoom2_Text_24963C
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E:: @ 824937E
+	copyvar VAR_TEMP_F, VAR_RESULT
+	switch VAR_TEMP_F
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA
+	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6
+	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2
+	case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE
+	case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA
+	case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249406
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA:: @ 82493CA
+	message BattleFrontier_BattleTowerBattleRoom2_Text_249547
+	waitmessage
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6:: @ 82493D6
+	message BattleFrontier_BattleTowerBattleRoom2_Text_249578
+	waitmessage
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2:: @ 82493E2
+	message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9
+	waitmessage
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE:: @ 82493EE
+	message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA
+	waitmessage
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA:: @ 82493FA
+	message BattleFrontier_BattleTowerBattleRoom2_Text_24960B
+	waitmessage
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249406:: @ 8249406
+	message BattleFrontier_BattleTowerBattleRoom2_Text_24963C
+	waitmessage
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412
+	waitmessage
+	delay 48
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417
+	checkflag FLAG_0x002
+	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249457
+	multichoice 19, 6, 105, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8
+	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
+	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249457:: @ 8249457
+	multichoice 20, 8, 106, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
+	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8005, 0
+	message gText_LinkStandby3
+	waitmessage
+	special sub_813B568
+	waitstate
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8
+	message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4
+	setflag FLAG_0x002
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD
+	message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA:: @ 82494FA
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 0
+	message gText_LinkStandby3
+	waitmessage
+	special sub_813B568
+	waitstate
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249514:: @ 8249514
+	special sub_813B534
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249518: @ 8249518
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	face_right
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	face_right
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524
+	face_left
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526
+	walk_in_place_fastest_right
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	face_left
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	face_left
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534
+	walk_up
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E
+	walk_right
+	walk_right
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541
+	walk_left
+	walk_left
+	walk_in_place_fastest_right
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545
+	walk_in_place_left
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Text_249547: @ 8249547
+	.string "The 2nd set of opponents is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_249578: @ 8249578
+	.string "The 3rd set of opponents is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_2495A9: @ 82495A9
+	.string "The 4th set of opponents is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_2495DA: @ 82495DA
+	.string "The 5th set of opponents is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_24960B: @ 824960B
+	.string "The 6th set of opponents is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_24963C: @ 824963C
+	.string "The 7th set of opponents is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_24966D: @ 824966D
+	.string "The 2nd set of opponents is next.\n"
+	.string "Do your best!$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_24969D: @ 824969D
+	.string "The 3rd set of opponents is next.\n"
+	.string "Do your best!$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_2496CD: @ 82496CD
+	.string "The 4th set of opponents is next.\n"
+	.string "Do your best!$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_2496FD: @ 82496FD
+	.string "The 5th set of opponents is next.\n"
+	.string "Do your best!$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_24972D: @ 824972D
+	.string "The 6th set of opponents is next.\n"
+	.string "Do your best!$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_24975D: @ 824975D
+	.string "The 7th set of opponents is next.\n"
+	.string "Do your best!$"
+
+gText_LinkStandby3:: @ 824978D
+	.string "Link standby…$"
+
+gText_YourPartnerHasRetired:: @ 824979B
+	.string "Your partner has retired.\p"
+	.string "Your BATTLE ROOM challenge\n"
+	.string "will be canceled.$"
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc
new file mode 100644
index 000000000..23f3377f3
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc
@@ -0,0 +1,6 @@
+BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0
+
+BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC
+	map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
index f72c8fe29..361e6be03 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleTowerCorridor: @ 8485200
-	.4byte BattleFrontier_BattleTowerCorridor_MapAttributes
+	.4byte BattleFrontier_BattleTowerCorridor_Layout
 	.4byte BattleFrontier_BattleTowerCorridor_MapEvents
 	.4byte BattleFrontier_BattleTowerCorridor_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
new file mode 100644
index 000000000..9ff6bbc59
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
@@ -0,0 +1,59 @@
+BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA
+	map_script 1, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5
+	map_script 2, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6
+	.byte 0
+
+BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5
+	compare VAR_0x8006, 1
+	goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3
+	setmetatile 12, 0, 519, 0
+	setmetatile 12, 1, 527, 0
+	end
+
+BattleFrontier_BattleTowerCorridor_EventScript_241AD3:: @ 8241AD3
+	setmetatile 15, 0, 519, 0
+	setmetatile 15, 1, 527, 0
+	end
+
+BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_241AF0
+	.2byte 0
+
+BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0
+	setvar VAR_TEMP_0, 1
+	compare VAR_0x8006, 1
+	goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16
+	applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A
+	applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B39
+	waitmovement 0
+	goto BattleFrontier_BattleTowerCorridor_EventScript_241B27
+
+BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16
+	applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B37
+	applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B36
+	waitmovement 0
+
+BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27
+	setvar VAR_TEMP_0, 0
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
+	waitstate
+	end
+
+BattleFrontier_BattleTowerCorridor_Movement_241B36: @ 8241B36
+	walk_right
+
+BattleFrontier_BattleTowerCorridor_Movement_241B37: @ 8241B37
+	walk_right
+	walk_right
+
+BattleFrontier_BattleTowerCorridor_Movement_241B39: @ 8241B39
+	walk_right
+
+BattleFrontier_BattleTowerCorridor_Movement_241B3A: @ 8241B3A
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	set_invisible
+	step_end
+
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
new file mode 100644
index 000000000..9dce5da52
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
@@ -0,0 +1,9 @@
+BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50
+	object_event 1, 255, 0, 1, 1, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, 7, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, 7, 1, 1, 0, 0, 0x0, 0
+	object_event 4, 254, 0, 14, 1, 0, 8, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0
+	map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
index 6332bc83b..ccdcb013f 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleTowerCorridor2: @ 84852FC
-	.4byte BattleFrontier_BattleTowerCorridor2_MapAttributes
+	.4byte BattleFrontier_BattleTowerCorridor2_Layout
 	.4byte BattleFrontier_BattleTowerCorridor2_MapEvents
 	.4byte BattleFrontier_BattleTowerCorridor2_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
new file mode 100644
index 000000000..36cf93ada
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
@@ -0,0 +1,172 @@
+BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A
+	map_script 3, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A
+	map_script 4, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95
+	map_script 2, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2
+	.byte 0
+
+BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A
+	compare VAR_0x40CE, 2
+	call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D71
+	compare VAR_0x40CE, 3
+	call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D91
+	end
+
+BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71
+	setvar VAR_0x8004, 14
+	special sub_8161F74
+	checkplayergender
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B
+	setvar VAR_OBJ_GFX_ID_F, 0
+	return
+
+BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B
+	setvar VAR_OBJ_GFX_ID_F, 89
+	return
+
+BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91
+	special sub_813A76C
+	return
+
+BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248D9F
+	.2byte 0
+
+BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F
+	hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
+	hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
+	hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
+	special sub_8139980
+	end
+
+BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2: @ 8248DB2
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248DBC
+	.2byte 0
+
+BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC
+	lockall
+	setflag FLAG_SPECIAL_FLAG_0x4002
+	setvar VAR_0x8004, 14
+	setvar VAR_0x8005, 1
+	opendoor 1, 1
+	waitdooranim
+	clearflag FLAG_SPECIAL_FLAG_0x4002
+	showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
+	showobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
+	applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EE6
+	applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EE6
+	waitmovement 0
+	setflag FLAG_SPECIAL_FLAG_0x4002
+	setvar VAR_0x8004, 14
+	setvar VAR_0x8005, 1
+	closedoor 1, 1
+	waitdooranim
+	clearflag FLAG_SPECIAL_FLAG_0x4002
+	applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EBC
+	applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EC4
+	applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_248ECC
+	applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5
+	waitmovement 0
+	delay 40
+	applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_2725A6
+	applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_2725A6
+	waitmovement 0
+	opendoor 7, 1
+	waitdooranim
+	applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_248EE3
+	applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248EE3
+	applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EDE
+	applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EDE
+	waitmovement 0
+	closedoor 7, 1
+	waitdooranim
+	delay 30
+	setvar VAR_TEMP_1, 1
+	call BattleFrontier_BattleTowerCorridor2_EventScript_248E71
+	releaseall
+	end
+
+BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
+	compare VAR_0x40CE, 2
+	call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EA8
+	compare VAR_0x40CE, 3
+	call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EB2
+	return
+
+BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
+	waitstate
+	return
+
+BattleFrontier_BattleTowerCorridor2_EventScript_248EA8:: @ 8248EA8
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5
+	waitstate
+	return
+
+BattleFrontier_BattleTowerCorridor2_EventScript_248EB2:: @ 8248EB2
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5
+	waitstate
+	return
+
+BattleFrontier_BattleTowerCorridor2_Movement_248EBC: @ 8248EBC
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+BattleFrontier_BattleTowerCorridor2_Movement_248EC4: @ 8248EC4
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+BattleFrontier_BattleTowerCorridor2_Movement_248ECC: @ 8248ECC
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_in_place_fastest_right
+	step_end
+
+BattleFrontier_BattleTowerCorridor2_Movement_248ED5: @ 8248ED5
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_in_place_fastest_left
+	step_end
+
+BattleFrontier_BattleTowerCorridor2_Movement_248EDE: @ 8248EDE
+	delay_16
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerCorridor2_Movement_248EE3: @ 8248EE3
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerCorridor2_Movement_248EE6: @ 8248EE6
+	walk_down
+	step_end
+
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/events.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc
new file mode 100644
index 000000000..321fc90e3
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerElevator/events.inc
@@ -0,0 +1,6 @@
+BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0
+
+BattleFrontier_BattleTowerElevator_MapEvents:: @ 853B790
+	map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc
index 1dd6b495e..112c7f938 100644
--- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleTowerElevator: @ 84851E4
-	.4byte BattleFrontier_BattleTowerElevator_MapAttributes
+	.4byte BattleElevator_Layout
 	.4byte BattleFrontier_BattleTowerElevator_MapEvents
 	.4byte BattleFrontier_BattleTowerElevator_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
new file mode 100644
index 000000000..248c1f9ca
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
@@ -0,0 +1,91 @@
+BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB
+	map_script 2, BattleFrontier_BattleTowerElevator_MapScript2_2419E6
+	map_script 4, BattleFrontier_BattleTowerElevator_MapScript2_241A96
+	.byte 0
+
+BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_2419F0
+	.2byte 0
+
+BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
+	setvar VAR_TEMP_0, 1
+	applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86
+	applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A8A
+	waitmovement 0
+	special sub_813A080
+	waitse
+	special sub_8139A78
+	waitstate
+	delay 48
+	applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E
+	applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A92
+	waitmovement 0
+	call BattleFrontier_BattleTowerElevator_EventScript_241A28
+	end
+
+BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55
+	compare VAR_0x40CE, 2
+	call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A5F
+	compare VAR_0x40CE, 3
+	call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A72
+	return
+
+BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1
+	waitstate
+	return
+
+BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F
+	checkflag FLAG_0x152
+	goto_if 0, BattleFrontier_BattleTowerElevator_EventScript_241A7C
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2
+	waitstate
+	return
+
+BattleFrontier_BattleTowerElevator_EventScript_241A72:: @ 8241A72
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2
+	waitstate
+	return
+
+BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 1
+	waitstate
+	return
+
+BattleFrontier_BattleTowerElevator_Movement_241A86: @ 8241A86
+	walk_up
+	walk_right
+	face_down
+	step_end
+
+BattleFrontier_BattleTowerElevator_Movement_241A8A: @ 8241A8A
+	walk_up
+	walk_up
+	face_down
+	step_end
+
+BattleFrontier_BattleTowerElevator_Movement_241A8E: @ 8241A8E
+	walk_down
+	walk_down
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerElevator_Movement_241A92: @ 8241A92
+	walk_right
+	walk_down
+	walk_down
+	step_end
+
+BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_241AA0
+	.2byte 0
+
+BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc
new file mode 100644
index 000000000..86e159b63
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc
@@ -0,0 +1,26 @@
+BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 17, 8, 3, 2, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, 2, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918
+	object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, 8, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701
+	object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0
+	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0
+	object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0
+
+BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710
+	warp_def 12, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+	warp_def 13, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+	warp_def 6, 1, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM
+
+BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728
+	bg_event 4, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFC7
+	bg_event 8, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFE0
+	bg_event 12, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFF9
+	bg_event 16, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23F012
+	bg_event 2, 1, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23F4BE
+
+BattleFrontier_BattleTowerLobby_MapEvents:: @ 853B764
+	map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents
+
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc
index 94d43eb89..6e0e3b470 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleTowerLobby: @ 84851C8
-	.4byte BattleFrontier_BattleTowerLobby_MapAttributes
+	.4byte BattleFrontier_BattleTowerLobby_Layout
 	.4byte BattleFrontier_BattleTowerLobby_MapEvents
 	.4byte BattleFrontier_BattleTowerLobby_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
new file mode 100644
index 000000000..478d61656
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -0,0 +1,1589 @@
+BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B
+	map_script 5, BattleFrontier_BattleTowerLobby_MapScript1_23E690
+	map_script 3, BattleFrontier_BattleTowerLobby_MapScript1_23E694
+	map_script 2, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD
+	map_script 4, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9
+	.byte 0
+
+BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690
+	special sub_81653CC
+	end
+
+BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
+	call BattleFrontier_BattleTowerLobby_EventScript_28CC84
+	setvar VAR_0x8004, 10
+	special sub_81A085C
+	compare VAR_0x8004, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5
+	checkflag FLAG_0x934
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6C1
+
+BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5
+	clearflag FLAG_0x2BD
+	setvar VAR_0x8004, 23
+	special sub_81A085C
+
+BattleFrontier_BattleTowerLobby_EventScript_23E6C0:: @ 823E6C0
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23E6C1:: @ 823E6C1
+	setflag FLAG_0x2BD
+	goto BattleFrontier_BattleTowerLobby_EventScript_23E6C0
+
+BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerLobby_EventScript_23E6D3
+	.2byte 0
+
+BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E707
+	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleTowerLobby_EventScript_23E710
+	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleTowerLobby_EventScript_23E8EE
+	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleTowerLobby_EventScript_23E758
+	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleTowerLobby_EventScript_23E7F2
+	.2byte 0
+
+BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707
+	setvar VAR_0x8004, 0
+	special sub_81A1780
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
+	lock
+	faceplayer
+	msgbox BattleFrontier_BattleTowerLobby_Text_23F583, 4
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_8161F74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 0
+	special sub_8161F74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	release
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758
+	lock
+	faceplayer
+	setvar VAR_0x8004, 10
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E778
+	message BattleFrontier_BattleTowerLobby_Text_23F60D
+	waitmessage
+	goto BattleFrontier_BattleTowerLobby_EventScript_23E780
+
+BattleFrontier_BattleTowerLobby_EventScript_23E778:: @ 823E778
+	msgbox BattleFrontier_BattleTowerLobby_Text_241486, 4
+
+BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780
+	setvar VAR_0x8004, 5
+	special sub_8161F74
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5
+	message BattleFrontier_BattleTowerLobby_Text_23F844
+	waitmessage
+	playfanfare MUS_FANFA4
+	waitfanfare
+	msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, 4
+
+BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5
+	msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, 4
+	setvar VAR_0x8004, 11
+	special sub_81A1780
+	msgbox BattleFrontier_BattleTowerLobby_Text_241520, 9
+	call BattleFrontier_BattleTowerLobby_EventScript_23E84D
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	special sub_8161F74
+	compare VAR_RESULT, 49
+	goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E7E2
+	msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, 4
+
+BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2
+	msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	release
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2
+	compare VAR_0x40CE, 2
+	goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E81E
+	checkflag FLAG_0x152
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E81E
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	special sub_8161F74
+	compare VAR_RESULT, 0
+	goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E830
+
+BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 0
+	special sub_8161F74
+
+BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830
+	lock
+	faceplayer
+	message BattleFrontier_BattleTowerLobby_Text_23F6F7
+	waitmessage
+	call BattleFrontier_BattleTowerLobby_EventScript_23E84D
+	msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	release
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
+	message BattleFrontier_BattleTowerLobby_Text_23F70F
+	waitmessage
+	setvar VAR_0x8004, 8
+	special sub_81A1780
+	special LoadPlayerParty
+	special HealPlayerParty
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 0
+	special sub_8161F74
+	playse SE_SAVE
+	waitse
+	call BattleFrontier_BattleTowerLobby_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF
+	message BattleFrontier_BattleTowerLobby_Text_23FE3C
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23E8DF
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23E8B4
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23E8DF
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4:: @ 823E8B4
+BattleFrontier_BattleArenaLobby_EventScript_23E8B4:: @ 823E8B4
+BattleFrontier_BattleDomeLobby_EventScript_23E8B4:: @ 823E8B4
+BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8B4:: @ 823E8B4
+BattleFrontier_BattleFactoryLobby_EventScript_23E8B4:: @ 823E8B4
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8B4:: @ 823E8B4
+BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8B4:: @ 823E8B4
+BattleFrontier_BattlePalaceLobby_EventScript_23E8B4:: @ 823E8B4
+BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4:: @ 823E8B4
+BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4:: @ 823E8B4
+BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4
+	setvar VAR_0x8004, 19
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7
+	playse SE_SAVE
+	msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23E8DF
+
+BattleFrontier_BattleTowerLobby_EventScript_23E8D7:: @ 823E8D7
+	msgbox gText_BattleRecordCouldntBeSaved, 4
+
+BattleFrontier_BattleTowerLobby_EventScript_23E8DF:: @ 823E8DF
+	return
+
+BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0:: @ 823E8E0
+BattleFrontier_BattleArenaLobby_EventScript_23E8E0:: @ 823E8E0
+BattleFrontier_BattleDomeLobby_EventScript_23E8E0:: @ 823E8E0
+BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0:: @ 823E8E0
+BattleFrontier_BattleFactoryLobby_EventScript_23E8E0:: @ 823E8E0
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0:: @ 823E8E0
+BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0:: @ 823E8E0
+BattleFrontier_BattlePalaceLobby_EventScript_23E8E0:: @ 823E8E0
+BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0:: @ 823E8E0
+BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0:: @ 823E8E0
+BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 6
+	special sub_81A1780
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
+	lock
+	faceplayer
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23E930
+	message BattleFrontier_BattleTowerLobby_Text_23F737
+	waitmessage
+	message BattleFrontier_BattleTowerLobby_Text_23F754
+	waitmessage
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 1
+	special sub_8161F74
+	playse SE_SAVE
+	waitse
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23E930:: @ 823E930
+	setvar VAR_0x40BC, 1
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936
+	lock
+	faceplayer
+	setvar VAR_FRONTIER_FACILITY, 0
+	special SavePlayerParty
+	msgbox BattleFrontier_BattleTowerLobby_Text_240537, 4
+
+BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948
+	message BattleFrontier_BattleTowerLobby_Text_2405B3
+	waitmessage
+	multichoice 17, 6, 23, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23E984
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA91
+	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+
+BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
+	setvar VAR_0x40CE, 0
+	message BattleFrontier_BattleTowerLobby_Text_23FD3B
+	waitmessage
+	multichoice 17, 6, 24, 0
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	setvar VAR_0x8004, 15
+	special sub_81A1780
+	compare VAR_0x8004, 1
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, 4
+	fadescreen 1
+	call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
+	copyvar VAR_0x8004, VAR_RESULT
+	setvar VAR_0x8005, 3
+	special sub_80F9490
+	waitstate
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA2A
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+
+BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	special sub_81A1780
+	setvar VAR_TEMP_0, 0
+	setvar VAR_0x8004, 0
+	special sub_8161F74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 1
+	special sub_8161F74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special LoadPlayerParty
+	closemessage
+	delay 2
+	call BattleFrontier_BattleTowerLobby_EventScript_27134F
+	setvar VAR_TEMP_0, 255
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
+	incrementgamestat 30
+	setvar VAR_0x40BC, 1
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EA91:: @ 823EA91
+	msgbox BattleFrontier_BattleTowerLobby_Text_2405EC, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23E948
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EA9F:: @ 823EA9F
+	lock
+	faceplayer
+	setvar VAR_FRONTIER_FACILITY, 0
+	special SavePlayerParty
+	msgbox BattleFrontier_BattleTowerLobby_Text_2407E2, 4
+
+BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1
+	message BattleFrontier_BattleTowerLobby_Text_24085E
+	waitmessage
+	multichoice 17, 6, 23, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23EAED
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EBFA
+	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+
+BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
+	setvar VAR_0x40CE, 1
+	message BattleFrontier_BattleTowerLobby_Text_23FD3B
+	waitmessage
+	multichoice 17, 6, 24, 0
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	setvar VAR_0x8004, 15
+	special sub_81A1780
+	compare VAR_0x8004, 1
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	msgbox BattleFrontier_BattleTowerLobby_Text_240A50, 4
+	fadescreen 1
+	call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
+	copyvar VAR_0x8004, VAR_RESULT
+	setvar VAR_0x8005, 4
+	special sub_80F9490
+	waitstate
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EB93
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+
+BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	special sub_81A1780
+	setvar VAR_TEMP_0, 0
+	setvar VAR_0x8004, 0
+	special sub_8161F74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 1
+	special sub_8161F74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special LoadPlayerParty
+	closemessage
+	delay 2
+	call BattleFrontier_BattleTowerLobby_EventScript_27134F
+	setvar VAR_TEMP_0, 255
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
+	incrementgamestat 30
+	setvar VAR_0x40BC, 0
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EBFA:: @ 823EBFA
+	msgbox BattleFrontier_BattleTowerLobby_Text_240897, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23EAB1
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08
+	lock
+	faceplayer
+	setvar VAR_FRONTIER_FACILITY, 0
+	clearflag FLAG_0x152
+	special SavePlayerParty
+	msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, 4
+
+BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D
+	message BattleFrontier_BattleTowerLobby_Text_240B06
+	waitmessage
+	multichoice 17, 6, 23, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23EC59
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23ED66
+	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+
+BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
+	setvar VAR_0x40CE, 2
+	message BattleFrontier_BattleTowerLobby_Text_23FD3B
+	waitmessage
+	multichoice 17, 6, 24, 0
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	setvar VAR_0x8004, 15
+	special sub_81A1780
+	compare VAR_0x8004, 1
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, 4
+	fadescreen 1
+	call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
+	copyvar VAR_0x8004, VAR_RESULT
+	setvar VAR_0x8005, 2
+	special sub_80F9490
+	waitstate
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23ECFF
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+
+BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	special sub_81A1780
+	setvar VAR_TEMP_0, 0
+	setvar VAR_0x8004, 0
+	special sub_8161F74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 1
+	special sub_8161F74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special LoadPlayerParty
+	closemessage
+	delay 2
+	call BattleFrontier_BattleTowerLobby_EventScript_27134F
+	setvar VAR_TEMP_0, 255
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
+	incrementgamestat 30
+	setvar VAR_0x40BC, 0
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23ED66:: @ 823ED66
+	msgbox BattleFrontier_BattleTowerLobby_Text_240B3E, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23EC1D
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23ED74:: @ 823ED74
+	lock
+	faceplayer
+	setvar VAR_FRONTIER_FACILITY, 0
+	special SavePlayerParty
+	msgbox BattleFrontier_BattleTowerLobby_Text_240E15, 4
+
+BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86
+	message BattleFrontier_BattleTowerLobby_Text_240E95
+	waitmessage
+	multichoice 17, 6, 23, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23EDC2
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F3DA
+	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+
+BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
+	setvar VAR_0x40CE, 3
+	message BattleFrontier_BattleTowerLobby_Text_23FD3B
+	waitmessage
+	multichoice 17, 6, 24, 0
+	switch VAR_RESULT
+	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	setvar VAR_0x8004, 15
+	special sub_81A1780
+	compare VAR_0x8004, 1
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	msgbox BattleFrontier_BattleTowerLobby_Text_24115E, 4
+	fadescreen 1
+	call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
+	copyvar VAR_0x8004, VAR_RESULT
+	setvar VAR_0x8005, 2
+	special sub_80F9490
+	waitstate
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EE68
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
+
+BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	special sub_81A1780
+	setvar VAR_TEMP_0, 0
+	setvar VAR_0x8004, 0
+	special sub_8161F74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 1
+	special sub_8161F74
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special LoadPlayerParty
+	closemessage
+	delay 2
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 0
+	special sub_8161F74
+	call BattleFrontier_BattleTowerLobby_EventScript_27134F
+	setvar VAR_TEMP_0, 255
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
+	incrementgamestat 30
+	specialvar VAR_RESULT, sub_80093CC
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F2C5
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7
+	lock
+	faceplayer
+	message BattleFrontier_BattleTowerLobby_Text_23F8CD
+	waitmessage
+	multichoice 16, 4, 109, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23EF32
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EF4C
+	case 2, BattleFrontier_BattleTowerLobby_EventScript_23EF66
+	case 3, BattleFrontier_BattleTowerLobby_EventScript_23EF80
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23EF80
+	release
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32
+	msgbox BattleFrontier_BattleTowerLobby_Text_23F969, 4
+	setvar VAR_0x8004, 1
+	call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+	lock
+	faceplayer
+	goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C
+	msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, 4
+	setvar VAR_0x8004, 2
+	call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+	lock
+	faceplayer
+	goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66
+	msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, 4
+	setvar VAR_0x8004, 3
+	call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+	lock
+	faceplayer
+	goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EF80:: @ 823EF80
+	msgbox BattleFrontier_BattleTowerLobby_Text_23FA0F, 4
+	release
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EF8A:: @ 823EF8A
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFA1
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFAB
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EFA1:: @ 823EFA1
+	msgbox BattleFrontier_BattleTowerLobby_Text_23FA4F, 4
+	release
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EFAB:: @ 823EFAB
+	msgbox BattleFrontier_BattleTowerLobby_Text_23FA83, 4
+	release
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EFB5:: @ 823EFB5
+	msgbox BattleFrontier_BattleTowerLobby_Text_23FAC0, 2
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EFBE:: @ 823EFBE
+	msgbox BattleFrontier_BattleTowerLobby_Text_23FB26, 2
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 2
+	special sub_81A1780
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 3
+	special sub_81A1780
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F02B:: @ 823F02B
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F046
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F08B
+
+BattleFrontier_BattleTowerLobby_EventScript_23F046:: @ 823F046
+	switch VAR_0x40CE
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F06F
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F07D
+	msgbox BattleFrontier_BattleTowerLobby_Text_24038B, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F06F:: @ 823F06F
+	msgbox BattleFrontier_BattleTowerLobby_Text_240027, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F07D:: @ 823F07D
+	msgbox BattleFrontier_BattleTowerLobby_Text_2401DB, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F08B:: @ 823F08B
+	switch VAR_0x40CE
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0B4
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F0C2
+	msgbox BattleFrontier_BattleTowerLobby_Text_24046B, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F0B4:: @ 823F0B4
+	msgbox BattleFrontier_BattleTowerLobby_Text_24010B, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2
+	msgbox BattleFrontier_BattleTowerLobby_Text_2402BD, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	special sub_81A1780
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F0E3:: @ 823F0E3
+	special LoadPlayerParty
+
+BattleFrontier_BattleTowerLobby_EventScript_23F0E6:: @ 823F0E6
+	special CloseLink
+	msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4
+
+BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1
+	release
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F0F3:: @ 823F0F3
+	special SavePlayerParty
+	setvar VAR_0x8004, 3
+	call BattleFrontier_BattleTowerLobby_EventScript_23F272
+	special sub_81A1780
+	setvar VAR_RESULT, 0
+
+BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108
+	setvar VAR_0x8004, 12
+	special sub_8161F74
+	delay 1
+	compare VAR_RESULT, 6
+	goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23F108
+	call BattleFrontier_BattleTowerLobby_EventScript_23F135
+	clearflag FLAG_0x077
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6
+	setvar VAR_TEMP_0, 0
+	waitstate
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135
+	call BattleFrontier_BattleTowerLobby_EventScript_23F1A7
+	compare VAR_0x40CE, 3
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152
+	msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F15B
+
+BattleFrontier_BattleTowerLobby_EventScript_23F152:: @ 823F152
+	messageautoscroll BattleFrontier_BattleTowerLobby_Text_23FE11
+	waitmessage
+	delay 48
+
+BattleFrontier_BattleTowerLobby_EventScript_23F15B:: @ 823F15B
+	closemessage
+	call BattleFrontier_BattleTowerLobby_EventScript_23F1E8
+	call BattleFrontier_BattleTowerLobby_EventScript_23F22D
+	applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F195
+	applymovement 255, BattleFrontier_BattleTowerLobby_Movement_23F195
+	waitmovement 0
+	opendoor VAR_0x8004, 1
+	waitdooranim
+	applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F199
+	applymovement 255, BattleFrontier_BattleTowerLobby_Movement_23F19C
+	waitmovement 0
+	closedoor VAR_0x8004, 1
+	waitdooranim
+	return
+
+BattleFrontier_BattleTowerLobby_Movement_23F195: @ 823F195
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattleTowerLobby_Movement_23F199: @ 823F199
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerLobby_Movement_23F19C: @ 823F19C
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D4
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D9
+	compare VAR_0x40CE, 2
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1DE
+	compare VAR_0x40CE, 3
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1E3
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F1D4:: @ 823F1D4
+	bufferstdstring 0, 19
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F1D9:: @ 823F1D9
+	bufferstdstring 0, 20
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F1DE:: @ 823F1DE
+	bufferstdstring 0, 21
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3
+	bufferstdstring 0, 22
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F215
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F21B
+	compare VAR_0x40CE, 2
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F221
+	compare VAR_0x40CE, 3
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F227
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F215:: @ 823F215
+	setvar VAR_LAST_TALKED, 1
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F21B:: @ 823F21B
+	setvar VAR_LAST_TALKED, 7
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F221:: @ 823F221
+	setvar VAR_LAST_TALKED, 8
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227
+	setvar VAR_LAST_TALKED, 9
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F25A
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F260
+	compare VAR_0x40CE, 2
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F266
+	compare VAR_0x40CE, 3
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F26C
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F25A:: @ 823F25A
+	setvar VAR_0x8004, 6
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F260:: @ 823F260
+	setvar VAR_0x8004, 10
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F266:: @ 823F266
+	setvar VAR_0x8004, 14
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C
+	setvar VAR_0x8004, 18
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272
+	compare VAR_0x40CE, 0
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F29F
+	compare VAR_0x40CE, 1
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2A5
+	compare VAR_0x40CE, 2
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2AB
+	compare VAR_0x40CE, 3
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2B1
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F29F:: @ 823F29F
+	setvar VAR_0x8005, 3
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F2A5:: @ 823F2A5
+	setvar VAR_0x8005, 4
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F2AB:: @ 823F2AB
+	setvar VAR_0x8005, 2
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F2B1:: @ 823F2B1
+	setvar VAR_0x8005, 2
+	return
+
+BattleFrontier_BattleArenaLobby_EventScript_23F2B7:: @ 823F2B7
+BattleFrontier_BattleDomeLobby_EventScript_23F2B7:: @ 823F2B7
+BattleFrontier_BattleDomePreBattleRoom_EventScript_23F2B7:: @ 823F2B7
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7:: @ 823F2B7
+BattleFrontier_BattlePalaceLobby_EventScript_23F2B7:: @ 823F2B7
+BattleFrontier_BattlePikeLobby_EventScript_23F2B7:: @ 823F2B7
+BattleFrontier_BattlePyramidLobby_EventScript_23F2B7:: @ 823F2B7
+BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	special sub_81A1780
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
+	setvar VAR_0x8004, 9
+	message OldaleTown_PokemonCenter_2F_Text_278091
+	waitmessage
+	setvar VAR_0x8005, 0
+	special sub_80B2DA4
+	waitstate
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF
+	compare VAR_RESULT, 2
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2
+	compare VAR_RESULT, 3
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F327
+	compare VAR_RESULT, 4
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F351
+	compare VAR_RESULT, 5
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	compare VAR_RESULT, 6
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5
+	compare VAR_RESULT, 11
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327
+	special CloseLink
+	compare VAR_0x8005, 3
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F
+	msgbox BattleFrontier_BattleTowerLobby_Text_278255, 4
+	release
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F
+	msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, 4
+	msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4
+	release
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351
+	msgbox BattleFrontier_BattleTowerLobby_Text_241240, 4
+	special CloseLink
+	msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, 4
+	release
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366
+	special CloseLink
+	compare VAR_0x8005, 0
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F394
+	compare VAR_0x8005, 1
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F39D
+	compare VAR_0x8005, 2
+	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F3A6
+	msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4
+	release
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F394:: @ 823F394
+	msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, 4
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F39D:: @ 823F39D
+	msgbox BattleFrontier_BattleTowerLobby_Text_241285, 4
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6
+	msgbox BattleFrontier_BattleTowerLobby_Text_2412B3, 4
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF
+	incrementgamestat 30
+	setvar VAR_0x40BC, 0
+	message BattleFrontier_BattleTowerLobby_Text_24144D
+	waitmessage
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 1
+	special sub_8161F74
+	special sub_80A08CC
+	waitstate
+	playse SE_SAVE
+	waitse
+	special sub_80B3BC4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F3DA:: @ 823F3DA
+	msgbox BattleFrontier_BattleTowerLobby_Text_240ED2, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23ED86
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8
+	setvar VAR_0x8004, 20
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F3F3
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3
+	message BattleFrontier_BattleTowerLobby_Text_2792CD
+	waitmessage
+	multichoice 16, 6, 81, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F463
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F430
+	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430
+	call BattleFrontier_BattleTowerLobby_EventScript_277B30
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496
+	compare VAR_RESULT, 5
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3
+	compare VAR_RESULT, 8
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F430
+	compare VAR_RESULT, 11
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
+	release
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463
+	call BattleFrontier_BattleTowerLobby_EventScript_277B35
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496
+	compare VAR_RESULT, 5
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3
+	compare VAR_RESULT, 8
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F463
+	compare VAR_RESULT, 11
+	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
+	release
+	return
+
+BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496
+	incrementgamestat 30
+	setvar VAR_0x40BC, 0
+	message BattleFrontier_BattleTowerLobby_Text_24144D
+	waitmessage
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 1
+	special sub_8161F74
+	special sub_80A08CC
+	waitstate
+	playse SE_SAVE
+	waitse
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F4BE:: @ 823F4BE
+	lockall
+	msgbox BattleFrontier_BattleTowerLobby_Text_241540, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F4CD:: @ 823F4CD
+	message BattleFrontier_BattleTowerLobby_Text_241563
+	waitmessage
+	multichoice 17, 2, 97, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F520
+	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F52E
+	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F53C
+	case 3, BattleFrontier_BattleTowerLobby_EventScript_23F54A
+	case 4, BattleFrontier_BattleTowerLobby_EventScript_23F558
+	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F558
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F520:: @ 823F520
+	msgbox BattleFrontier_BattleTowerLobby_Text_241586, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F52E:: @ 823F52E
+	msgbox BattleFrontier_BattleTowerLobby_Text_241693, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F53C:: @ 823F53C
+	msgbox BattleFrontier_BattleTowerLobby_Text_241777, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F54A:: @ 823F54A
+	msgbox BattleFrontier_BattleTowerLobby_Text_24187E, 4
+	goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F558:: @ 823F558
+	releaseall
+	end
+
+BattleFrontier_BattleTowerLobby_EventScript_23F55A: @ 823F55A
+	.string "I’ll direct you to your BATTLE ROOM now.$"
+
+BattleFrontier_BattleTowerLobby_Text_23F583: @ 823F583
+	.string "Excuse me!\p"
+	.string "You didn’t save before you quit your\n"
+	.string "challenge last time.\p"
+	.string "Because of that, your challenge so far\n"
+	.string "has been disqualified. Sorry!$"
+
+BattleFrontier_BattleTowerLobby_Text_23F60D: @ 823F60D
+	.string "Congratulations!\n"
+	.string "You’ve beaten all seven TRAINERS!\p"
+	.string "$"
+
+BattleFrontier_BattleTowerLobby_Text_23F641: @ 823F641
+	.string "For beating seven TRAINERS in a row,\n"
+	.string "you have earned this fabulous prize!\p"
+	.string "$"
+
+SlateportCity_BattleTentLobby_Text_23F68C: @ 823F68C
+	.string "{PLAYER} received the prize\n"
+	.string "{STR_VAR_1}.$"
+
+SlateportCity_BattleTentLobby_Text_23F6A6: @ 823F6A6
+	.string "Oh, your BAG appears to be full.\p"
+	.string "Please make room in your BAG, then come\n"
+	.string "see me.$"
+
+BattleFrontier_BattleTowerLobby_Text_23F6F7: @ 823F6F7
+	.string "Thank you for playing!\p"
+	.string "$"
+
+BattleFrontier_BattleTowerLobby_Text_23F70F: @ 823F70F
+	.string "Your record will be saved.\n"
+	.string "Please wait.$"
+
+BattleFrontier_BattleTowerLobby_Text_23F737: @ 823F737
+	.string "We’ve been waiting for you!\p"
+	.string "$"
+
+BattleFrontier_BattleTowerLobby_Text_23F754: @ 823F754
+	.string "Before entering a BATTLE ROOM, your\n"
+	.string "progress will be saved. Please wait.$"
+
+BattleFrontier_BattleTowerLobby_Text_23F79D: @ 823F79D
+	.string "You’re finally about to face the\n"
+	.string "50th TRAINER.\p"
+	.string "From here on, every time you beat seven\n"
+	.string "TRAINERS in a row, your POKéMON will\l"
+	.string "receive a commemorative RIBBON.\p"
+	.string "Good luck!$"
+
+BattleFrontier_BattleTowerLobby_Text_23F844: @ 823F844
+	.string "Here are some RIBBONS for beating\n"
+	.string "seven tough TRAINERS in a row.\p"
+	.string "{PLAYER} received some RIBBONS!$"
+
+BattleFrontier_BattleTowerLobby_Text_23F89F: @ 823F89F
+	.string "{PLAYER} put the RIBBONS on\n"
+	.string "the challenger POKéMON.$"
+
+BattleFrontier_BattleTowerLobby_Text_23F8CD: @ 823F8CD
+	.string "Excuse me, do you have a moment?\p"
+	.string "Can you describe your feelings when\n"
+	.string "you’re about to begin a BATTLE TOWER\l"
+	.string "match, or when you’ve either won or\l"
+	.string "lost a match?$"
+
+BattleFrontier_BattleTowerLobby_Text_23F969: @ 823F969
+	.string "Okay, what are your feelings when\n"
+	.string "you’re about to begin a match?$"
+
+BattleFrontier_BattleTowerLobby_Text_23F9AA: @ 823F9AA
+	.string "What do you feel when you’ve won\n"
+	.string "a match?$"
+
+BattleFrontier_BattleTowerLobby_Text_23F9D4: @ 823F9D4
+	.string "Can I hear about your feelings when\n"
+	.string "you have lost a match?$"
+
+BattleFrontier_BattleTowerLobby_Text_23FA0F: @ 823FA0F
+	.string "Oh, so you don’t think much about it?\n"
+	.string "You’re one cool customer.$"
+
+BattleFrontier_BattleTowerLobby_Text_23FA4F: @ 823FA4F
+	.string "Hunh? You changed your mind?\n"
+	.string "I guess you’re fickle.$"
+
+BattleFrontier_BattleTowerLobby_Text_23FA83: @ 823FA83
+	.string "Okay, so that’s how you feel?\n"
+	.string "That’s quite original.\p"
+	.string "Thanks!$"
+
+BattleFrontier_BattleTowerLobby_Text_23FAC0: @ 823FAC0
+	.string "The number of matches you win in a row\n"
+	.string "is recorded.\p"
+	.string "I’d better not get beaten in\n"
+	.string "an embarrassing way!$"
+
+BattleFrontier_BattleTowerLobby_Text_23FB26: @ 823FB26
+	.string "Once you’ve entered the BATTLE TOWER,\n"
+	.string "you can’t leave until you either lose\l"
+	.string "or you beat seven TRAINERS in a row.\p"
+	.string "You’d best be certain that you’re up\n"
+	.string "to the challenge.$"
+
+BattleFrontier_BattleTowerLobby_Text_23FBCE: @ 823FBCE
+	.string "Welcome to the BATTLE TOWER\n"
+	.string "DOUBLE BATTLE CORNER!\p"
+	.string "Unfortunately, the BATTLE ROOMS\n"
+	.string "are still under construction.\p"
+	.string "Please come back when the work\n"
+	.string "is completed.$"
+
+BattleFrontier_BattleTowerLobby_Text_23FC6B: @ 823FC6B
+	.string "Welcome to the BATTLE TOWER\n"
+	.string "MULTI BATTLE CORNER!\p"
+	.string "Unfortunately, the BATTLE ROOMS\n"
+	.string "are still under construction.\p"
+	.string "Please come back when the work\n"
+	.string "is completed.$"
+
+BattleFrontier_BattleTowerLobby_Text_23FD07: @ 823FD07
+	.string "We look forward to seeing you on\n"
+	.string "another challenge!$"
+
+BattleFrontier_BattleTowerLobby_Text_23FD3B: @ 823FD3B
+	.string "The BATTLE ROOM offers two levels\n"
+	.string "of challenge, Level 50 and Open Level.\l"
+	.string "Which is your choice?$"
+
+BattleFrontier_BattleTowerLobby_Text_23FD9A: @ 823FD9A
+	.string "Please select the POKéMON you wish\n"
+	.string "to enter.$"
+
+BattleFrontier_BattleTowerLobby_Text_23FDC7: @ 823FDC7
+	.string "Before entering a BATTLE ROOM, your\n"
+	.string "progress must be saved. Is that okay?$"
+
+BattleFrontier_BattleTowerLobby_Text_23FE11: @ 823FE11
+	.string "I will now show you to the\n"
+	.string "{STR_VAR_1} BATTLE ROOM.$"
+
+BattleFrontier_BattleTowerLobby_Text_23FE3C: @ 823FE3C
+	.string "Shall I record your last BATTLE TOWER\n"
+	.string "match on your FRONTIER PASS?$"
+
+BattleFrontier_BattleTowerLobby_Text_23FE7F: @ 823FE7F
+	.string "Excuse me!\p"
+	.string "You don’t have {STR_VAR_2} eligible POKéMON.\p"
+	.string "You must have {STR_VAR_2} different POKéMON\n"
+	.string "of Level 50 or less to enter.\p"
+	.string "They also must be holding different\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Please come see me when you are ready.$"
+
+BattleFrontier_BattleTowerLobby_Text_23FF5D: @ 823FF5D
+	.string "Excuse me!\p"
+	.string "You don’t have {STR_VAR_2} eligible POKéMON.\p"
+	.string "You must have {STR_VAR_2} different POKéMON\n"
+	.string "to enter.\p"
+	.string "They also must be holding different\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Please come see me when you are ready.$"
+
+BattleFrontier_BattleTowerLobby_Text_240027: @ 8240027
+	.string "Excuse me!\p"
+	.string "You don’t have three eligible POKéMON.\p"
+	.string "You must have three different POKéMON\n"
+	.string "of Level 50 or less to enter.\p"
+	.string "They also must be holding different\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Please come see me when you are ready.$"
+
+BattleFrontier_BattleTowerLobby_Text_24010B: @ 824010B
+	.string "Excuse me!\p"
+	.string "You don’t have three eligible POKéMON.\p"
+	.string "You must have three different POKéMON\n"
+	.string "to enter.\p"
+	.string "They also must be holding different\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Please come see me when you are ready.$"
+
+BattleFrontier_BattleTowerLobby_Text_2401DB: @ 82401DB
+	.string "Excuse me!\p"
+	.string "You don’t have four eligible POKéMON.\p"
+	.string "You must have four different POKéMON\n"
+	.string "of Level 50 or less to enter.\p"
+	.string "They also must be holding different\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Please come see me when you are ready.$"
+
+BattleFrontier_BattleTowerLobby_Text_2402BD: @ 82402BD
+	.string "Excuse me!\p"
+	.string "You don’t have four eligible POKéMON.\p"
+	.string "You must have four different POKéMON\n"
+	.string "to enter.\p"
+	.string "They also must be holding different\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Please come see me when you are ready.$"
+
+BattleFrontier_BattleTowerLobby_Text_24038B: @ 824038B
+	.string "Excuse me!\p"
+	.string "You don’t have two eligible POKéMON.\p"
+	.string "You must have two different POKéMON\n"
+	.string "of Level 50 or less to enter.\p"
+	.string "They also must be holding different\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Please come see me when you are ready.$"
+
+BattleFrontier_BattleTowerLobby_Text_24046B: @ 824046B
+	.string "Excuse me!\p"
+	.string "You don’t have two eligible POKéMON.\p"
+	.string "You must have two different POKéMON\n"
+	.string "to enter.\p"
+	.string "They also must be holding different\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Please come see me when you are ready.$"
+
+BattleFrontier_BattleTowerLobby_Text_240537: @ 8240537
+	.string "Where the talents of TRAINERS\n"
+	.string "are put to the test!\p"
+	.string "Welcome to the BATTLE TOWER!\p"
+	.string "I am your guide to the SINGLE\n"
+	.string "BATTLE ROOMS.$"
+
+BattleFrontier_BattleTowerLobby_Text_2405B3: @ 82405B3
+	.string "Would you like to take the SINGLE\n"
+	.string "BATTLE ROOM challenge?$"
+
+BattleFrontier_BattleTowerLobby_Text_2405EC: @ 82405EC
+	.string "The BATTLE TOWER’s SINGLE BATTLE\n"
+	.string "ROOMS are facilities for conducting\l"
+	.string "SINGLE BATTLES with three POKéMON.\p"
+	.string "There are many SINGLE BATTLE ROOMS\n"
+	.string "in the BATTLE TOWER for team battles.\p"
+	.string "In each of the SINGLE BATTLE ROOMS,\n"
+	.string "seven TRAINERS await your challenge.\p"
+	.string "If you manage to defeat all seven,\n"
+	.string "you will earn Battle Points.\p"
+	.string "If you want to interrupt your\n"
+	.string "challenge, please save the game.\p"
+	.string "If you don’t save before interrupting,\n"
+	.string "you will be disqualified.$"
+
+BattleFrontier_BattleTowerLobby_Text_2407A6: @ 82407A6
+	.string "Now please select the three POKéMON\n"
+	.string "that are to be entered.$"
+
+BattleFrontier_BattleTowerLobby_Text_2407E2: @ 82407E2
+	.string "Where the talents of TRAINERS\n"
+	.string "are put to the test!\p"
+	.string "Welcome to the BATTLE TOWER!\p"
+	.string "I am your guide to the DOUBLE\n"
+	.string "BATTLE ROOMS.$"
+
+BattleFrontier_BattleTowerLobby_Text_24085E: @ 824085E
+	.string "Would you like to take the DOUBLE\n"
+	.string "BATTLE ROOM challenge?$"
+
+BattleFrontier_BattleTowerLobby_Text_240897: @ 8240897
+	.string "The BATTLE TOWER’s DOUBLE BATTLE\n"
+	.string "ROOMS are facilities for conducting\l"
+	.string "DOUBLE BATTLES with four POKéMON.\p"
+	.string "There are many DOUBLE BATTLE ROOMS\n"
+	.string "in the BATTLE TOWER for team battles.\p"
+	.string "In each of the DOUBLE BATTLE ROOMS,\n"
+	.string "seven TRAINERS await your challenge.\p"
+	.string "If you manage to defeat all seven,\n"
+	.string "you will earn Battle Points.\p"
+	.string "If you want to interrupt your\n"
+	.string "challenge, please save the game.\p"
+	.string "If you don’t save before interrupting,\n"
+	.string "you will be disqualified.$"
+
+BattleFrontier_BattleTowerLobby_Text_240A50: @ 8240A50
+	.string "Now please select the four POKéMON\n"
+	.string "that are to be entered.$"
+
+BattleFrontier_BattleTowerLobby_Text_240A8B: @ 8240A8B
+	.string "Where the talents of TRAINERS\n"
+	.string "are put to the test!\p"
+	.string "Welcome to the BATTLE TOWER!\p"
+	.string "I am your guide to the MULTI\n"
+	.string "BATTLE ROOMS.$"
+
+BattleFrontier_BattleTowerLobby_Text_240B06: @ 8240B06
+	.string "Would you like to take the MULTI\n"
+	.string "BATTLE ROOM challenge?$"
+
+BattleFrontier_BattleTowerLobby_Text_240B3E: @ 8240B3E
+	.string "The BATTLE TOWER’s MULTI BATTLE\n"
+	.string "ROOMS are facilities for conducting\l"
+	.string "MULTI BATTLES.\p"
+	.string "For MULTI BATTLES, you must partner\n"
+	.string "with a TRAINER in the TOWER and enter\l"
+	.string "with two POKéMON each.\p"
+	.string "Inside the TOWER is a room named\n"
+	.string "the BATTLE SALON where you may meet\l"
+	.string "other TRAINERS.\p"
+	.string "There, you must find a TRAINER to act\n"
+	.string "as your partner in MULTI BATTLES.\p"
+	.string "Once you have partnered up, you will\n"
+	.string "be shown to a MULTI BATTLE ROOM.\p"
+	.string "In the MULTI BATTLE ROOM, seven\n"
+	.string "tag teams await your challenge.\p"
+	.string "If you manage to defeat all seven\n"
+	.string "teams, you will earn Battle Points.\p"
+	.string "If you want to interrupt your\n"
+	.string "challenge, please save the game.\p"
+	.string "If you don’t save before interrupting,\n"
+	.string "you will be disqualified.$"
+
+BattleFrontier_BattleTowerLobby_Text_240DDB: @ 8240DDB
+	.string "Now please select the two POKéMON\n"
+	.string "that are to be entered.$"
+
+BattleFrontier_BattleTowerLobby_Text_240E15: @ 8240E15
+	.string "Where the talents of TRAINERS\n"
+	.string "are put to the test!\p"
+	.string "Welcome to the BATTLE TOWER!\p"
+	.string "I am your guide to the LINK MULTI\n"
+	.string "BATTLE ROOMS.$"
+
+BattleFrontier_BattleTowerLobby_Text_240E95: @ 8240E95
+	.string "Would you like to take the LINK MULTI\n"
+	.string "BATTLE ROOM challenge?$"
+
+BattleFrontier_BattleTowerLobby_Text_240ED2: @ 8240ED2
+	.string "The BATTLE TOWER’s MULTI BATTLE\n"
+	.string "ROOMS are facilities for conducting\l"
+	.string "MULTI BATTLES with a friend.\p"
+	.string "You must link with your friend using\n"
+	.string "Wireless Adapters or a Game Boy\l"
+	.string "Advance Game Link cable.\p"
+	.string "You must partner with your friend and\n"
+	.string "enter two different kinds of POKéMON.\p"
+	.string "There are many MULTI BATTLE ROOMS\n"
+	.string "in the BATTLE TOWER for team battles.\p"
+	.string "In a MULTI BATTLE ROOM, seven\n"
+	.string "tag teams await you and your friend\l"
+	.string "to make a tag-team challenge.\p"
+	.string "If you manage to defeat all seven\n"
+	.string "teams, you will earn Battle Points.\p"
+	.string "Please beware that unlike other ROOMS,\n"
+	.string "you may not interrupt your challenge.\p"
+	.string "Once you start, you must battle seven\n"
+	.string "MULTI BATTLES in a row nonstop.$"
+
+BattleFrontier_BattleTowerLobby_Text_24115E: @ 824115E
+	.string "Now please select the two POKéMON\n"
+	.string "that are to be entered.$"
+
+BattleFrontier_BattleTowerLobby_Text_241198: @ 8241198
+	.string "You have chosen the same kind of\n"
+	.string "POKéMON as your friend.\p"
+	.string "Please choose two POKéMON different\n"
+	.string "from your friend’s, match the level\l"
+	.string "you wish to enter, and register again.$"
+
+BattleFrontier_BattleTowerLobby_Text_241240: @ 8241240
+	.string "The LINK MULTI BATTLE ROOM challenge\n"
+	.string "is only for two linked players.$"
+
+BattleFrontier_BattleTowerLobby_Text_241285: @ 8241285
+	.string "Your friend has also selected\n"
+	.string "the POKéMON {STR_VAR_1}.$"
+
+BattleFrontier_BattleTowerLobby_Text_2412B3: @ 82412B3
+	.string "Your friend has also selected the\n"
+	.string "POKéMON {STR_VAR_1} and {STR_VAR_2}.$"
+
+BattleFrontier_BattleTowerLobby_Text_2412E8: @ 82412E8
+	.string "Your friend has chosen a different\n"
+	.string "battle level.$"
+
+BattleFrontier_BattleTowerLobby_Text_241319: @ 8241319
+	.string "Your friend has chosen a different\n"
+	.string "battle level.\p"
+	.string "Your friend has also selected\n"
+	.string "the POKéMON {STR_VAR_1}.$"
+
+BattleFrontier_BattleTowerLobby_Text_241378: @ 8241378
+	.string "Your friend has chosen a different\n"
+	.string "battle level.\p"
+	.string "Your friend has also selected the\n"
+	.string "POKéMON {STR_VAR_1} and {STR_VAR_2}.$"
+
+BattleFrontier_BattleTowerLobby_Text_2413DE: @ 82413DE
+	.string "Please choose two POKéMON different\n"
+	.string "from your friend’s, match the level\l"
+	.string "you wish to enter, and register again.$"
+
+BattleFrontier_BattleTowerLobby_Text_24144D: @ 824144D
+	.string "I will save the game before\n"
+	.string "showing you in. Please wait.$"
+
+BattleFrontier_BattleTowerLobby_Text_241486: @ 8241486
+	.string "Congratulations!\n"
+	.string "You have defeated the SALON MAIDEN\l"
+	.string "and swept seven TRAINERS!$"
+
+BattleFrontier_BattleTowerLobby_Text_2414D4: @ 82414D4
+	.string "In recognition of your infinite talent,\n"
+	.string "we award you these Battle Point(s).$"
+
+BattleFrontier_BattleArenaLobby_Text_241520: @ 8241520
+BattleFrontier_BattleDomeLobby_Text_241520: @ 8241520
+BattleFrontier_BattleFactoryLobby_Text_241520: @ 8241520
+BattleFrontier_BattlePalaceLobby_Text_241520: @ 8241520
+BattleFrontier_BattlePikeLobby_Text_241520: @ 8241520
+BattleFrontier_BattlePyramidLobby_Text_241520: @ 8241520
+BattleFrontier_BattleTowerLobby_Text_241520: @ 8241520
+	.string "{PLAYER} obtained {STR_VAR_1} Battle Point(s).$"
+
+BattleFrontier_BattleTowerLobby_Text_241540: @ 8241540
+	.string "The BATTLE TOWER rules are listed.$"
+
+BattleFrontier_BattleTowerLobby_Text_241563: @ 8241563
+	.string "Which heading do you want to read?$"
+
+BattleFrontier_BattleTowerLobby_Text_241586: @ 8241586
+	.string "The BATTLE TOWER is a facility where\n"
+	.string "four types of battles are waged--\l"
+	.string "SINGLE BATTLE, DOUBLE BATTLE, MULTI\l"
+	.string "BATTLE, and LINK MULTI BATTLE.\p"
+	.string "For each of these types, there are\n"
+	.string "separate BATTLE ROOMS.\p"
+	.string "Please speak with a guide offering\n"
+	.string "the type of battle you wish to enter.$"
+
+BattleFrontier_BattleTowerLobby_Text_241693: @ 8241693
+	.string "Depending on the BATTLE ROOM you are\n"
+	.string "entering, you will be required to take\l"
+	.string "a certain number of POKéMON.\p"
+	.string "The SINGLE BATTLE mode requires\n"
+	.string "three POKéMON.\p"
+	.string "The DOUBLE BATTLE mode requires four,\n"
+	.string "and the MULTI modes both require two.$"
+
+BattleFrontier_BattleTowerLobby_Text_241777: @ 8241777
+	.string "The BATTLE SALON is where you must\n"
+	.string "find a partner to form a tag team for\l"
+	.string "the MULTI BATTLE ROOM challenge.\p"
+	.string "Choose the best partner for you by\n"
+	.string "examining other TRAINERS’\l"
+	.string "POKéMON and their moves.\p"
+	.string "You may choose a new tag partner\n"
+	.string "after winning seven straight matches.$"
+
+BattleFrontier_BattleTowerLobby_Text_24187E: @ 824187E
+	.string "The LINK MULTI BATTLE Mode is for two\n"
+	.string "friends to mount a challenge together.\p"
+	.string "You and your friend must be linked with\n"
+	.string "Wireless Adapters or a GBA Game Link\l"
+	.string "cable.\p"
+	.string "You must choose two POKéMON at\n"
+	.string "the registration counter.\p"
+	.string "These POKéMON must be different\n"
+	.string "from those of your friend.\p"
+	.string "You may not interrupt this challenge\n"
+	.string "in the middle, unlike other modes.$"
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
new file mode 100644
index 000000000..0c730f37d
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
@@ -0,0 +1,14 @@
+BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, 8, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, 1, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, 14, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, 1, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, 1, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, 7, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, 10, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716
+	object_event 8, 246, 0, 15, 13, 3, 15, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864
+	object_event 9, 247, 0, 4, 12, 3, 10, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865
+
+BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C
+	map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
index 293fd6418..cc55ae591 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
-	.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout
 	.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
new file mode 100644
index 000000000..a2f003b85
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -0,0 +1,1822 @@
+BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92
+	map_script 5, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7
+	map_script 3, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0
+	map_script 4, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14
+	map_script 2, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23
+	.byte 0
+
+BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
+	setvar VAR_0x8004, 17
+	special sub_81A8E7C
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
+	checkflag FLAG_0x152
+	goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA
+	clearflag FLAG_0x2C7
+	clearflag FLAG_0x2C8
+	clearflag FLAG_0x2C9
+	clearflag FLAG_0x2CA
+	clearflag FLAG_0x2CB
+	clearflag FLAG_0x2CC
+	setflag FLAG_0x360
+	setflag FLAG_0x361
+	setvar VAR_0x8004, 10
+	special sub_8161F74
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA
+	setvar VAR_OBJ_GFX_ID_0, 7
+	setvar VAR_OBJ_GFX_ID_1, 7
+	setvar VAR_OBJ_GFX_ID_2, 7
+	setvar VAR_OBJ_GFX_ID_3, 7
+	setvar VAR_OBJ_GFX_ID_4, 7
+	setvar VAR_OBJ_GFX_ID_5, 7
+	setvar VAR_OBJ_GFX_ID_6, 7
+	setvar VAR_OBJ_GFX_ID_7, 7
+	setvar VAR_TEMP_1, 1
+	setvar VAR_TEMP_3, 1
+	setobjectxyperm 1, 10, 2
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14
+	map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E
+	.2byte 0
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E
+	turnobject 255, 2
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41
+	map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35
+	.2byte 0
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35:: @ 8243E35
+	lockall
+	setvar VAR_TEMP_3, 0
+	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41
+	lockall
+	applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75
+	waitmovement 0
+	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77
+	waitmovement 0
+	moveobjectoffscreen 1
+	applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6
+	waitmovement 0
+	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, 4
+	special HealPlayerParty
+	setvar VAR_TEMP_1, 1
+	releaseall
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75: @ 8243E75
+	walk_down
+	step_end
+
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77: @ 8243E77
+	walk_left
+	walk_in_place_fastest_down
+	step_end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A
+	lock
+	faceplayer
+	message BattleFrontier_BattleTowerMultiBattleRoom_Text_244094
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D
+	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, 4
+	release
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 6
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5
+	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, 4
+	closemessage
+	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6
+	waitmovement 0
+	opendoor 10, 1
+	waitdooranim
+	call BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4
+	closedoor 10, 1
+	waitdooranim
+	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6
+	waitstate
+	releaseall
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4:: @ 8243EE4
+	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26
+	applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A
+	waitmovement 0
+	return
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EF6: @ 8243EF6
+	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26
+	applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E
+	waitmovement 0
+	return
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08
+	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26
+	applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22
+	waitmovement 0
+	return
+
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A: @ 8243F1A
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E: @ 8243F1E
+	walk_right
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22: @ 8243F22
+	walk_left
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26: @ 8243F26
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, 0
+	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
+	checkflag FLAG_0x152
+	goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
+	setvar VAR_0x8004, 11
+	setvar VAR_0x8005, 0
+	special sub_8161F74
+	waitmessage
+	waitbuttonpress
+	setvar VAR_0x8004, 11
+	setvar VAR_0x8005, 1
+	special sub_8161F74
+	waitmessage
+	waitbuttonpress
+	setvar VAR_0x8004, 11
+	setvar VAR_0x8005, 2
+	special sub_8161F74
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
+	case 127, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
+	setvar VAR_0x8004, 11
+	setvar VAR_0x8005, 3
+	special sub_8161F74
+	waitmessage
+	waitbuttonpress
+	closemessage
+	compare VAR_FACING, 1
+	call_if 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4
+	compare VAR_FACING, 1
+	call_if 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF
+	removeobject VAR_LAST_TALKED
+	setflag FLAG_0x152
+	warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3
+	waitstate
+	release
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3:: @ 8243FC3
+	setvar VAR_0x8004, 11
+	setvar VAR_0x8005, 4
+	special sub_8161F74
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4:: @ 8243FD4
+	applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FEA
+	waitmovement 0
+	return
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF:: @ 8243FDF
+	applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FF2
+	waitmovement 0
+	return
+
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FEA: @ 8243FEA
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	step_end
+
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FF2: @ 8243FF2
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	step_end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB:: @ 8243FFB
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, 1
+	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008:: @ 8244008
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, 2
+	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015:: @ 8244015
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, 3
+	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022:: @ 8244022
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, 4
+	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F:: @ 824402F
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, 5
+	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C:: @ 824403C
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, 6
+	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049:: @ 8244049
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, 7
+	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
+	end
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244056: @ 8244056
+	.string "Please find a partner from out of\n"
+	.string "the TRAINERS gathered here.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244094: @ 8244094
+	.string "{PLAYER}, you have not found a partner\n"
+	.string "for your tag team.\p"
+	.string "Would you like to quit looking and\n"
+	.string "return to the reception counter?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C: @ 824410C
+	.string "Then, please find a partner from\n"
+	.string "the TRAINERS gathered here.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244149:: @ 8244149
+	.string "Thank you for choosing a partner.\p"
+	.string "I will now show you to your\n"
+	.string "MULTI BATTLE ROOM.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24419A:: @ 824419A
+	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n"
+	.string "You can call me {STR_VAR_3}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2441CA:: @ 82441CA
+	.string "On {STR_VAR_1}’s advice, I brought\n"
+	.string "one {STR_VAR_3} with {STR_VAR_2} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2441F7:: @ 82441F7
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
+	.string "Please, let me join you as a tag team.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24422E:: @ 824422E
+	.string "Thank you!\n"
+	.string "I’ll go register right now.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244255:: @ 8244255
+	.string "I really wanted to form a tag team\n"
+	.string "with you, {PLAYER}…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244286:: @ 8244286
+	.string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n"
+	.string "My name is {STR_VAR_3}.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2442B2:: @ 82442B2
+	.string "I got advice from {STR_VAR_1} and chose\n"
+	.string "one {STR_VAR_3} with {STR_VAR_2} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2442E4:: @ 82442E4
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
+	.string "Please, let’s form a tag team!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244313:: @ 8244313
+	.string "Thank you very much!\n"
+	.string "I’ll be done with registration quickly!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244350:: @ 8244350
+	.string "{PLAYER}, I was hoping that I could\n"
+	.string "partner up with you…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244383:: @ 8244383
+	.string "Um, my name’s {STR_VAR_3}, and I’m\n"
+	.string "{STR_VAR_1}’s no. {STR_VAR_2} apprentice.\p"
+	.string "Snivel…\p"
+	.string "I’m sorry!\n"
+	.string "This tension is making me cry…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7:: @ 82443E7
+	.string "{STR_VAR_3} advised me, so I have\n"
+	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244413:: @ 8244413
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
+	.string "Snivel…\n"
+	.string "Please, please team up with me!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B:: @ 824444B
+	.string "Oh, really? You will?\n"
+	.string "Awesome! Wicked! Awoooh!\p"
+	.string "Oh… I’m sorry…\n"
+	.string "I’m so happy, I’m crying…\p"
+	.string "I’ll go register right away.\n"
+	.string "Please don’t go away!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6:: @ 82444D6
+	.string "Oh, b-but…\n"
+	.string "Sob… Waaaaah!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF:: @ 82444EF
+	.string "Hi, there! I’m {STR_VAR_3}!\n"
+	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E:: @ 824451E
+	.string "{STR_VAR_3} recommended my crew.\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244549:: @ 8244549
+	.string "one {STR_VAR_2} with {STR_VAR_1},\n"
+	.string "that’s what I have! Cool, huh?\p"
+	.string "So come on!\n"
+	.string "Let’s form a tag team!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B:: @ 824459B
+	.string "Yay! Great!\n"
+	.string "Okay, I’ll go register, okay?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5:: @ 82445C5
+	.string "Aww, why?\n"
+	.string "I wanted to team up, {PLAYER}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8:: @ 82445E8
+	.string "I’m {STR_VAR_3}, the no. {STR_VAR_2} apprentice\n"
+	.string "of the famous {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244618:: @ 8244618
+	.string "I looked to {STR_VAR_3} for advice.\n"
+	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244643:: @ 8244643
+	.string "and one {STR_VAR_2} with {STR_VAR_1},\n"
+	.string "that’s my pair.\p"
+	.string "Please, will you join me in\n"
+	.string "a tag team?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F:: @ 824468F
+	.string "Thank you!\n"
+	.string "I’ll register right away!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4:: @ 82446B4
+	.string "{PLAYER}, I had been hoping to join\n"
+	.string "you in a tag team…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5:: @ 82446E5
+	.string "Um… I’m sincerely happy that you\n"
+	.string "would take the time to talk to me.\p"
+	.string "I’m {STR_VAR_3}.\n"
+	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D:: @ 824474D
+	.string "{STR_VAR_3} gave me advice.\n"
+	.string "I’m very grateful for it.\p"
+	.string "I have a team of one {STR_VAR_2}\n"
+	.string "with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E:: @ 824479E
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\n"
+	.string "I know I’m asking a lot…\p"
+	.string "I don’t think you’ll be willing to,\n"
+	.string "but may I join you as a partner?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C:: @ 824480C
+	.string "Really? I can’t believe it!\n"
+	.string "I can’t believe you’ll let me join you!\l"
+	.string "I… I won’t let you down!\p"
+	.string "Um… If it’s really okay, I’ll go register\n"
+	.string "right this instant!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7:: @ 82448A7
+	.string "Oh…\n"
+	.string "I didn’t think I was good enough…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD:: @ 82448CD
+	.string "Hi, I’m {STR_VAR_3}.\n"
+	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5:: @ 82448F5
+	.string "{STR_VAR_3} told me that it would be\n"
+	.string "good to make this team:\l"
+	.string "one {STR_VAR_1}-using {STR_VAR_2}$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244939:: @ 8244939
+	.string "and one {STR_VAR_2} that knows how\n"
+	.string "to use {STR_VAR_1}.\p"
+	.string "Not bad, huh?\n"
+	.string "Want me to team up with you?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244989:: @ 8244989
+	.string "Okay, glad to join you!\n"
+	.string "I hope you won’t mess things up for me!\l"
+	.string "I’ll do my registration now.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6:: @ 82449E6
+	.string "Huh? Why did you turn me down?\n"
+	.string "You’re no judge of character!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23:: @ 8244A23
+	.string "I’m {STR_VAR_3} and I’m a TRIATHLETE.\n"
+	.string "I’m busy every day what with jogging,\l"
+	.string "training, and rapping.\p"
+	.string "I also happen to be {STR_VAR_1}’s\n"
+	.string "no. {STR_VAR_2} apprentice.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9:: @ 8244AA9
+	.string "This is what {STR_VAR_3} recommended.\n"
+	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6:: @ 8244AD6
+	.string "and one {STR_VAR_1}-using\n"
+	.string "{STR_VAR_2}.\p"
+	.string "I put a lot of effort into raising\n"
+	.string "them, even though I’m busy.\p"
+	.string "Let’s form a tag team\n"
+	.string "and give it a go!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52:: @ 8244B52
+	.string "Thanks, that’s the spirit!\n"
+	.string "Hang tight while I go register, okay?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93:: @ 8244B93
+	.string "I took time from my busy schedule\n"
+	.string "to be here! Give me a break!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2:: @ 8244BD2
+	.string "Hi!\n"
+	.string "How’s it going?\p"
+	.string "I’m {STR_VAR_3}, {STR_VAR_1}’s\n"
+	.string "no. {STR_VAR_2} apprentice. Glad to meet you!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18:: @ 8244C18
+	.string "Listen, listen! You have to hear about\n"
+	.string "the POKéMON {STR_VAR_3} recommended.\l"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E:: @ 8244C6E
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\n"
+	.string "Of course I raised them superbly!\p"
+	.string "So, want to team up?\n"
+	.string "I’m sure it’ll be a great combo!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6:: @ 8244CD6
+	.string "Yay, I think this will be fun!\n"
+	.string "I’ll go register!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07:: @ 8244D07
+	.string "Oh, you’re mean!\n"
+	.string "I come recommended, you know.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36:: @ 8244D36
+	.string "Please let me introduce myself.\n"
+	.string "I am {STR_VAR_3}.\p"
+	.string "I serve as {STR_VAR_1}’s\n"
+	.string "no. {STR_VAR_2} apprentice.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82:: @ 8244D82
+	.string "I sought the sage advice of\n"
+	.string "{STR_VAR_3} and raised my team\l"
+	.string "of one {STR_VAR_2} with {STR_VAR_1}$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6:: @ 8244DC6
+	.string "and one {STR_VAR_2} with {STR_VAR_1}.\p"
+	.string "Please agree to a tag team with me!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE:: @ 8244DFE
+	.string "Oh… I’m delighted!\n"
+	.string "I promise to give you my best!\p"
+	.string "Of course I will register us!\n"
+	.string "Please wait!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B:: @ 8244E5B
+	.string "I had been hoping to join you,\n"
+	.string "{PLAYER}…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E:: @ 8244E7E
+	.string "Eek! You spoke to me!\n"
+	.string "I… I’m overjoyed!\p"
+	.string "I’m {STR_VAR_3}! I’m {STR_VAR_1}’s\n"
+	.string "no. {STR_VAR_2} apprentice!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA:: @ 8244ECA
+	.string "On {STR_VAR_3}’s advice, I trained\n"
+	.string "one {STR_VAR_1}-using {STR_VAR_2}$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4:: @ 8244EF4
+	.string "and one {STR_VAR_1}-using\n"
+	.string "{STR_VAR_2}.\p"
+	.string "Please, can you grant me my wish?\n"
+	.string "I want to be your tag-team partner!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F:: @ 8244F4F
+	.string "Eek! I… I feel giddy!\n"
+	.string "Thank you so much!\l"
+	.string "I’ll go register us right away!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98:: @ 8244F98
+	.string "Waaah! Don’t you feel any pity?\n"
+	.string "But that makes you cooler…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3:: @ 8244FD3
+	.string "Yeehaw! I’m {STR_VAR_1}’s\n"
+	.string "no. {STR_VAR_2} apprentice!\p"
+	.string "{STR_VAR_3}’s my name, hello, hello!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245013:: @ 8245013
+	.string "My mentor {STR_VAR_3} recommended\n"
+	.string "one {STR_VAR_1}-master {STR_VAR_2}$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D:: @ 824503D
+	.string "and one {STR_VAR_1}-master\n"
+	.string "{STR_VAR_2}.\p"
+	.string "Good stuff, huh?\n"
+	.string "You’ll partner with me, won’t you?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245087:: @ 8245087
+	.string "Okay, excellent!\n"
+	.string "I’ll get the registration done quickly!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0:: @ 82450C0
+	.string "Gwaaah!\n"
+	.string "You’re a calculating one, {PLAYER}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6:: @ 82450E6
+	.string "Hey! There’s big trouble! This is\n"
+	.string "the BATTLE TOWER’s last day!\p"
+	.string "… … … … … …\n"
+	.string "I’m only joking!\p"
+	.string "People call me {STR_VAR_3} and I do, too!\n"
+	.string "I’m {STR_VAR_1}’s 1,000th apprentice!\l"
+	.string "Actually, I’m no. {STR_VAR_2}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245196:: @ 8245196
+	.string "{STR_VAR_3} gave me some advice.\n"
+	.string "{STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD:: @ 82451BD
+	.string "{STR_VAR_2} with {STR_VAR_1}.\n"
+	.string "I’ve got ten of each kind!\l"
+	.string "Actually, just one of each!\p"
+	.string "How about it?\n"
+	.string "Want to try tag battles with me?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F:: @ 824522F
+	.string "Yippee!\n"
+	.string "I’ll give you a POKéMON as my thanks!\p"
+	.string "Just joking! But I will really go do\n"
+	.string "the registration, okay?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A:: @ 824529A
+	.string "Oh, that’s so cold! I’ll have to wreck\n"
+	.string "the BATTLE TOWER for that!\p"
+	.string "Of course I won’t!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF:: @ 82452EF
+	.string "Hey, there, I’m rockin’ and a-rollin’!\n"
+	.string "POKéMON, I be controllin’!\p"
+	.string "I’m {STR_VAR_3} the rappin’ SAILOR.\n"
+	.string "Don’t be mistakin’ me for no wailer!\p"
+	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n"
+	.string "Me, you shouldn’t be quick to dismiss!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4:: @ 82453B4
+	.string "With the advice of {STR_VAR_3} I did\n"
+	.string "abide, put together my team of pride!\l"
+	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245406:: @ 8245406
+	.string "and one {STR_VAR_1}-using\n"
+	.string "{STR_VAR_2}!\p"
+	.string "Our meeting we should commemorate,\n"
+	.string "with a tag-team victory to celebrate!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245464:: @ 8245464
+	.string "Hey, hey, I like your style!\n"
+	.string "Our registration, I will go file!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3:: @ 82454A3
+	.string "Oh, hey, {PLAYER}, now that’s cold!\n"
+	.string "If I may be so bold!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6:: @ 82454D6
+	.string "Yippee-yahoo!\n"
+	.string "Oh, don’t run! I was just having fun!\p"
+	.string "Howdy! I’m {STR_VAR_3}!\n"
+	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245535:: @ 8245535
+	.string "{STR_VAR_3} told me what to do.\n"
+	.string "So one {STR_VAR_1}-using {STR_VAR_2}$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F:: @ 824555F
+	.string "and one {STR_VAR_1}-using\n"
+	.string "{STR_VAR_2}, I did choose.\p"
+	.string "So, what do you say?\n"
+	.string "Come on, make my day!\p"
+	.string "Please, I’m begging you!\n"
+	.string "Let me join you, don’t leave me blue!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC:: @ 82455EC
+	.string "Yeahah! Luck is with me!\n"
+	.string "It sure makes me happy!\p"
+	.string "Before we go join the fray,\n"
+	.string "I’ll go register right away!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245656:: @ 8245656
+	.string "You’re turning me down?\n"
+	.string "{PLAYER}, you’re making me frown!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A:: @ 824568A
+	.string "Cough!\p"
+	.string "Oh, sorry, I have a cold.\n"
+	.string "My POKéMON are fine, though.\p"
+	.string "My name’s {STR_VAR_3}, {STR_VAR_1}’s\n"
+	.string "no. {STR_VAR_2} apprentice. Cough!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5:: @ 82456F5
+	.string "I took {STR_VAR_3}’s advice to heart\n"
+	.string "and put together my team of\l"
+	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245740:: @ 8245740
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
+	.string "I trained them every day,\n"
+	.string "even in wind and rain.\p"
+	.string "That’s why I have this cold,\n"
+	.string "I think.\p"
+	.string "That’s what I’m about.\n"
+	.string "Want to be my tag partner?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9:: @ 82457D9
+	.string "Thanks, I appreciate this!\n"
+	.string "Cough, cough!\l"
+	.string "Hang on while I go register.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F:: @ 824581F
+	.string "Oh, you won’t?\n"
+	.string "{PLAYER}, I think we’d make a good pair.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245851:: @ 8245851
+	.string "Oh, hello!\n"
+	.string "This is nerve-racking.\p"
+	.string "I’m {STR_VAR_3}.\n"
+	.string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C:: @ 824589C
+	.string "{STR_VAR_3} said this team’ll be good--\n"
+	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE:: @ 82458CE
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
+	.string "I’m feeling self-conscious about this,\n"
+	.string "but will you let me join you?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245923:: @ 8245923
+	.string "Oh, gee, thank you!\n"
+	.string "I feel bashful, but I’ll do my best!\p"
+	.string "I’ll go get the registration done.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F:: @ 824597F
+	.string "Oh, please don’t say no!\n"
+	.string "I feel self-conscious enough already…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE:: @ 82459BE
+	.string "I am {STR_VAR_3}, and that’s no lie.\n"
+	.string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7:: @ 82459F7
+	.string "{STR_VAR_3} recommended my team.\p"
+	.string "Since the advice sounded sincere,\n"
+	.string "I decided to bring with me\l"
+	.string "my {STR_VAR_1}-using {STR_VAR_2} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F:: @ 8245A5F
+	.string "my {STR_VAR_1}-using {STR_VAR_2}.\p"
+	.string "If possible, I would like you to accept\n"
+	.string "me as your tag-team partner.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4:: @ 8245AB4
+	.string "You really will accept me?\n"
+	.string "It would be too terrible otherwise.\p"
+	.string "But since you’ve agreed, this is fine.\n"
+	.string "I shall go register the both of us.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E:: @ 8245B3E
+	.string "Hm? Now why would you refuse?\n"
+	.string "Is this your idea of a joke?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79:: @ 8245B79
+	.string "I’m {STR_VAR_1}, and I’m a LASS!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91:: @ 8245B91
+	.string "What I have are one {STR_VAR_2}\n"
+	.string "that uses {STR_VAR_1} and one$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD:: @ 8245BBD
+	.string "{STR_VAR_2} that uses {STR_VAR_1}.\n"
+	.string "Those are what I have with me.\p"
+	.string "Will you be my partner?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05:: @ 8245C05
+	.string "Thank you!\n"
+	.string "I’ll go do the registration!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D:: @ 8245C2D
+	.string "You don’t want to be my partner?\n"
+	.string "You’ll regret it later!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66:: @ 8245C66
+	.string "Hello!\p"
+	.string "I’m YOUNGSTER {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F:: @ 8245C7F
+	.string "Want to know what I have?\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC:: @ 8245CAC
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "You’ll be my tag-team partner,\n"
+	.string "won’t you?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6:: @ 8245CE6
+	.string "Yay!\n"
+	.string "I’ll go and register, okay?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07:: @ 8245D07
+	.string "Aww! If you’d form a tag team with\n"
+	.string "my POKéMON, we’d be unstoppable!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B:: @ 8245D4B
+	.string "Yahoo!\n"
+	.string "I’m HIKER {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60:: @ 8245D60
+	.string "Know what I have with me?\n"
+	.string "My {STR_VAR_1}-using {STR_VAR_2} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D:: @ 8245D8D
+	.string "my {STR_VAR_1}-using {STR_VAR_2}!\p"
+	.string "Sounds good, eh?\n"
+	.string "Want to form a tag team?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7:: @ 8245DC7
+	.string "Yahoo!\n"
+	.string "I’ll go do the registering, then.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0:: @ 8245DF0
+	.string "I would’ve liked to battle with you\n"
+	.string "at my side.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20:: @ 8245E20
+	.string "Hello!\n"
+	.string "I’m {STR_VAR_1}, and I’m a BEAUTY!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41:: @ 8245E41
+	.string "Do you know what I’ve been raising?\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78:: @ 8245E78
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "What do you think?\n"
+	.string "Want to make a tag team together?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD:: @ 8245EBD
+	.string "Wonderful!\n"
+	.string "I’ll get the registration done now!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC:: @ 8245EEC
+	.string "How disappointing!\p"
+	.string "We two together--we would’ve been\n"
+	.string "the best!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B:: @ 8245F2B
+	.string "Yo!\p"
+	.string "You know who I am?\n"
+	.string "I’m {STR_VAR_1} the FISHERMAN!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58:: @ 8245F58
+	.string "I’ve got with me a team of one\n"
+	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87:: @ 8245F87
+	.string "one {STR_VAR_1}-using {STR_VAR_2}.\p"
+	.string "So, how about it?\n"
+	.string "Will you battle at my side?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6:: @ 8245FC6
+	.string "Good, good!\n"
+	.string "Leave it up to me!\p"
+	.string "I’ll go and register us now.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246002:: @ 8246002
+	.string "We matched up perfectly, too…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246020:: @ 8246020
+	.string "Glad to make your acquaintance.\n"
+	.string "I am {STR_VAR_1}, a LADY.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246051:: @ 8246051
+	.string "I am accompanied by a team of\n"
+	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246082:: @ 8246082
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
+	.string "I hope I meet your approval.\n"
+	.string "For I wish to have you as my partner.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5:: @ 82460D5
+	.string "I thank you sincerely.\n"
+	.string "I shall handle the registration.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D:: @ 824610D
+	.string "I’m sure that you will regret not\n"
+	.string "having me as your partner.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A:: @ 824614A
+	.string "I’m TRIATHLETE {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D:: @ 824615D
+	.string "What I have…\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D:: @ 824617D
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\n"
+	.string "That’s my pair!\p"
+	.string "Please?\n"
+	.string "Will you form a tag team with me?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7:: @ 82461C7
+	.string "Gee, thanks!\n"
+	.string "I’ll go register at the counter.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5:: @ 82461F5
+	.string "We two together, we would’ve been\n"
+	.string "tough for certain!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A:: @ 824622A
+	.string "Hiya!\n"
+	.string "I’m BUG CATCHER {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246244:: @ 8246244
+	.string "Check out what I have!\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E:: @ 824626E
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "So, listen!\n"
+	.string "Do you want to form a tag team?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA:: @ 82462AA
+	.string "Gotcha!\p"
+	.string "I’ll go do the registration stuff\n"
+	.string "at the counter.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4:: @ 82462E4
+	.string "Aww, my POKéMON are awesome.\n"
+	.string "I hope you won’t regret this!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F:: @ 824631F
+	.string "Good day!\n"
+	.string "I’m SCHOOL KID {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C:: @ 824633C
+	.string "What I’ve been raising are one\n"
+	.string "{STR_VAR_2} that uses {STR_VAR_1}$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B:: @ 824636B
+	.string "and one {STR_VAR_2} that uses\n"
+	.string "{STR_VAR_1}.\p"
+	.string "Not too bad, don’t you think?\n"
+	.string "Would you care to form a tag team?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5:: @ 82463C5
+	.string "Thank you very much!\n"
+	.string "I’ll get done with the registration.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF:: @ 82463FF
+	.string "That’s too bad…\p"
+	.string "I was hoping that I could learn\n"
+	.string "from you as your partner…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246449:: @ 8246449
+	.string "Yo! Let me tell you who I am!\n"
+	.string "I’m RICH BOY {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246478:: @ 8246478
+	.string "Guess what I got!\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D:: @ 824649D
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "I’m willing to offer you the chance\n"
+	.string "to be in a tag team with me.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE:: @ 82464EE
+	.string "Smart move!\p"
+	.string "I’ll finish up the registration\n"
+	.string "process quick!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246529:: @ 8246529
+	.string "You’d turn me of all people down?\n"
+	.string "You’ll regret that decision for sure!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246571:: @ 8246571
+	.string "Hiyah!\n"
+	.string "I am BLACK BELT {STR_VAR_1}.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C:: @ 824658C
+	.string "As my companions, I have\n"
+	.string "one {STR_VAR_2} using {STR_VAR_1}$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5:: @ 82465B5
+	.string "and one {STR_VAR_2} using\n"
+	.string "{STR_VAR_1}.\p"
+	.string "Please, grant me my wish!\n"
+	.string "Allow me to be your tag partner!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246605:: @ 8246605
+	.string "Hiyah!\n"
+	.string "I will go register forthwith!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A:: @ 824662A
+	.string "I see… I hope for an opportunity\n"
+	.string "the next time we meet…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246662:: @ 8246662
+	.string "Hi, there!\n"
+	.string "I’m {STR_VAR_1}, and I’m a TUBER!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246686:: @ 8246686
+	.string "I’ll tell you what I have.\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4:: @ 82466B4
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\n"
+	.string "May I please be on your tag team?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6:: @ 82466E6
+	.string "Thank you!\n"
+	.string "I’ll go register us now!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A:: @ 824670A
+	.string "If we’d become partners, we could\n"
+	.string "have been so strong!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246741:: @ 8246741
+	.string "Greetings…\n"
+	.string "I am HEX MANIAC {STR_VAR_1}…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246760:: @ 8246760
+	.string "I bear with me one {STR_VAR_1}-using\n"
+	.string "{STR_VAR_2} together with one$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246791:: @ 8246791
+	.string "{STR_VAR_1}-using {STR_VAR_2}…\p"
+	.string "I beseech you…\n"
+	.string "Join me in a tag team…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4:: @ 82467C4
+	.string "I thank you…\n"
+	.string "I shall register us…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6:: @ 82467E6
+	.string "I so longed to join you…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF:: @ 82467FF
+	.string "How do you do? I’m {STR_VAR_1},\n"
+	.string "and I’m a POKéMON BREEDER!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246831:: @ 8246831
+	.string "I’m raising a couple good ones!\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246864:: @ 8246864
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "How about it?\n"
+	.string "Feel like making a tag team with me?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7:: @ 82468A7
+	.string "Thank you kindly!\p"
+	.string "I’ll go take care of the registration\n"
+	.string "stuff, so you wait right here!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE:: @ 82468FE
+	.string "I was looking forward to being\n"
+	.string "your partner…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B:: @ 824692B
+	.string "Well, hello!\n"
+	.string "I’m TRIATHLETE {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B:: @ 824694B
+	.string "Want to know what I run with?\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C:: @ 824697C
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "Well?\n"
+	.string "Want to be in a tag team with me?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4:: @ 82469B4
+	.string "Good going!\p"
+	.string "I’ll be quick and get the registration\n"
+	.string "all done!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1:: @ 82469F1
+	.string "You and me, we would’ve been tops.\n"
+	.string "It’s too bad…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22:: @ 8246A22
+	.string "Hey, there! My name’s {STR_VAR_1}!\n"
+	.string "I’m a TRIATHLETE!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E:: @ 8246A4E
+	.string "I go on runs with my durable team--\n"
+	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85:: @ 8246A85
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "Not too shabby, huh?\n"
+	.string "We should be in a tag team together!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF:: @ 8246ACF
+	.string "All right!\n"
+	.string "I’ll go register in a flash!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7:: @ 8246AF7
+	.string "I really wanted to battle as your\n"
+	.string "tag-team partner…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B:: @ 8246B2B
+	.string "I’m BATTLE GIRL {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F:: @ 8246B3F
+	.string "I’ve been toughening up one\n"
+	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B:: @ 8246B6B
+	.string "one {STR_VAR_1}-using {STR_VAR_2}!\p"
+	.string "Do you like that combo?\n"
+	.string "How about you and me join up?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2:: @ 8246BB2
+	.string "Why, thanks!\p"
+	.string "I’ll get the registration done\n"
+	.string "right now!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9:: @ 8246BE9
+	.string "With you, I thought we could form\n"
+	.string "the ultimate tag team…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22:: @ 8246C22
+	.string "I’m TRIATHLETE {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35:: @ 8246C35
+	.string "I’ve been running with one {STR_VAR_2}\n"
+	.string "that knows how to use {STR_VAR_1}$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C:: @ 8246C6C
+	.string "and one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "We could be in a tag team.\n"
+	.string "Wouldn’t that be great?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3:: @ 8246CB3
+	.string "Thank you!\p"
+	.string "I’ll go register us, and that’s\n"
+	.string "right now!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9:: @ 8246CE9
+	.string "Aww, that’s too bad. We would’ve been\n"
+	.string "the toughest tag team around!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D:: @ 8246D2D
+	.string "Me?\n"
+	.string "I’m TUBER {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F:: @ 8246D3F
+	.string "What do I have with me?\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A:: @ 8246D6A
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "Hey?\n"
+	.string "You’ll team up with me, right?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E:: @ 8246D9E
+	.string "Okay!\p"
+	.string "I’ll go register!\n"
+	.string "Let’s be excellent together!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3:: @ 8246DD3
+	.string "My POKéMON are tough for sure…\n"
+	.string "It’s too bad you don’t want to team up.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A:: @ 8246E1A
+	.string "Yay-hey!\n"
+	.string "Call me GUITARIST {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39:: @ 8246E39
+	.string "Check out my entourage!\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64:: @ 8246E64
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "Yay-hey! Pretty wild, huh?\n"
+	.string "We’ll have to do a duet in a tag team!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6:: @ 8246EB6
+	.string "Yay-hey! Right on!\n"
+	.string "I’ll do that registration stuff now!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE:: @ 8246EEE
+	.string "My POKéMON rock hard!\n"
+	.string "You’ll be sorry, I tell you!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21:: @ 8246F21
+	.string "Pleased to meet you.\n"
+	.string "I am {STR_VAR_1}, a GENTLEMAN.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C:: @ 8246F4C
+	.string "I am accompanied by my trusted\n"
+	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B:: @ 8246F7B
+	.string "one {STR_VAR_1}-using {STR_VAR_2}.\p"
+	.string "May I ask you to join me in a tag-team\n"
+	.string "partnership arrangement?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC:: @ 8246FCC
+	.string "Ah, I thank you for your trust.\n"
+	.string "I shall be done with the registration.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247013:: @ 8247013
+	.string "That is most unfortunate…\p"
+	.string "I shall look forward to the next\n"
+	.string "opportunity…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B:: @ 824705B
+	.string "Hello, I’m {STR_VAR_1},\n"
+	.string "and I’m a POKéFAN.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D:: @ 824707D
+	.string "I have with me now one {STR_VAR_2}\n"
+	.string "that knows the move {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2:: @ 82470B2
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
+	.string "Do you like what you see?\n"
+	.string "Why don’t you be my tag partner?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD:: @ 82470FD
+	.string "Thank you!\n"
+	.string "I’ll look after the registration!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A:: @ 824712A
+	.string "My POKéMON are top grade…\n"
+	.string "It’s too bad you can’t appreciate that.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C:: @ 824716C
+	.string "Hm!\n"
+	.string "I am {STR_VAR_1}, and an EXPERT am I!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D:: @ 824718D
+	.string "The POKéMON that I’ve toughened up are\n"
+	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7:: @ 82471C7
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "What say you to a tag team with me?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB:: @ 82471FB
+	.string "Hm!\n"
+	.string "I shall register us right away!\l"
+	.string "Let us both do our best!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247238:: @ 8247238
+	.string "I will hope that your choice is\n"
+	.string "indeed correct…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247268:: @ 8247268
+	.string "Hello, hello.\n"
+	.string "I’m {STR_VAR_1}, and I’m an EXPERT.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247291:: @ 8247291
+	.string "I’ve raised my POKéMON thoroughly.\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7:: @ 82472C7
+	.string "one {STR_VAR_2} with {STR_VAR_1}--\n"
+	.string "they’re what I have.\p"
+	.string "Wouldn’t you like to team up with me?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247313:: @ 8247313
+	.string "Good, good.\n"
+	.string "I’ll see to the registration right away.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247348:: @ 8247348
+	.string "Perhaps we can form a team the next\n"
+	.string "time we meet.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A:: @ 824737A
+	.string "I’m DRAGON TAMER {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F:: @ 824738F
+	.string "The team I’ve been toughening up is\n"
+	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6:: @ 82473C6
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "How about it?\n"
+	.string "Want to be my partner?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB:: @ 82473FB
+	.string "Okay, I’ll give it my best!\n"
+	.string "I’ll go register now, all right?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247438:: @ 8247438
+	.string "You’re not going to find many tougher\n"
+	.string "partners than me!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247470:: @ 8247470
+	.string "I’m BIRD KEEPER {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247484:: @ 8247484
+	.string "What POKéMON do I have?\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF:: @ 82474AF
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
+	.string "Don’t you think we’d make a decent\n"
+	.string "tag team?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC:: @ 82474EC
+	.string "Great, thanks!\n"
+	.string "I’ll look after the registration!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D:: @ 824751D
+	.string "My POKéMON and I are strong.\n"
+	.string "What a letdown.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A:: @ 824754A
+	.string "I’m NINJA BOY {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C:: @ 824755C
+	.string "My POKéMON team consists of one\n"
+	.string "{STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B:: @ 824758B
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "Let’s be in a tag team together!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC:: @ 82475BC
+	.string "Yay!\n"
+	.string "Let me go register!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5:: @ 82475D5
+	.string "You’ll regret not having my tough\n"
+	.string "POKéMON on your side!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D:: @ 824760D
+	.string "Hello!\n"
+	.string "I’m PARASOL LADY {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247629:: @ 8247629
+	.string "Escorting me now are my {STR_VAR_2}\n"
+	.string "that uses {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247655:: @ 8247655
+	.string "one {STR_VAR_2} that uses\n"
+	.string "{STR_VAR_1}.\p"
+	.string "Aren’t they nice?\n"
+	.string "Care to join us in a tag team?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B:: @ 824769B
+	.string "Thanks a bunch!\p"
+	.string "I’ll go register at the counter.\n"
+	.string "Let’s not disappoint each other!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED:: @ 82476ED
+	.string "My POKéMON are tremendously strong.\n"
+	.string "How disappointing…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247724:: @ 8247724
+	.string "Hello.\n"
+	.string "I’m {STR_VAR_1}, and I’m a BUG MANIAC!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247749:: @ 8247749
+	.string "I have found my POKéMON, yes.\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A:: @ 824777A
+	.string "one {STR_VAR_2} with {STR_VAR_1}--\n"
+	.string "they are what I found.\p"
+	.string "Could I interest you in forming\n"
+	.string "a tag team?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE:: @ 82477CE
+	.string "Okay!\n"
+	.string "Understood!\p"
+	.string "I won’t be long with the registration!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247807:: @ 8247807
+	.string "With the POKéMON I found, we wouldn’t\n"
+	.string "have lost…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247838:: @ 8247838
+	.string "Ahoy, there!\n"
+	.string "I’m SAILOR {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247854:: @ 8247854
+	.string "Let me show you my pride and joy!\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247889:: @ 8247889
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "Of course you’re not going to turn\n"
+	.string "me down. We will team up, right?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD:: @ 82478DD
+	.string "I didn’t expect any less!\n"
+	.string "I’ll go register now.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D:: @ 824790D
+	.string "We would’ve stormed through\n"
+	.string "the opposition! Too bad!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247942:: @ 8247942
+	.string "Hi, I’m {STR_VAR_1}.\n"
+	.string "I’m a COLLECTOR.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F:: @ 824795F
+	.string "The jewels in my collection are\n"
+	.string "my {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247991:: @ 8247991
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "Swell, huh?\n"
+	.string "We should be in a team together.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE:: @ 82479CE
+	.string "Oh, yeah!\p"
+	.string "Well, let’s not waste any time.\n"
+	.string "I’ll go register the two of us.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18:: @ 8247A18
+	.string "Well, that’s upsetting.\n"
+	.string "You don’t appreciate my POKéMON.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51:: @ 8247A51
+	.string "Howdy, I’m {STR_VAR_1}.\n"
+	.string "I’m a POKéMON RANGER.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76:: @ 8247A76
+	.string "Keeping me company are one\n"
+	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1:: @ 8247AA1
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "Don’t you think we’d make an impressive\n"
+	.string "tag team?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3:: @ 8247AE3
+	.string "That’s super!\n"
+	.string "I’ll deal with the registration now.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16:: @ 8247B16
+	.string "Next time, choose my POKéMON,\n"
+	.string "will you?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E:: @ 8247B3E
+	.string "My name’s {STR_VAR_1}.\n"
+	.string "I’m a POKéMON RANGER!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62:: @ 8247B62
+	.string "Let me tell you about my team. I have\n"
+	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B:: @ 8247B9B
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "How would you like to form a tag team\n"
+	.string "with my little posse?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7:: @ 8247BE7
+	.string "We’ll be at our best!\n"
+	.string "I’ll get the registration done quick!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23:: @ 8247C23
+	.string "I hope you’ll choose my POKéMON\n"
+	.string "next time.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E:: @ 8247C4E
+	.string "Pleased to meet you. I’m {STR_VAR_1}.\n"
+	.string "I consider myself an AROMA LADY.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C:: @ 8247C8C
+	.string "I travel with one {STR_VAR_2}\n"
+	.string "that uses {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2:: @ 8247CB2
+	.string "one {STR_VAR_2} that uses\n"
+	.string "{STR_VAR_1}.\p"
+	.string "I hope they strike your fancy.\n"
+	.string "Would you care to be my partner?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07:: @ 8247D07
+	.string "I’m honored by your acceptance.\n"
+	.string "I will go register right this instant.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E:: @ 8247D4E
+	.string "It would be wonderful if we could form\n"
+	.string "a tag team the next time we meet.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97:: @ 8247D97
+	.string "Want to know who I am?\n"
+	.string "I’m {STR_VAR_1}, the RUIN MANIAC!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7:: @ 8247DC7
+	.string "The POKéMON that I have with me are\n"
+	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE:: @ 8247DFE
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "Intriguing, eh?\n"
+	.string "How about you and I partner up?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E:: @ 8247E3E
+	.string "That’s a sound decision!\n"
+	.string "I’ll go do the registration paperwork.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E:: @ 8247E7E
+	.string "Hmm…\n"
+	.string "I think my POKéMON are tough…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1:: @ 8247EA1
+	.string "I’m COOLTRAINER {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5:: @ 8247EB5
+	.string "The POKéMON I have right now are one\n"
+	.string "{STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9:: @ 8247EE9
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\n"
+	.string "Cool, huh?\p"
+	.string "Don’t you think it’d be pretty cool\n"
+	.string "if we made a tag team?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F:: @ 8247F3F
+	.string "Cool!\n"
+	.string "I’ll go do the registration in a flash!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D:: @ 8247F6D
+	.string "I thought that we’d make just\n"
+	.string "the greatest team ever.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3:: @ 8247FA3
+	.string "I’m COOLTRAINER {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7:: @ 8247FB7
+	.string "The team I’ve been raising has one\n"
+	.string "{STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9:: @ 8247FE9
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
+	.string "Does that sound okay?\n"
+	.string "How about we become tag partners?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248031:: @ 8248031
+	.string "Sounds A-OK!\n"
+	.string "I’d better do the registration.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E:: @ 824805E
+	.string "I was thinking how we would be\n"
+	.string "one tough team…$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D:: @ 824808D
+	.string "Heyo!\n"
+	.string "I’m {STR_VAR_1}, the POKéMANIAC!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB:: @ 82480AB
+	.string "What does a guy like me have?\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC:: @ 82480DC
+	.string "one {STR_VAR_2} with {STR_VAR_1},\n"
+	.string "that’s what!\p"
+	.string "Let’s do it!\n"
+	.string "We’ll stomp around as a tag team!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248128:: @ 8248128
+	.string "Good call!\n"
+	.string "I’ll register the both of us!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248151:: @ 8248151
+	.string "My POKéMON are brutal!\n"
+	.string "It’s not my fault if you regret this!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E:: @ 824818E
+	.string "Yo, there!\n"
+	.string "I’m KINDLER {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9:: @ 82481A9
+	.string "You know what my training cooked up?\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1:: @ 82481E1
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "Well, what do you say?\n"
+	.string "Want to form a tag team?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248221:: @ 8248221
+	.string "All right!\n"
+	.string "I’ll get on with the registration.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F:: @ 824824F
+	.string "Promise you’ll partner up with me\n"
+	.string "the next time we run into each other.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248297:: @ 8248297
+	.string "I’m {STR_VAR_1}, and I’m a CAMPER!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1:: @ 82482B1
+	.string "I’ve been raising one {STR_VAR_1}-\n"
+	.string "using {STR_VAR_2} and one$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC:: @ 82482DC
+	.string "{STR_VAR_1}-using {STR_VAR_2}.\p"
+	.string "Do you think it’d be fun to team up?\n"
+	.string "I bet it would be!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248321:: @ 8248321
+	.string "Yeah!\n"
+	.string "Off I go to register!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D:: @ 824833D
+	.string "Next time, okay?\n"
+	.string "I want to be on your team.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248369:: @ 8248369
+	.string "Hello!\n"
+	.string "I’m {STR_VAR_1}, and I’m a PICNICKER!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D:: @ 824838D
+	.string "The POKéMON I’ve been taking are\n"
+	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1:: @ 82483C1
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
+	.string "Are you interested in joining me\n"
+	.string "on a tag team?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248401:: @ 8248401
+	.string "Why, thank you!\n"
+	.string "I will do the registration now.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248431:: @ 8248431
+	.string "It would be nice if I could join you\n"
+	.string "some other time.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248467:: @ 8248467
+	.string "I’m PSYCHIC {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248477:: @ 8248477
+	.string "The twosome I’ve been raising are\n"
+	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC:: @ 82484AC
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
+	.string "Would you like to form a tag team\n"
+	.string "with me?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7:: @ 82484E7
+	.string "Sure thing!\n"
+	.string "I’ll take care of the registration!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248517:: @ 8248517
+	.string "If we meet again, that’s when I’d like\n"
+	.string "to team up with you.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248553:: @ 8248553
+	.string "I’m {STR_VAR_1}.\n"
+	.string "I’m a PSYCHIC.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A:: @ 824856A
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D:: @ 824857D
+	.string "one {STR_VAR_2} with {STR_VAR_1}--\n"
+	.string "they’re my disciples.\p"
+	.string "Doesn’t the idea of forming a tag-team\n"
+	.string "partnership intrigue you?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5:: @ 82485E5
+	.string "Thank you.\n"
+	.string "I’ll go deal with the registration.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248614:: @ 8248614
+	.string "I hope there will be another chance\n"
+	.string "to forge an alliance.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E:: @ 824864E
+	.string "I’m SCHOOL KID {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248661:: @ 8248661
+	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248671:: @ 8248671
+	.string "and one {STR_VAR_1}-using\n"
+	.string "{STR_VAR_2} are my POKéMON pair.\p"
+	.string "May I please be your partner on\n"
+	.string "a tag team?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6:: @ 82486C6
+	.string "Ooh, thank you!\n"
+	.string "I’ll register at the counter right away!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF:: @ 82486FF
+	.string "Please?\n"
+	.string "May I join you the next time?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248725:: @ 8248725
+	.string "Hiya! The name’s {STR_VAR_1}!\n"
+	.string "I’m a POKéMON BREEDER!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248751:: @ 8248751
+	.string "The POKéMON I’ve raised are one\n"
+	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248781:: @ 8248781
+	.string "one {STR_VAR_1}-using {STR_VAR_2}.\p"
+	.string "Sound interesting?\n"
+	.string "How about we form a tag team, then?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9:: @ 82487C9
+	.string "All righty!\n"
+	.string "You leave the registration to me!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7:: @ 82487F7
+	.string "You have to team up with me next time,\n"
+	.string "all right?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248829:: @ 8248829
+	.string "I’m {STR_VAR_1}, and I’m proud to say\n"
+	.string "that I am a POKéFAN.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B:: @ 824885B
+	.string "The darling POKéMON I’ve raised are\n"
+	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248892:: @ 8248892
+	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
+	.string "Aren’t they just the cutest?\n"
+	.string "We ought to make a team!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8:: @ 82488D8
+	.string "Thank you, dear!\n"
+	.string "I’ll be on my way to register!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248908:: @ 8248908
+	.string "My darling POKéMON are the best,\n"
+	.string "I’ll have you know. How annoying!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B:: @ 824894B
+	.string "Hi, I’m SWIMMER {STR_VAR_1}.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F:: @ 824895F
+	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F:: @ 824896F
+	.string "and one {STR_VAR_1}-using\n"
+	.string "{STR_VAR_2} are what I’ve trained.\p"
+	.string "You and me, let’s make a tag team.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD:: @ 82489BD
+	.string "That’s cool!\n"
+	.string "I’ll register the two of us.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7:: @ 82489E7
+	.string "If we meet again, you owe me\n"
+	.string "a tag team!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10:: @ 8248A10
+	.string "What’s happening?\n"
+	.string "I’m {STR_VAR_1}, and I’m a TRIATHLETE.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40:: @ 8248A40
+	.string "I got a couple decent POKéMON.\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72:: @ 8248A72
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "It’d be neat if we made a tag team\n"
+	.string "together, so how about it?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0:: @ 8248AC0
+	.string "Right on!\n"
+	.string "You wait while I register, okay?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB:: @ 8248AEB
+	.string "I expect you’ll let me join you\n"
+	.string "next time, how’s that?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22:: @ 8248B22
+	.string "I’m the TRIATHLETE {STR_VAR_1}!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39:: @ 8248B39
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C:: @ 8248B4C
+	.string "another {STR_VAR_2} that knows how\n"
+	.string "to use {STR_VAR_1}. That’s my pair.\p"
+	.string "What do you think?\n"
+	.string "We’d make a good team, I’d say.$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4:: @ 8248BB4
+	.string "I like that answer!\n"
+	.string "I’ll get done with registration fast!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE:: @ 8248BEE
+	.string "You’ll give me another chance to form\n"
+	.string "a partnership, won’t you?$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E:: @ 8248C2E
+	.string "Hi, there! Hello!\n"
+	.string "I’m {STR_VAR_1}, and I’m a SWIMMER!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B:: @ 8248C5B
+	.string "Check out what I’ve been raising!\n"
+	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90:: @ 8248C90
+	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
+	.string "Sweet, huh?\n"
+	.string "It’d be sweet to form a team, too!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF:: @ 8248CCF
+	.string "Much obliged!\n"
+	.string "I’ll get this registration thing done!$"
+
+BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04:: @ 8248D04
+	.string "If we meet again, you have to team up\n"
+	.string "with me. You’ll do that, right?$"
+
diff --git a/data/maps/BattleFrontier_Lounge1/events.inc b/data/maps/BattleFrontier_Lounge1/events.inc
new file mode 100644
index 000000000..b6c6ecdd0
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge1/events.inc
@@ -0,0 +1,11 @@
+BattleFrontier_Lounge1_EventObjects: @ 853CFB4
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, 2, 1, 2, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, 2, 2, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0
+
+BattleFrontier_Lounge1_MapWarps: @ 853CFFC
+	warp_def 4, 9, 0, 5, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_Lounge1_MapEvents:: @ 853D004
+	map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc
index 97eb721b6..44acc4b6a 100644
--- a/data/maps/BattleFrontier_Lounge1/header.inc
+++ b/data/maps/BattleFrontier_Lounge1/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_Lounge1: @ 84855B8
-	.4byte BattleFrontier_Lounge1_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge1_MapEvents
 	.4byte BattleFrontier_Lounge1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_Lounge1.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc
index ba8ca0cb6..ba8ca0cb6 100644
--- a/data/scripts/maps/BattleFrontier_Lounge1.inc
+++ b/data/maps/BattleFrontier_Lounge1/scripts.inc
diff --git a/data/maps/BattleFrontier_Lounge2/events.inc b/data/maps/BattleFrontier_Lounge2/events.inc
new file mode 100644
index 000000000..0616573bd
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge2/events.inc
@@ -0,0 +1,14 @@
+BattleFrontier_Lounge2_EventObjects: @ 853D11C
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0
+	object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0
+	object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, 2, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0
+	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0
+
+BattleFrontier_Lounge2_MapWarps: @ 853D194
+	warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+	warp_def 2, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_Lounge2_MapEvents:: @ 853D1A4
+	map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc
index b5a1367b5..69a6dba30 100644
--- a/data/maps/BattleFrontier_Lounge2/header.inc
+++ b/data/maps/BattleFrontier_Lounge2/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_Lounge2: @ 84855F0
-	.4byte BattleFrontier_Lounge2_MapAttributes
+	.4byte BattleFrontier_Lounge1_Layout
 	.4byte BattleFrontier_Lounge2_MapEvents
 	.4byte BattleFrontier_Lounge2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_Lounge2.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc
index bbb298b5b..bbb298b5b 100644
--- a/data/scripts/maps/BattleFrontier_Lounge2.inc
+++ b/data/maps/BattleFrontier_Lounge2/scripts.inc
diff --git a/data/maps/BattleFrontier_Lounge3/events.inc b/data/maps/BattleFrontier_Lounge3/events.inc
new file mode 100644
index 000000000..dbaa20fe1
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge3/events.inc
@@ -0,0 +1,13 @@
+BattleFrontier_Lounge3_EventObjects: @ 853D1B8
+	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, 7, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, 8, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 5, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 0, 2, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0
+
+BattleFrontier_Lounge3_MapWarps: @ 853D230
+	warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_Lounge3_MapEvents:: @ 853D238
+	map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc
index 21cd2cc38..3a18ce347 100644
--- a/data/maps/BattleFrontier_Lounge3/header.inc
+++ b/data/maps/BattleFrontier_Lounge3/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_Lounge3: @ 848560C
-	.4byte BattleFrontier_Lounge3_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge3_MapEvents
 	.4byte BattleFrontier_Lounge3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_Lounge3.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc
index 2638541b2..2638541b2 100644
--- a/data/scripts/maps/BattleFrontier_Lounge3.inc
+++ b/data/maps/BattleFrontier_Lounge3/scripts.inc
diff --git a/data/maps/BattleFrontier_Lounge4/events.inc b/data/maps/BattleFrontier_Lounge4/events.inc
new file mode 100644
index 000000000..613adfae2
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge4/events.inc
@@ -0,0 +1,11 @@
+BattleFrontier_Lounge4_EventObjects: @ 853D24C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 4, 0, 7, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0
+	object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, 2, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 0, 10, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0
+
+BattleFrontier_Lounge4_MapWarps: @ 853D294
+	warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_Lounge4_MapEvents:: @ 853D29C
+	map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc
index e550557ca..e052e6ce6 100644
--- a/data/maps/BattleFrontier_Lounge4/header.inc
+++ b/data/maps/BattleFrontier_Lounge4/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_Lounge4: @ 8485628
-	.4byte BattleFrontier_Lounge4_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge4_MapEvents
 	.4byte BattleFrontier_Lounge4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_Lounge4.inc b/data/maps/BattleFrontier_Lounge4/scripts.inc
index 1108ceee7..1108ceee7 100644
--- a/data/scripts/maps/BattleFrontier_Lounge4.inc
+++ b/data/maps/BattleFrontier_Lounge4/scripts.inc
diff --git a/data/maps/BattleFrontier_Lounge5/events.inc b/data/maps/BattleFrontier_Lounge5/events.inc
new file mode 100644
index 000000000..0224ae0a9
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge5/events.inc
@@ -0,0 +1,13 @@
+BattleFrontier_Lounge5_EventObjects: @ 853D2EC
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 12, 4, 4, 9, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, 10, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, 2, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 11, 7, 0, 1, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0
+
+BattleFrontier_Lounge5_MapWarps: @ 853D34C
+	warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+	warp_def 2, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_Lounge5_MapEvents:: @ 853D35C
+	map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc
index dbe0afa67..a6fa1470f 100644
--- a/data/maps/BattleFrontier_Lounge5/header.inc
+++ b/data/maps/BattleFrontier_Lounge5/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_Lounge5: @ 8485660
-	.4byte BattleFrontier_Lounge5_MapAttributes
+	.4byte BattleFrontier_Lounge1_Layout
 	.4byte BattleFrontier_Lounge5_MapEvents
 	.4byte BattleFrontier_Lounge5_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_Lounge5.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc
index bb1feceec..bb1feceec 100644
--- a/data/scripts/maps/BattleFrontier_Lounge5.inc
+++ b/data/maps/BattleFrontier_Lounge5/scripts.inc
diff --git a/data/maps/BattleFrontier_Lounge6/events.inc b/data/maps/BattleFrontier_Lounge6/events.inc
new file mode 100644
index 000000000..092be452b
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge6/events.inc
@@ -0,0 +1,9 @@
+BattleFrontier_Lounge6_EventObjects: @ 853D370
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0
+
+BattleFrontier_Lounge6_MapWarps: @ 853D388
+	warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_Lounge6_MapEvents:: @ 853D390
+	map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc
index c41376cfd..ec6cfb105 100644
--- a/data/maps/BattleFrontier_Lounge6/header.inc
+++ b/data/maps/BattleFrontier_Lounge6/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_Lounge6: @ 848567C
-	.4byte BattleFrontier_Lounge6_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge6_MapEvents
 	.4byte BattleFrontier_Lounge6_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_Lounge6.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc
index c779e7c76..c779e7c76 100644
--- a/data/scripts/maps/BattleFrontier_Lounge6.inc
+++ b/data/maps/BattleFrontier_Lounge6/scripts.inc
diff --git a/data/maps/BattleFrontier_Lounge7/events.inc b/data/maps/BattleFrontier_Lounge7/events.inc
new file mode 100644
index 000000000..c5490d6c9
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge7/events.inc
@@ -0,0 +1,12 @@
+BattleFrontier_Lounge7_EventObjects: @ 853D3A4
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, 2, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 5, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 5, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0
+	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0
+
+BattleFrontier_Lounge7_MapWarps: @ 853D404
+	warp_def 4, 9, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_Lounge7_MapEvents:: @ 853D40C
+	map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc
index 0348fd64c..5124822a8 100644
--- a/data/maps/BattleFrontier_Lounge7/header.inc
+++ b/data/maps/BattleFrontier_Lounge7/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_Lounge7: @ 8485698
-	.4byte BattleFrontier_Lounge7_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge7_MapEvents
 	.4byte BattleFrontier_Lounge7_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_Lounge7.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc
index 0b810d4f7..0b810d4f7 100644
--- a/data/scripts/maps/BattleFrontier_Lounge7.inc
+++ b/data/maps/BattleFrontier_Lounge7/scripts.inc
diff --git a/data/maps/BattleFrontier_Lounge8/events.inc b/data/maps/BattleFrontier_Lounge8/events.inc
new file mode 100644
index 000000000..116cc007f
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge8/events.inc
@@ -0,0 +1,11 @@
+BattleFrontier_Lounge8_EventObjects: @ 853D4BC
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 5, 0, 2, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 7, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 4, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0
+
+BattleFrontier_Lounge8_MapWarps: @ 853D504
+	warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_Lounge8_MapEvents:: @ 853D50C
+	map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc
index 9ec0f336f..46fe25e2d 100644
--- a/data/maps/BattleFrontier_Lounge8/header.inc
+++ b/data/maps/BattleFrontier_Lounge8/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_Lounge8: @ 84856D0
-	.4byte BattleFrontier_Lounge8_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge8_MapEvents
 	.4byte BattleFrontier_Lounge8_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_Lounge8.inc b/data/maps/BattleFrontier_Lounge8/scripts.inc
index 35f83baff..35f83baff 100644
--- a/data/scripts/maps/BattleFrontier_Lounge8.inc
+++ b/data/maps/BattleFrontier_Lounge8/scripts.inc
diff --git a/data/maps/BattleFrontier_Lounge9/events.inc b/data/maps/BattleFrontier_Lounge9/events.inc
new file mode 100644
index 000000000..6500ab66a
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge9/events.inc
@@ -0,0 +1,10 @@
+BattleFrontier_Lounge9_EventObjects: @ 853D520
+	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 6, 3, 0, 1, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_Lounge9_MapWarps: @ 853D538
+	warp_def 1, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+	warp_def 2, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_Lounge9_MapEvents:: @ 853D548
+	map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc
index d88f40095..24e7b3005 100644
--- a/data/maps/BattleFrontier_Lounge9/header.inc
+++ b/data/maps/BattleFrontier_Lounge9/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_Lounge9: @ 84856EC
-	.4byte BattleFrontier_Lounge9_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge9_MapEvents
 	.4byte BattleFrontier_Lounge9_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_Lounge9.inc b/data/maps/BattleFrontier_Lounge9/scripts.inc
index cba75ee77..cba75ee77 100644
--- a/data/scripts/maps/BattleFrontier_Lounge9.inc
+++ b/data/maps/BattleFrontier_Lounge9/scripts.inc
diff --git a/data/maps/BattleFrontier_Mart/events.inc b/data/maps/BattleFrontier_Mart/events.inc
new file mode 100644
index 000000000..669945b99
--- /dev/null
+++ b/data/maps/BattleFrontier_Mart/events.inc
@@ -0,0 +1,13 @@
+BattleFrontier_Mart_EventObjects: @ 853D68C
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0
+
+BattleFrontier_Mart_MapWarps: @ 853D6EC
+	warp_def 3, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+	warp_def 4, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_Mart_MapEvents:: @ 853D6FC
+	map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc
index b0cd11e40..1067fc70c 100644
--- a/data/maps/BattleFrontier_Mart/header.inc
+++ b/data/maps/BattleFrontier_Mart/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_Mart: @ 8485740
-	.4byte BattleFrontier_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte BattleFrontier_Mart_MapEvents
 	.4byte BattleFrontier_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_Mart.inc b/data/maps/BattleFrontier_Mart/scripts.inc
index 0b7f5b767..0b7f5b767 100644
--- a/data/scripts/maps/BattleFrontier_Mart.inc
+++ b/data/maps/BattleFrontier_Mart/scripts.inc
diff --git a/data/maps/BattleFrontier_OutsideEast/connections.inc b/data/maps/BattleFrontier_OutsideEast/connections.inc
index 5bc70f3b4..5a2d13f7f 100644
--- a/data/maps/BattleFrontier_OutsideEast/connections.inc
+++ b/data/maps/BattleFrontier_OutsideEast/connections.inc
@@ -1,5 +1,5 @@
 BattleFrontier_OutsideEast_MapConnectionsList: @ 8486EE4
-	connection left, 0, BATTLE_FRONTIER_OUTSIDE_WEST, 0
+	connection left, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
 
 BattleFrontier_OutsideEast_MapConnections: @ 8486EF0
 	.4byte 0x1
diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc
new file mode 100644
index 000000000..37fa6e7bd
--- /dev/null
+++ b/data/maps/BattleFrontier_OutsideEast/events.inc
@@ -0,0 +1,57 @@
+BattleFrontier_OutsideEast_EventObjects: @ 853BB10
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 20, 17, 0, 27, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 42, 15, 0, 2, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0
+	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0
+	object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 54, 16, 0, 2, 2, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0
+	object_event 6, EVENT_OBJ_GFX_COOK, 0, 41, 56, 3, 9, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 46, 0, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0
+	object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 34, 41, 0, 28, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0
+	object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 45, 47, 3, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0
+	object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 59, 35, 0, 26, 1, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0
+	object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 18, 40, 0, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, 10, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0
+	object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0
+	object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, 8, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842
+	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0
+	object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, 2, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0
+	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, 46, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 11, 21, 0, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0
+	object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 21, 0, 10, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0
+	object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 30, 0, 2, 3, 2, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0
+	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0
+	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 54, 31, 0, 9, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 54, 32, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0
+	object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 58, 55, 3, 17, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0
+	object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0
+	object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0
+
+BattleFrontier_OutsideEast_MapWarps: @ 853BD80
+	warp_def 16, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
+	warp_def 39, 29, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY
+	warp_def 45, 56, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
+	warp_def 58, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY
+	warp_def 35, 12, 3, 0, MAP_BATTLE_FRONTIER_RANKING_HALL
+	warp_def 4, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE1
+	warp_def 10, 28, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER
+	warp_def 22, 51, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE5
+	warp_def 5, 8, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE6
+	warp_def 65, 31, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE3
+	warp_def 14, 51, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE8
+	warp_def 21, 45, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE9
+	warp_def 3, 51, 0, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F
+	warp_def 28, 7, 0, 0, MAP_ARTISAN_CAVE_1F
+
+BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0
+	bg_event 13, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C43
+	bg_event 43, 56, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C4C
+	bg_event 36, 34, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C55
+	bg_event 62, 15, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C5E
+	bg_event 7, 29, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DD7
+	bg_event 32, 13, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DCE
+	bg_event 4, 51, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_271E73
+	bg_event 5, 51, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_271E73
+
+BattleFrontier_OutsideEast_MapEvents:: @ 853BE50
+	map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents
+
diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc
index f40bfc1f3..f9dc82cba 100644
--- a/data/maps/BattleFrontier_OutsideEast/header.inc
+++ b/data/maps/BattleFrontier_OutsideEast/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_OutsideEast: @ 84852C4
-	.4byte BattleFrontier_OutsideEast_MapAttributes
+	.4byte BattleFrontier_OutsideEast_Layout
 	.4byte BattleFrontier_OutsideEast_MapEvents
 	.4byte BattleFrontier_OutsideEast_MapScripts
 	.4byte BattleFrontier_OutsideEast_MapConnections
diff --git a/data/scripts/maps/BattleFrontier_OutsideEast.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc
index dff56322a..dff56322a 100644
--- a/data/scripts/maps/BattleFrontier_OutsideEast.inc
+++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc
diff --git a/data/maps/BattleFrontier_OutsideWest/connections.inc b/data/maps/BattleFrontier_OutsideWest/connections.inc
index 2ec2e4348..1d20172f2 100644
--- a/data/maps/BattleFrontier_OutsideWest/connections.inc
+++ b/data/maps/BattleFrontier_OutsideWest/connections.inc
@@ -1,5 +1,5 @@
 BattleFrontier_OutsideWest_MapConnectionsList: @ 8486ED0
-	connection right, 0, BATTLE_FRONTIER_OUTSIDE_EAST, 0
+	connection right, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
 
 BattleFrontier_OutsideWest_MapConnections: @ 8486EDC
 	.4byte 0x1
diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc
new file mode 100644
index 000000000..643e26e2e
--- /dev/null
+++ b/data/maps/BattleFrontier_OutsideWest/events.inc
@@ -0,0 +1,49 @@
+BattleFrontier_OutsideWest_EventObjects: @ 853B350
+	object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, 2, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, 10, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 27, 30, 0, 2, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 41, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0
+	object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, 3, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0
+	object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0
+	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 23, 47, 0, 15, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0
+	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0
+	object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 45, 18, 0, 3, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0
+	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, 15, 1, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0
+	object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, 2, 2, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, 9, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0
+	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0
+	object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, 18, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0
+	object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, 3, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0
+	object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 9, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0
+	object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0
+	object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 10, 0, 23, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0
+	object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 8, 5, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0
+	object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 26, 0, 24, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0
+
+BattleFrontier_OutsideWest_MapWarps: @ 853B590
+	warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY
+	warp_def 19, 17, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY
+	warp_def 11, 38, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY
+	warp_def 45, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE2
+	warp_def 51, 51, 0, 0, MAP_BATTLE_FRONTIER_MART
+	warp_def 44, 5, 0, 0, MAP_BATTLE_FRONTIER_SCOTTS_HOUSE
+	warp_def 53, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE4
+	warp_def 5, 20, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE7
+	warp_def 26, 65, 0, 0, MAP_BATTLE_FRONTIER_RECEPTION_GATE
+	warp_def 26, 61, 0, 1, MAP_BATTLE_FRONTIER_RECEPTION_GATE
+	warp_def 39, 55, 0, 0, MAP_ARTISAN_CAVE_B1F
+
+BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8
+	bg_event 15, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4E2
+	bg_event 45, 30, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4F4
+	bg_event 16, 43, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4EB
+	bg_event 52, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A
+	bg_event 53, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A
+
+BattleFrontier_OutsideWest_MapEvents:: @ 853B624
+	map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents
+
diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc
index 24f1ce14b..319ecec6a 100644
--- a/data/maps/BattleFrontier_OutsideWest/header.inc
+++ b/data/maps/BattleFrontier_OutsideWest/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_OutsideWest: @ 84851AC
-	.4byte BattleFrontier_OutsideWest_MapAttributes
+	.4byte BattleFrontier_OutsideWest_Layout
 	.4byte BattleFrontier_OutsideWest_MapEvents
 	.4byte BattleFrontier_OutsideWest_MapScripts
 	.4byte BattleFrontier_OutsideWest_MapConnections
diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc
new file mode 100644
index 000000000..bd9d508dd
--- /dev/null
+++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc
@@ -0,0 +1,526 @@
+BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1
+	map_script 3, BattleFrontier_OutsideWest_MapScript1_23D3E7
+	.byte 0
+
+BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7
+	setvar VAR_0x40BC, 0
+	setflag FLAG_0x396
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0
+	lock
+	faceplayer
+	msgbox BattleFrontier_OutsideWest_Text_23D808, 4
+	checkitem ITEM_SS_TICKET, 1
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_OutsideWest_EventScript_23D44E
+	message BattleFrontier_OutsideWest_Text_23D89D
+	waitmessage
+	goto BattleFrontier_OutsideWest_EventScript_23D416
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D416:: @ 823D416
+	multichoicedefault 18, 6, 53, 2, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_OutsideWest_EventScript_23D458
+	case 1, BattleFrontier_OutsideWest_EventScript_23D483
+	case 2, BattleFrontier_OutsideWest_EventScript_23D4D8
+	case 127, BattleFrontier_OutsideWest_EventScript_23D4D8
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E
+	msgbox BattleFrontier_OutsideWest_Text_23D842, 4
+	release
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458
+	msgbox BattleFrontier_OutsideWest_Text_23D8F2, 5
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE
+	msgbox BattleFrontier_OutsideWest_Text_23D94B, 4
+	call BattleFrontier_OutsideWest_EventScript_23D4BA
+	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
+	waitstate
+	release
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483
+	msgbox BattleFrontier_OutsideWest_Text_23D90E, 5
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE
+	msgbox BattleFrontier_OutsideWest_Text_23D94B, 4
+	call BattleFrontier_OutsideWest_EventScript_23D4BA
+	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
+	waitstate
+	release
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE
+	message BattleFrontier_OutsideWest_Text_23D97A
+	waitmessage
+	goto BattleFrontier_OutsideWest_EventScript_23D416
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA
+	closemessage
+	applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA
+	waitmovement 0
+	delay 30
+	hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+	setvar VAR_0x8004, 2
+	call BattleFrontier_OutsideWest_EventScript_272250
+	return
+
+BattleFrontier_OutsideWest_EventScript_23D4D8:: @ 823D4D8
+	msgbox BattleFrontier_OutsideWest_Text_23D929, 4
+	release
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D4E2:: @ 823D4E2
+	msgbox BattleFrontier_OutsideWest_Text_23D6F7, 3
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D4EB:: @ 823D4EB
+	msgbox BattleFrontier_OutsideWest_Text_23D737, 3
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D4F4:: @ 823D4F4
+	msgbox BattleFrontier_OutsideWest_Text_23D772, 3
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D4FD:: @ 823D4FD
+	msgbox BattleFrontier_OutsideWest_Text_23D7A6, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D506:: @ 823D4FD
+	msgbox BattleFrontier_OutsideWest_Text_23D9DD, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D50F:: @ 823D50F
+	msgbox BattleFrontier_OutsideWest_Text_23D99C, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518
+	lock
+	faceplayer
+	message BattleFrontier_OutsideWest_Text_23DA60
+	waitmessage
+	applymovement 18, BattleFrontier_OutsideWest_Movement_2725A0
+	waitmovement 0
+	waitbuttonpress
+	release
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D52D:: @ 823D52D
+	msgbox BattleFrontier_OutsideWest_Text_23DABF, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D536:: @ 823D536
+	lock
+	goto BattleFrontier_OutsideWest_EventScript_23D544
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D
+	lock
+	goto BattleFrontier_OutsideWest_EventScript_23D544
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544
+	applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8
+	waitmovement 0
+	msgbox BattleFrontier_OutsideWest_Text_23DB7D, 4
+	applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4
+	waitmovement 0
+	msgbox BattleFrontier_OutsideWest_Text_23DBCE, 4
+	closemessage
+	delay 25
+	applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6
+	applymovement 10, BattleFrontier_OutsideWest_Movement_2725A6
+	waitmovement 0
+	release
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F
+	lock
+	faceplayer
+	delay 20
+	compare VAR_FACING, 2
+	call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA
+	compare VAR_FACING, 1
+	call_if 1, BattleFrontier_OutsideWest_EventScript_23D5C5
+	compare VAR_FACING, 3
+	call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA
+	compare VAR_FACING, 4
+	call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA
+	msgbox BattleFrontier_OutsideWest_Text_23DC36, 4
+	release
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA
+	applymovement 14, BattleFrontier_OutsideWest_Movement_2725A6
+	waitmovement 0
+	return
+
+BattleFrontier_OutsideWest_EventScript_23D5C5:: @ 823D5C5
+	return
+
+BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6
+	lock
+	faceplayer
+	message BattleFrontier_OutsideWest_Text_23DCB0
+	waitmessage
+	compare VAR_FACING, 2
+	call_if 1, BattleFrontier_OutsideWest_EventScript_23D5FD
+	compare VAR_FACING, 1
+	call_if 1, BattleFrontier_OutsideWest_EventScript_23D608
+	compare VAR_FACING, 3
+	call_if 1, BattleFrontier_OutsideWest_EventScript_23D613
+	compare VAR_FACING, 4
+	call_if 1, BattleFrontier_OutsideWest_EventScript_23D61E
+	waitbuttonpress
+	release
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D5FD:: @ 823D5FD
+	applymovement 12, BattleFrontier_OutsideWest_Movement_23D629
+	waitmovement 0
+	return
+
+BattleFrontier_OutsideWest_EventScript_23D608:: @ 823D608
+	applymovement 12, BattleFrontier_OutsideWest_Movement_23D62C
+	waitmovement 0
+	return
+
+BattleFrontier_OutsideWest_EventScript_23D613:: @ 823D613
+	applymovement 12, BattleFrontier_OutsideWest_Movement_23D62F
+	waitmovement 0
+	return
+
+BattleFrontier_OutsideWest_EventScript_23D61E:: @ 823D61E
+	applymovement 12, BattleFrontier_OutsideWest_Movement_23D632
+	waitmovement 0
+	return
+
+BattleFrontier_OutsideWest_Movement_23D629: @ 823D629
+	walk_in_place_fastest_down
+	walk_in_place_fastest_down
+	step_end
+
+BattleFrontier_OutsideWest_Movement_23D62C: @ 823D62C
+	walk_in_place_fastest_up
+	walk_in_place_fastest_up
+	step_end
+
+BattleFrontier_OutsideWest_Movement_23D62F: @ 823D62F
+	walk_in_place_fastest_right
+	walk_in_place_fastest_right
+	step_end
+
+BattleFrontier_OutsideWest_Movement_23D632: @ 823D632
+	walk_in_place_fastest_left
+	walk_in_place_fastest_left
+	step_end
+
+BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635
+	lock
+	faceplayer
+	msgbox BattleFrontier_OutsideWest_Text_23DD3B, 4
+	random 2
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_OutsideWest_EventScript_23D653
+	goto BattleFrontier_OutsideWest_EventScript_23D65D
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D653:: @ 823D653
+	msgbox BattleFrontier_OutsideWest_Text_23DD7A, 4
+	release
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D65D:: @ 823D65D
+	msgbox BattleFrontier_OutsideWest_Text_23DDAD, 4
+	release
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D667:: @ 823D667
+	msgbox BattleFrontier_OutsideWest_Text_23DE15, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D670:: @ 823D670
+	msgbox BattleFrontier_OutsideWest_Text_23DF7D, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D679:: @ 823D679
+	msgbox BattleFrontier_OutsideWest_Text_23DEFD, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D682:: @ 823D682
+	msgbox BattleFrontier_OutsideWest_Text_23DEB4, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D68B:: @ 823D68B
+	msgbox BattleFrontier_OutsideWest_Text_23DFBF, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D694:: @ 823D694
+	msgbox BattleFrontier_OutsideWest_Text_23E01E, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D69D:: @ 823D69D
+	msgbox BattleFrontier_OutsideWest_Text_23E09F, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D6A6:: @ 823D6A6
+	msgbox BattleFrontier_OutsideWest_Text_23E102, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D6AF:: @ 823D6AF
+	msgbox BattleFrontier_OutsideWest_Text_23E154, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D6B8:: @ 823D6B8
+	lock
+	msgbox BattleFrontier_OutsideWest_Text_23E273, 4
+	release
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D6C3:: @ 823D6C3
+	lock
+	msgbox BattleFrontier_OutsideWest_Text_23E2E9, 4
+	release
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D6CE:: @ 823D6CE
+	msgbox BattleFrontier_OutsideWest_Text_23E37E, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7
+	lock
+	faceplayer
+	msgbox BattleFrontier_OutsideWest_Text_23E410, 4
+	closemessage
+	applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D6EE:: @ 823D6EE
+	msgbox BattleFrontier_OutsideWest_Text_23E5A5, 2
+	end
+
+BattleFrontier_OutsideWest_Text_23D6F7: @ 823D6F7
+	.string "This is the BATTLE DOME!\n"
+	.string "Your path to the invincible superstar!$"
+
+BattleFrontier_OutsideWest_Text_23D737: @ 823D737
+	.string "This is the BATTLE FACTORY!\n"
+	.string "Seek out the toughest POKéMON!$"
+
+BattleFrontier_OutsideWest_Text_23D772: @ 823D772
+	.string "This is the BATTLE PIKE!\n"
+	.string "Choose one of three paths!$"
+
+BattleFrontier_OutsideWest_Text_23D7A6: @ 823D7A6
+	.string "This is the BATTLE TOWER.\p"
+	.string "TRAINERS bring their best-raised\n"
+	.string "POKéMON for elimination-style matches.$"
+
+BattleFrontier_OutsideWest_Text_23D808: @ 823D808
+	.string "Hello, are you here for the ferry?\n"
+	.string "May I see your TICKET?$"
+
+BattleFrontier_OutsideWest_Text_23D842: @ 823D842
+	.string "{PLAYER} doesn’t have the TICKET…\p"
+	.string "I’m terribly sorry.\p"
+	.string "You must have a TICKET to board\n"
+	.string "the ferry.$"
+
+BattleFrontier_OutsideWest_Text_23D89D: @ 823D89D
+	.string "{PLAYER} flashed the TICKET.\p"
+	.string "Perfect! That’s all you need!\p"
+	.string "And where would you like to go?$"
+
+BattleFrontier_OutsideWest_Text_23D8F2: @ 823D8F2
+	.string "SLATEPORT CITY it is, then!$"
+
+BattleFrontier_OutsideWest_Text_23D90E: @ 823D90E
+	.string "LILYCOVE CITY it is, then!$"
+
+BattleFrontier_OutsideWest_Text_23D929: @ 823D929
+	.string "Please sail with us another time!$"
+
+BattleFrontier_OutsideWest_Text_23D94B: @ 823D94B
+	.string "Please board the ferry and wait for\n"
+	.string "departure.$"
+
+BattleFrontier_OutsideWest_Text_23D97A: @ 823D97A
+	.string "Then, where would you like to go?$"
+
+BattleFrontier_OutsideWest_Text_23D99C: @ 823D99C
+	.string "I’m the best out of all my friends.\n"
+	.string "But here…\l"
+	.string "I’ve been useless!$"
+
+BattleFrontier_OutsideWest_Text_23D9DD: @ 823D9DD
+	.string "I want to go to the BATTLE TOWER,\n"
+	.string "but I can’t find it even though I have\l"
+	.string "a map of the BATTLE FRONTIER.\p"
+	.string "This place is just too big!$"
+
+BattleFrontier_OutsideWest_Text_23DA60: @ 823DA60
+	.string "I wanted to take a challenge as soon\n"
+	.string "as I arrived here.\p"
+	.string "But on the way, I got seasick…\n"
+	.string "Urrrrp…$"
+
+BattleFrontier_OutsideWest_Text_23DABF: @ 823DABF
+	.string "It’s not as if just anyone can come\n"
+	.string "here, you know?\p"
+	.string "Only those TRAINERS who’ve been\n"
+	.string "recognized as tough are brought here.\p"
+	.string "That’s why many TRAINERS don’t even\n"
+	.string "know about the BATTLE FRONTIER.$"
+
+BattleFrontier_OutsideWest_Text_23DB7D: @ 823DB7D
+	.string "Hey, bro…\p"
+	.string "Are you sure we can make challenges\n"
+	.string "even if we don’t have any POKéMON?$"
+
+BattleFrontier_OutsideWest_Text_23DBCE: @ 823DBCE
+	.string "Uh…\n"
+	.string "I’m sure it’ll be okay.\p"
+	.string "I think…\p"
+	.string "But remember that big scary guy?\n"
+	.string "He said, “I’ll lend you POKéMON!”$"
+
+BattleFrontier_OutsideWest_Text_23DC36: @ 823DC36
+	.string "That’s the BATTLE FACTORY.\n"
+	.string "You can rent strong POKéMON there.\p"
+	.string "But it makes me wonder.\n"
+	.string "Who’s raising those rental POKéMON?$"
+
+BattleFrontier_OutsideWest_Text_23DCB0: @ 823DCB0
+	.string "I’m scared of going into the BATTLE\n"
+	.string "PIKE because of SEVIPER…\p"
+	.string "B-but I came all the way here, so I will\n"
+	.string "try to conquer everything!\l"
+	.string "…Shudder…$"
+
+BattleFrontier_OutsideWest_Text_23DD3B: @ 823DD3B
+	.string "Let’s play rock, paper, scissors!\n"
+	.string "One, two, three!\p"
+	.string "… … … … … …$"
+
+BattleFrontier_OutsideWest_Text_23DD7A: @ 823DD7A
+	.string "Yay! I won!\n"
+	.string "I will take the BATTLE PIKE challenge!$"
+
+BattleFrontier_OutsideWest_Text_23DDAD: @ 823DDAD
+	.string "Oh, no…\n"
+	.string "I lost.\p"
+	.string "I guess I’m not very lucky today.\n"
+	.string "I’ll put off my BATTLE PIKE challenge\l"
+	.string "until tomorrow.$"
+
+BattleFrontier_OutsideWest_Text_23DE15: @ 823DE15
+	.string "I believe I’m the only person here who,\n"
+	.string "for some unknown reason, would choose\l"
+	.string "fishing over battling.\p"
+	.string "Huh? You can’t catch anything here?\n"
+	.string "That’s disappointing…$"
+
+BattleFrontier_OutsideWest_Text_23DEB4: @ 823DEB4
+	.string "Today, I’m going to keep battling, no\n"
+	.string "matter what, until I get a Symbol.$"
+
+BattleFrontier_OutsideWest_Text_23DEFD: @ 823DEFD
+	.string "Oh? You’re off to challenge\n"
+	.string "the BATTLE DOME?\p"
+	.string "I’ll wish you the best of luck.\n"
+	.string "Let us both win our way up and meet\l"
+	.string "in challenges.$"
+
+BattleFrontier_OutsideWest_Text_23DF7D: @ 823DF7D
+	.string "Grandpa, over here!\n"
+	.string "The BATTLE DOME is here!\l"
+	.string "Go get ’em, Grandpa!$"
+
+BattleFrontier_OutsideWest_Text_23DFBF: @ 823DFBF
+	.string "Ah, so this here is the BATTLE DOME?\n"
+	.string "I won’t let GENTLEMEN beat me!\p"
+	.string "But where is the entrance?$"
+
+BattleFrontier_OutsideWest_Text_23E01E: @ 823E01E
+	.string "There used to be nothing here not all\n"
+	.string "that long ago.\p"
+	.string "But, now look at this place! Amazing!\n"
+	.string "I’ll bring my mother out to see this.$"
+
+BattleFrontier_OutsideWest_Text_23E09F: @ 823E09F
+	.string "I’ve finally arrived at the BATTLE\n"
+	.string "FRONTIER!\p"
+	.string "I’m sure to grab attention with\n"
+	.string "my looks and ability!$"
+
+BattleFrontier_OutsideWest_Text_23E102: @ 823E102
+	.string "Munch, munch…\p"
+	.string "It looks like this square’s filled with\n"
+	.string "tough people.\p"
+	.string "Munch, munch…$"
+
+BattleFrontier_OutsideWest_Text_23E154: @ 823E154
+	.string "Crunch, munch…\p"
+	.string "A while back, I met this older girl\n"
+	.string "at the BATTLE PIKE.\p"
+	.string "She had these eyes that were scary\n"
+	.string "in a real ornery way.\p"
+	.string "Crunch, munch…\p"
+	.string "She got all furious: “Will you quit\n"
+	.string "eating!” Then she whaled on me.\p"
+	.string "It was a hair-raising kind of\n"
+	.string "scary experience, sure enough.\p"
+	.string "Crunch, munch…$"
+
+BattleFrontier_OutsideWest_Text_23E273: @ 823E273
+	.string "Huh? Will you listen to yourself?\n"
+	.string "That’s nothing!\p"
+	.string "Why, the last time I cheered for him,\n"
+	.string "our eyes met and sparks flew!$"
+
+BattleFrontier_OutsideWest_Text_23E2E9: @ 823E2E9
+	.string "Whaaaaaat?!\n"
+	.string "Pfft!\p"
+	.string "That only happened because\n"
+	.string "I happened to be sitting next to you!\p"
+	.string "The DOME ACE only looked our way\n"
+	.string "because my cheering was so loud!$"
+
+BattleFrontier_OutsideWest_Text_23E37E: @ 823E37E
+	.string "Oh, shush!\n"
+	.string "Keep that racket down!\p"
+	.string "You fair-weather fans should stick\n"
+	.string "to cheering for some GYM LEADER!\p"
+	.string "The DOME ACE is mine!\n"
+	.string "The only idol for me!$"
+
+BattleFrontier_OutsideWest_Text_23E410: @ 823E410
+	.string "Those people squabbling over there…\p"
+	.string "It’s hard to believe, but they once\n"
+	.string "were TRAINERS, and good ones, too.\p"
+	.string "They used to be incredibly tough,\n"
+	.string "and they were famous, too.\p"
+	.string "But they were obliterated by this\n"
+	.string "certain TRAINER at a tournament.\p"
+	.string "They were so thoroughly whipped,\n"
+	.string "they became smitten by the TRAINER.\p"
+	.string "Now they’re just fans of the TRAINER.\n"
+	.string "They go cheer for their idol at the\l"
+	.string "BATTLE DOME every day now.$"
+
+BattleFrontier_OutsideWest_Text_23E5A5: @ 823E5A5
+	.string "I heard a rumor that someone saw\n"
+	.string "a POKéMON with an unusually long tail\l"
+	.string "somewhere in the BATTLE FRONTIER.\p"
+	.string "It must be adorable. I’m sure of it…\p"
+	.string "Oh, challenges can wait. I feel driven\n"
+	.string "to find the delightful creature!$"
+
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..ba07ed15c
--- /dev/null
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc
@@ -0,0 +1,15 @@
+BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0
+	object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0
+
+BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4
+	warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+	warp_def 6, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+	warp_def 1, 6, 4, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F
+
+BattleFrontier_PokemonCenter_1F_MapEvents:: @ 853D5EC
+	map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
index 561aba67e..22e3ff616 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_PokemonCenter_1F: @ 8485708
-	.4byte BattleFrontier_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte BattleFrontier_PokemonCenter_1F_MapEvents
 	.4byte BattleFrontier_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
index 23818d64c..23818d64c 100644
--- a/data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..bb5bb6119
--- /dev/null
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702
+
+BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660
+	warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+BattleFrontier_PokemonCenter_2F_MapEvents:: @ 853D678
+	map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
index 6aa965d08..361c58a04 100644
--- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_PokemonCenter_2F: @ 8485724
-	.4byte BattleFrontier_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte BattleFrontier_PokemonCenter_2F_MapEvents
 	.4byte BattleFrontier_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
index 7d3c3a2f1..7d3c3a2f1 100644
--- a/data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc
new file mode 100644
index 000000000..239c372c6
--- /dev/null
+++ b/data/maps/BattleFrontier_RankingHall/events.inc
@@ -0,0 +1,26 @@
+BattleFrontier_RankingHall_EventObjects: @ 853CEB8
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, 8, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 10, 3, 2, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, 2, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0
+
+BattleFrontier_RankingHall_MapWarps: @ 853CF00
+	warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+	warp_def 27, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_RankingHall_MapBGEvents: @ 853CF10
+	bg_event 26, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4AA
+	bg_event 23, 8, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4B6
+	bg_event 26, 5, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4C2
+	bg_event 29, 8, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4CE
+	bg_event 42, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4DA
+	bg_event 46, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4E6
+	bg_event 10, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4F2
+	bg_event 8, 7, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4FE
+	bg_event 6, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E50A
+	bg_event 44, 7, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E516
+	bg_event 16, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E538
+	bg_event 36, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E541
+
+BattleFrontier_RankingHall_MapEvents:: @ 853CFA0
+	map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents
+
diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc
index b068fbacc..340ba9597 100644
--- a/data/maps/BattleFrontier_RankingHall/header.inc
+++ b/data/maps/BattleFrontier_RankingHall/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_RankingHall: @ 848559C
-	.4byte BattleFrontier_RankingHall_MapAttributes
+	.4byte BattleFrontier_RankingHall_Layout
 	.4byte BattleFrontier_RankingHall_MapEvents
 	.4byte BattleFrontier_RankingHall_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_RankingHall.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc
index e469024e9..e469024e9 100644
--- a/data/scripts/maps/BattleFrontier_RankingHall.inc
+++ b/data/maps/BattleFrontier_RankingHall/scripts.inc
diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc
new file mode 100644
index 000000000..34db359fc
--- /dev/null
+++ b/data/maps/BattleFrontier_ReceptionGate/events.inc
@@ -0,0 +1,14 @@
+BattleFrontier_ReceptionGate_EventObjects: @ 853D420
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, 10, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, 9, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, 9, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0
+	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, 8, 1, 1, 0, 0, 0x0, 836
+	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, 10, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0
+
+BattleFrontier_ReceptionGate_MapWarps: @ 853D498
+	warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+	warp_def 4, 1, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_ReceptionGate_MapEvents:: @ 853D4A8
+	map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc
index 32387ef0d..8f395bae4 100644
--- a/data/maps/BattleFrontier_ReceptionGate/header.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_ReceptionGate: @ 84856B4
-	.4byte BattleFrontier_ReceptionGate_MapAttributes
+	.4byte BattleFrontier_ReceptionGate_Layout
 	.4byte BattleFrontier_ReceptionGate_MapEvents
 	.4byte BattleFrontier_ReceptionGate_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
index ec38c3e9d..ec38c3e9d 100644
--- a/data/scripts/maps/BattleFrontier_ReceptionGate.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
diff --git a/data/maps/BattleFrontier_ScottsHouse/events.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc
new file mode 100644
index 000000000..6e3de083c
--- /dev/null
+++ b/data/maps/BattleFrontier_ScottsHouse/events.inc
@@ -0,0 +1,10 @@
+BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0
+	object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 2, 3, 3, 1, 1, 1, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0
+
+BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8
+	warp_def 2, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+	warp_def 3, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_ScottsHouse_MapEvents:: @ 853D2D8
+	map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc
index 1ac7c9524..f0e0be773 100644
--- a/data/maps/BattleFrontier_ScottsHouse/header.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/header.inc
@@ -1,5 +1,5 @@
 BattleFrontier_ScottsHouse: @ 8485644
-	.4byte BattleFrontier_ScottsHouse_MapAttributes
+	.4byte BattleFrontier_ScottsHouse_Layout
 	.4byte BattleFrontier_ScottsHouse_MapEvents
 	.4byte BattleFrontier_ScottsHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattleFrontier_ScottsHouse.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
index 5be72b9b5..5be72b9b5 100644
--- a/data/scripts/maps/BattleFrontier_ScottsHouse.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
diff --git a/data/maps/BattlePyramidSquare01/events.inc b/data/maps/BattlePyramidSquare01/events.inc
new file mode 100644
index 000000000..677499152
--- /dev/null
+++ b/data/maps/BattlePyramidSquare01/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare01_EventObjects: @ 853A460
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 3, 4, 18, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 2, 6, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 6, 4, 9, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare01_MapEvents:: @ 853A508
+	map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc
index 94605c92c..7ed6b181b 100644
--- a/data/maps/BattlePyramidSquare01/header.inc
+++ b/data/maps/BattlePyramidSquare01/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare01: @ 8484F60
-	.4byte BattlePyramidSquare01_MapAttributes
+	.4byte BattlePyramidSquare01_Layout
 	.4byte BattlePyramidSquare01_MapEvents
 	.4byte BattlePyramidSquare01_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare01.inc b/data/maps/BattlePyramidSquare01/scripts.inc
index c51e49ba7..c51e49ba7 100644
--- a/data/scripts/maps/BattlePyramidSquare01.inc
+++ b/data/maps/BattlePyramidSquare01/scripts.inc
diff --git a/data/maps/BattlePyramidSquare02/events.inc b/data/maps/BattlePyramidSquare02/events.inc
new file mode 100644
index 000000000..1133979ee
--- /dev/null
+++ b/data/maps/BattlePyramidSquare02/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare02_EventObjects: @ 853A51C
+	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, 18, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 1, 4, 17, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare02_MapEvents:: @ 853A5C4
+	map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc
index 44a5e7a99..9eb6ef754 100644
--- a/data/maps/BattlePyramidSquare02/header.inc
+++ b/data/maps/BattlePyramidSquare02/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare02: @ 8484F7C
-	.4byte BattlePyramidSquare02_MapAttributes
+	.4byte BattlePyramidSquare02_Layout
 	.4byte BattlePyramidSquare02_MapEvents
 	.4byte BattlePyramidSquare02_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare02.inc b/data/maps/BattlePyramidSquare02/scripts.inc
index a694b03bf..a694b03bf 100644
--- a/data/scripts/maps/BattlePyramidSquare02.inc
+++ b/data/maps/BattlePyramidSquare02/scripts.inc
diff --git a/data/maps/BattlePyramidSquare03/events.inc b/data/maps/BattlePyramidSquare03/events.inc
new file mode 100644
index 000000000..95fdb77bc
--- /dev/null
+++ b/data/maps/BattlePyramidSquare03/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare03_EventObjects: @ 853A5D8
+	object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, 18, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 1, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, 15, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 3, 4, 4, 18, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare03_MapEvents:: @ 853A680
+	map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc
index 300825ffa..3f07295ae 100644
--- a/data/maps/BattlePyramidSquare03/header.inc
+++ b/data/maps/BattlePyramidSquare03/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare03: @ 8484F98
-	.4byte BattlePyramidSquare03_MapAttributes
+	.4byte BattlePyramidSquare03_Layout
 	.4byte BattlePyramidSquare03_MapEvents
 	.4byte BattlePyramidSquare03_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare03.inc b/data/maps/BattlePyramidSquare03/scripts.inc
index 229dd5a28..229dd5a28 100644
--- a/data/scripts/maps/BattlePyramidSquare03.inc
+++ b/data/maps/BattlePyramidSquare03/scripts.inc
diff --git a/data/maps/BattlePyramidSquare04/events.inc b/data/maps/BattlePyramidSquare04/events.inc
new file mode 100644
index 000000000..3b19c7f09
--- /dev/null
+++ b/data/maps/BattlePyramidSquare04/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare04_EventObjects: @ 853A694
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 4, 17, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 1, 4, 4, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 6, 4, 4, 15, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare04_MapEvents:: @ 853A73C
+	map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc
index 4031f62e3..978c4f466 100644
--- a/data/maps/BattlePyramidSquare04/header.inc
+++ b/data/maps/BattlePyramidSquare04/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare04: @ 8484FB4
-	.4byte BattlePyramidSquare04_MapAttributes
+	.4byte BattlePyramidSquare04_Layout
 	.4byte BattlePyramidSquare04_MapEvents
 	.4byte BattlePyramidSquare04_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare04.inc b/data/maps/BattlePyramidSquare04/scripts.inc
index a231965b5..a231965b5 100644
--- a/data/scripts/maps/BattlePyramidSquare04.inc
+++ b/data/maps/BattlePyramidSquare04/scripts.inc
diff --git a/data/maps/BattlePyramidSquare05/events.inc b/data/maps/BattlePyramidSquare05/events.inc
new file mode 100644
index 000000000..17f6aab60
--- /dev/null
+++ b/data/maps/BattlePyramidSquare05/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare05_EventObjects: @ 853A750
+	object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 6, 4, 4, 7, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, 8, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 0, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare05_MapEvents:: @ 853A7F8
+	map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc
index 72575d629..09a7e4703 100644
--- a/data/maps/BattlePyramidSquare05/header.inc
+++ b/data/maps/BattlePyramidSquare05/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare05: @ 8484FD0
-	.4byte BattlePyramidSquare05_MapAttributes
+	.4byte BattlePyramidSquare05_Layout
 	.4byte BattlePyramidSquare05_MapEvents
 	.4byte BattlePyramidSquare05_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare05.inc b/data/maps/BattlePyramidSquare05/scripts.inc
index e4670f78c..e4670f78c 100644
--- a/data/scripts/maps/BattlePyramidSquare05.inc
+++ b/data/maps/BattlePyramidSquare05/scripts.inc
diff --git a/data/maps/BattlePyramidSquare06/events.inc b/data/maps/BattlePyramidSquare06/events.inc
new file mode 100644
index 000000000..6ae39b52f
--- /dev/null
+++ b/data/maps/BattlePyramidSquare06/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare06_EventObjects: @ 853A80C
+	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, 16, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, 15, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 4, 18, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare06_MapEvents:: @ 853A8B4
+	map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc
index 8d0fa49b1..e99531da8 100644
--- a/data/maps/BattlePyramidSquare06/header.inc
+++ b/data/maps/BattlePyramidSquare06/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare06: @ 8484FEC
-	.4byte BattlePyramidSquare06_MapAttributes
+	.4byte BattlePyramidSquare06_Layout
 	.4byte BattlePyramidSquare06_MapEvents
 	.4byte BattlePyramidSquare06_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare06.inc b/data/maps/BattlePyramidSquare06/scripts.inc
index 6c0d38e41..6c0d38e41 100644
--- a/data/scripts/maps/BattlePyramidSquare06.inc
+++ b/data/maps/BattlePyramidSquare06/scripts.inc
diff --git a/data/maps/BattlePyramidSquare07/events.inc b/data/maps/BattlePyramidSquare07/events.inc
new file mode 100644
index 000000000..788c5e40c
--- /dev/null
+++ b/data/maps/BattlePyramidSquare07/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare07_EventObjects: @ 853A8C8
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 4, 10, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 0, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 0, 4, 8, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 4, 4, 15, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare07_MapEvents:: @ 853A970
+	map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc
index 12c74516a..13c23c24b 100644
--- a/data/maps/BattlePyramidSquare07/header.inc
+++ b/data/maps/BattlePyramidSquare07/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare07: @ 8485008
-	.4byte BattlePyramidSquare07_MapAttributes
+	.4byte BattlePyramidSquare07_Layout
 	.4byte BattlePyramidSquare07_MapEvents
 	.4byte BattlePyramidSquare07_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare07.inc b/data/maps/BattlePyramidSquare07/scripts.inc
index 8603a6916..8603a6916 100644
--- a/data/scripts/maps/BattlePyramidSquare07.inc
+++ b/data/maps/BattlePyramidSquare07/scripts.inc
diff --git a/data/maps/BattlePyramidSquare08/events.inc b/data/maps/BattlePyramidSquare08/events.inc
new file mode 100644
index 000000000..780fab9ed
--- /dev/null
+++ b/data/maps/BattlePyramidSquare08/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare08_EventObjects: @ 853A984
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 2, 4, 18, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 5, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 2, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare08_MapEvents:: @ 853AA2C
+	map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc
index cfe221f4b..a12b6016e 100644
--- a/data/maps/BattlePyramidSquare08/header.inc
+++ b/data/maps/BattlePyramidSquare08/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare08: @ 8485024
-	.4byte BattlePyramidSquare08_MapAttributes
+	.4byte BattlePyramidSquare08_Layout
 	.4byte BattlePyramidSquare08_MapEvents
 	.4byte BattlePyramidSquare08_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare08.inc b/data/maps/BattlePyramidSquare08/scripts.inc
index 68a055f0e..68a055f0e 100644
--- a/data/scripts/maps/BattlePyramidSquare08.inc
+++ b/data/maps/BattlePyramidSquare08/scripts.inc
diff --git a/data/maps/BattlePyramidSquare09/events.inc b/data/maps/BattlePyramidSquare09/events.inc
new file mode 100644
index 000000000..569059af5
--- /dev/null
+++ b/data/maps/BattlePyramidSquare09/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare09_EventObjects: @ 853AA40
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 0, 4, 8, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 4, 4, 15, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 0, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 5, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare09_MapEvents:: @ 853AAE8
+	map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc
index 624b64800..486c74bc0 100644
--- a/data/maps/BattlePyramidSquare09/header.inc
+++ b/data/maps/BattlePyramidSquare09/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare09: @ 8485040
-	.4byte BattlePyramidSquare09_MapAttributes
+	.4byte BattlePyramidSquare09_Layout
 	.4byte BattlePyramidSquare09_MapEvents
 	.4byte BattlePyramidSquare09_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare09.inc b/data/maps/BattlePyramidSquare09/scripts.inc
index e93734988..e93734988 100644
--- a/data/scripts/maps/BattlePyramidSquare09.inc
+++ b/data/maps/BattlePyramidSquare09/scripts.inc
diff --git a/data/maps/BattlePyramidSquare10/events.inc b/data/maps/BattlePyramidSquare10/events.inc
new file mode 100644
index 000000000..ae3c4f88e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare10/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare10_EventObjects: @ 853AAFC
+	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, 10, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, 9, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 4, 10, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare10_MapEvents:: @ 853ABA4
+	map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc
index 16206bfe9..a73718125 100644
--- a/data/maps/BattlePyramidSquare10/header.inc
+++ b/data/maps/BattlePyramidSquare10/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare10: @ 848505C
-	.4byte BattlePyramidSquare10_MapAttributes
+	.4byte BattlePyramidSquare10_Layout
 	.4byte BattlePyramidSquare10_MapEvents
 	.4byte BattlePyramidSquare10_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare10.inc b/data/maps/BattlePyramidSquare10/scripts.inc
index 412e608e7..412e608e7 100644
--- a/data/scripts/maps/BattlePyramidSquare10.inc
+++ b/data/maps/BattlePyramidSquare10/scripts.inc
diff --git a/data/maps/BattlePyramidSquare11/events.inc b/data/maps/BattlePyramidSquare11/events.inc
new file mode 100644
index 000000000..0389ee141
--- /dev/null
+++ b/data/maps/BattlePyramidSquare11/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare11_EventObjects: @ 853ABB8
+	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 3, 2, 4, 8, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 3, 6, 4, 14, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 6, 4, 4, 8, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 6, 7, 4, 7, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare11_MapEvents:: @ 853AC60
+	map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc
index 34a53fdee..eac3cb1c7 100644
--- a/data/maps/BattlePyramidSquare11/header.inc
+++ b/data/maps/BattlePyramidSquare11/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare11: @ 8485078
-	.4byte BattlePyramidSquare11_MapAttributes
+	.4byte BattlePyramidSquare11_Layout
 	.4byte BattlePyramidSquare11_MapEvents
 	.4byte BattlePyramidSquare11_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare11.inc b/data/maps/BattlePyramidSquare11/scripts.inc
index 3b82fb925..3b82fb925 100644
--- a/data/scripts/maps/BattlePyramidSquare11.inc
+++ b/data/maps/BattlePyramidSquare11/scripts.inc
diff --git a/data/maps/BattlePyramidSquare12/events.inc b/data/maps/BattlePyramidSquare12/events.inc
new file mode 100644
index 000000000..db27c6c64
--- /dev/null
+++ b/data/maps/BattlePyramidSquare12/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare12_EventObjects: @ 853AC74
+	object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 7, 5, 4, 9, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, 10, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, 8, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 3, 4, 7, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare12_MapEvents:: @ 853AD1C
+	map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc
index c514b4f4f..a1d5585c8 100644
--- a/data/maps/BattlePyramidSquare12/header.inc
+++ b/data/maps/BattlePyramidSquare12/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare12: @ 8485094
-	.4byte BattlePyramidSquare12_MapAttributes
+	.4byte BattlePyramidSquare12_Layout
 	.4byte BattlePyramidSquare12_MapEvents
 	.4byte BattlePyramidSquare12_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare12.inc b/data/maps/BattlePyramidSquare12/scripts.inc
index 87a38213b..87a38213b 100644
--- a/data/scripts/maps/BattlePyramidSquare12.inc
+++ b/data/maps/BattlePyramidSquare12/scripts.inc
diff --git a/data/maps/BattlePyramidSquare13/events.inc b/data/maps/BattlePyramidSquare13/events.inc
new file mode 100644
index 000000000..12ac8ffe7
--- /dev/null
+++ b/data/maps/BattlePyramidSquare13/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare13_EventObjects: @ 853AD30
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 1, 4, 8, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, 7, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, 8, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 4, 7, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare13_MapEvents:: @ 853ADD8
+	map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc
index 23df0c29c..1c67b55e7 100644
--- a/data/maps/BattlePyramidSquare13/header.inc
+++ b/data/maps/BattlePyramidSquare13/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare13: @ 84850B0
-	.4byte BattlePyramidSquare13_MapAttributes
+	.4byte BattlePyramidSquare13_Layout
 	.4byte BattlePyramidSquare13_MapEvents
 	.4byte BattlePyramidSquare13_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare13.inc b/data/maps/BattlePyramidSquare13/scripts.inc
index 188109305..188109305 100644
--- a/data/scripts/maps/BattlePyramidSquare13.inc
+++ b/data/maps/BattlePyramidSquare13/scripts.inc
diff --git a/data/maps/BattlePyramidSquare14/events.inc b/data/maps/BattlePyramidSquare14/events.inc
new file mode 100644
index 000000000..c63fabee3
--- /dev/null
+++ b/data/maps/BattlePyramidSquare14/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare14_EventObjects: @ 853ADEC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 1, 4, 17, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 1, 4, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 5, 4, 15, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 4, 16, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare14_MapEvents:: @ 853AE94
+	map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc
index 8570d95ef..9dcea14fa 100644
--- a/data/maps/BattlePyramidSquare14/header.inc
+++ b/data/maps/BattlePyramidSquare14/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare14: @ 84850CC
-	.4byte BattlePyramidSquare14_MapAttributes
+	.4byte BattlePyramidSquare14_Layout
 	.4byte BattlePyramidSquare14_MapEvents
 	.4byte BattlePyramidSquare14_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare14.inc b/data/maps/BattlePyramidSquare14/scripts.inc
index 5ae39cb8a..5ae39cb8a 100644
--- a/data/scripts/maps/BattlePyramidSquare14.inc
+++ b/data/maps/BattlePyramidSquare14/scripts.inc
diff --git a/data/maps/BattlePyramidSquare15/events.inc b/data/maps/BattlePyramidSquare15/events.inc
new file mode 100644
index 000000000..f2332f18b
--- /dev/null
+++ b/data/maps/BattlePyramidSquare15/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare15_EventObjects: @ 853AEA8
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 1, 4, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 4, 15, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare15_MapEvents:: @ 853AF50
+	map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc
index 6120ec220..0429cbb0b 100644
--- a/data/maps/BattlePyramidSquare15/header.inc
+++ b/data/maps/BattlePyramidSquare15/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare15: @ 84850E8
-	.4byte BattlePyramidSquare15_MapAttributes
+	.4byte BattlePyramidSquare15_Layout
 	.4byte BattlePyramidSquare15_MapEvents
 	.4byte BattlePyramidSquare15_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare15.inc b/data/maps/BattlePyramidSquare15/scripts.inc
index f1b7782d7..f1b7782d7 100644
--- a/data/scripts/maps/BattlePyramidSquare15.inc
+++ b/data/maps/BattlePyramidSquare15/scripts.inc
diff --git a/data/maps/BattlePyramidSquare16/events.inc b/data/maps/BattlePyramidSquare16/events.inc
new file mode 100644
index 000000000..38d398b5b
--- /dev/null
+++ b/data/maps/BattlePyramidSquare16/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare16_EventObjects: @ 853AF64
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 16, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 0, 0, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 7, 4, 15, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 17, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+
+BattlePyramidSquare16_MapEvents:: @ 853B00C
+	map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc
index 4df56bbc7..ea4627aa5 100644
--- a/data/maps/BattlePyramidSquare16/header.inc
+++ b/data/maps/BattlePyramidSquare16/header.inc
@@ -1,5 +1,5 @@
 BattlePyramidSquare16: @ 8485104
-	.4byte BattlePyramidSquare16_MapAttributes
+	.4byte BattlePyramidSquare16_Layout
 	.4byte BattlePyramidSquare16_MapEvents
 	.4byte BattlePyramidSquare16_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BattlePyramidSquare16.inc b/data/maps/BattlePyramidSquare16/scripts.inc
index 9308930d1..9308930d1 100644
--- a/data/scripts/maps/BattlePyramidSquare16.inc
+++ b/data/maps/BattlePyramidSquare16/scripts.inc
diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc
new file mode 100644
index 000000000..86f4d43cb
--- /dev/null
+++ b/data/maps/BirthIsland_Exterior/events.inc
@@ -0,0 +1,10 @@
+BirthIsland_Exterior_EventObjects: @ 853D7DC
+	object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, 8, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764
+	object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, 8, 1, 1, 0, 0, 0x0, 763
+
+BirthIsland_Exterior_MapWarps: @ 853D80C
+	warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR
+
+BirthIsland_Exterior_MapEvents:: @ 853D814
+	map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc
index 5697555de..069bbc99c 100644
--- a/data/maps/BirthIsland_Exterior/header.inc
+++ b/data/maps/BirthIsland_Exterior/header.inc
@@ -1,5 +1,5 @@
 BirthIsland_Exterior: @ 8485794
-	.4byte BirthIsland_Exterior_MapAttributes
+	.4byte BirthIsland_Exterior_Layout
 	.4byte BirthIsland_Exterior_MapEvents
 	.4byte BirthIsland_Exterior_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index b2427e95d..b2427e95d 100644
--- a/data/scripts/maps/BirthIsland_Exterior.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
diff --git a/data/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc
new file mode 100644
index 000000000..f5c38358d
--- /dev/null
+++ b/data/maps/BirthIsland_Harbor/events.inc
@@ -0,0 +1,10 @@
+BirthIsland_Harbor_EventObjects: @ 853D828
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, 7, 1, 1, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, 10, 1, 1, 0, 0, 0x0, 0
+
+BirthIsland_Harbor_MapWarps: @ 853D858
+	warp_def 8, 2, 0, 0, MAP_BIRTH_ISLAND_EXTERIOR
+
+BirthIsland_Harbor_MapEvents:: @ 853D860
+	map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc
index 9a9a5954b..e9dc265f5 100644
--- a/data/maps/BirthIsland_Harbor/header.inc
+++ b/data/maps/BirthIsland_Harbor/header.inc
@@ -1,5 +1,5 @@
 BirthIsland_Harbor: @ 84857B0
-	.4byte BirthIsland_Harbor_MapAttributes
+	.4byte IslandHarbor_Layout
 	.4byte BirthIsland_Harbor_MapEvents
 	.4byte BirthIsland_Harbor_MapScripts
 	.4byte 0x0
diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc
new file mode 100644
index 000000000..fe939172d
--- /dev/null
+++ b/data/maps/BirthIsland_Harbor/scripts.inc
@@ -0,0 +1,27 @@
+BirthIsland_Harbor_MapScripts:: @ 826805C
+	.byte 0
+
+BirthIsland_Harbor_EventScript_26805D:: @ 826805D
+	lock
+	faceplayer
+	msgbox BirthIsland_Harbor_Text_2C6B90, 5
+	compare VAR_RESULT, 0
+	goto_eq BirthIsland_Harbor_EventScript_2680A2
+	msgbox BirthIsland_Harbor_Text_2A6A5D, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA
+	waitmovement 0
+	delay 30
+	hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR
+	setvar VAR_0x8004, 2
+	call BirthIsland_Harbor_EventScript_272250
+	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
+	waitstate
+	release
+	end
+
+BirthIsland_Harbor_EventScript_2680A2:: @ 82680A2
+	msgbox BirthIsland_Harbor_Text_2A6A82, 4
+	release
+	end
+
diff --git a/data/maps/CaveOfOrigin_1F/events.inc b/data/maps/CaveOfOrigin_1F/events.inc
new file mode 100644
index 000000000..bdc629846
--- /dev/null
+++ b/data/maps/CaveOfOrigin_1F/events.inc
@@ -0,0 +1,7 @@
+CaveOfOrigin_1F_MapWarps: @ 8535D40
+	warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE
+	warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F
+
+CaveOfOrigin_1F_MapEvents:: @ 8535D50
+	map_events 0x0, CaveOfOrigin_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc
index 97b1a7664..0fa252cc5 100644
--- a/data/maps/CaveOfOrigin_1F/header.inc
+++ b/data/maps/CaveOfOrigin_1F/header.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_1F: @ 84842E8
-	.4byte CaveOfOrigin_1F_MapAttributes
+	.4byte CaveOfOrigin_1F_Layout
 	.4byte CaveOfOrigin_1F_MapEvents
 	.4byte CaveOfOrigin_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/scripts.inc
index 42c78d4b7..42c78d4b7 100644
--- a/data/scripts/maps/CaveOfOrigin_1F.inc
+++ b/data/maps/CaveOfOrigin_1F/scripts.inc
diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc
new file mode 100644
index 000000000..72a2c6210
--- /dev/null
+++ b/data/maps/CaveOfOrigin_B1F/events.inc
@@ -0,0 +1,9 @@
+CaveOfOrigin_B1F_EventObjects: @ 8535DD0
+	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, 7, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820
+
+CaveOfOrigin_B1F_MapWarps: @ 8535DE8
+	warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F
+
+CaveOfOrigin_B1F_MapEvents:: @ 8535DF0
+	map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc
index d9d011a50..629806ad6 100644
--- a/data/maps/CaveOfOrigin_B1F/header.inc
+++ b/data/maps/CaveOfOrigin_B1F/header.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_B1F: @ 8484358
-	.4byte CaveOfOrigin_B1F_MapAttributes
+	.4byte CaveOfOrigin_B1F_Layout
 	.4byte CaveOfOrigin_B1F_MapEvents
 	.4byte CaveOfOrigin_B1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc
index 5ac3ec64a..5ac3ec64a 100644
--- a/data/scripts/maps/CaveOfOrigin_B1F.inc
+++ b/data/maps/CaveOfOrigin_B1F/scripts.inc
diff --git a/data/maps/CaveOfOrigin_Entrance/events.inc b/data/maps/CaveOfOrigin_Entrance/events.inc
new file mode 100644
index 000000000..5a5ad59f7
--- /dev/null
+++ b/data/maps/CaveOfOrigin_Entrance/events.inc
@@ -0,0 +1,7 @@
+CaveOfOrigin_Entrance_MapWarps: @ 8535D1C
+	warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY
+	warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F
+
+CaveOfOrigin_Entrance_MapEvents:: @ 8535D2C
+	map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc
index f2eab2e2b..b3e4dea97 100644
--- a/data/maps/CaveOfOrigin_Entrance/header.inc
+++ b/data/maps/CaveOfOrigin_Entrance/header.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_Entrance: @ 84842CC
-	.4byte CaveOfOrigin_Entrance_MapAttributes
+	.4byte CaveOfOrigin_Entrance_Layout
 	.4byte CaveOfOrigin_Entrance_MapEvents
 	.4byte CaveOfOrigin_Entrance_MapScripts
 	.4byte 0x0
diff --git a/data/maps/CaveOfOrigin_Entrance/scripts.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc
new file mode 100644
index 000000000..1a771ae82
--- /dev/null
+++ b/data/maps/CaveOfOrigin_Entrance/scripts.inc
@@ -0,0 +1,8 @@
+CaveOfOrigin_Entrance_MapScripts:: @ 8235759
+	map_script 5, CaveOfOrigin_Entrance_MapScript1_23575F
+	.byte 0
+
+CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F
+	setescapewarp MAP_SOOTOPOLIS_CITY, 255, 31, 17
+	end
+
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc
new file mode 100644
index 000000000..049c263da
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc
@@ -0,0 +1,7 @@
+CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64
+	warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F
+	warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2
+
+CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74
+	map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
index 081d1bba3..1edd4c6c2 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304
-	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes
+	.4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout
 	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents
 	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
index 4b4240833..4b4240833 100644
--- a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc
new file mode 100644
index 000000000..5af05a471
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc
@@ -0,0 +1,7 @@
+CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88
+	warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1
+	warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3
+
+CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98
+	map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
index ef1747de8..6b046b61a 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320
-	.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes
+	.4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout
 	.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents
 	.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
index d73ff8231..d73ff8231 100644
--- a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc
new file mode 100644
index 000000000..a17416bd3
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc
@@ -0,0 +1,7 @@
+CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC
+	warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2
+	warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F
+
+CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: @ 8535DBC
+	map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
index 623c9c2bc..819afc08f 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C
-	.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes
+	.4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout
 	.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents
 	.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
index 7f4fb2ff1..7f4fb2ff1 100644
--- a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc
new file mode 100644
index 000000000..b7ccd35b0
--- /dev/null
+++ b/data/maps/DesertRuins/events.inc
@@ -0,0 +1,16 @@
+DesertRuins_EventObjects: @ 8534354
+	object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935
+
+DesertRuins_MapWarps: @ 853436C
+	warp_def 8, 29, 3, 1, MAP_ROUTE111
+	warp_def 8, 20, 0, 2, MAP_DESERT_RUINS
+	warp_def 8, 11, 3, 1, MAP_DESERT_RUINS
+
+DesertRuins_MapBGEvents: @ 8534384
+	bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_22D9DB
+	bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8
+	bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8
+
+DesertRuins_MapEvents:: @ 85343A8
+	map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents
+
diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc
index dcc150a4f..8f076bf77 100644
--- a/data/maps/DesertRuins/header.inc
+++ b/data/maps/DesertRuins/header.inc
@@ -1,5 +1,5 @@
 DesertRuins: @ 8483F68
-	.4byte DesertRuins_MapAttributes
+	.4byte DesertRuins_Layout
 	.4byte DesertRuins_MapEvents
 	.4byte DesertRuins_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/DesertRuins.inc b/data/maps/DesertRuins/scripts.inc
index 9137902f2..9137902f2 100644
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/maps/DesertRuins/scripts.inc
diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc
new file mode 100644
index 000000000..05fb939a0
--- /dev/null
+++ b/data/maps/DesertUnderpass/events.inc
@@ -0,0 +1,9 @@
+DesertUnderpass_EventObjects: @ 85376D4
+	object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, 8, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, 874
+
+DesertUnderpass_MapWarps: @ 85376EC
+	warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL
+
+DesertUnderpass_MapEvents:: @ 85376F4
+	map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc
index b01e7638a..2a420d703 100644
--- a/data/maps/DesertUnderpass/header.inc
+++ b/data/maps/DesertUnderpass/header.inc
@@ -1,5 +1,5 @@
 DesertUnderpass: @ 8484978
-	.4byte DesertUnderpass_MapAttributes
+	.4byte DesertUnderpass_Layout
 	.4byte DesertUnderpass_MapEvents
 	.4byte DesertUnderpass_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/DesertUnderpass.inc b/data/maps/DesertUnderpass/scripts.inc
index 486bd2577..486bd2577 100644
--- a/data/scripts/maps/DesertUnderpass.inc
+++ b/data/maps/DesertUnderpass/scripts.inc
diff --git a/data/maps/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc
index 4386e2295..d03004922 100644
--- a/data/maps/DewfordTown/connections.inc
+++ b/data/maps/DewfordTown/connections.inc
@@ -1,6 +1,6 @@
 DewfordTown_MapConnectionsList: @ 8486640
-	connection up, -60, ROUTE_106, 0
-	connection right, 0, ROUTE_107, 0
+	connection up, -60, MAP_ROUTE106
+	connection right, 0, MAP_ROUTE107
 
 DewfordTown_MapConnections: @ 8486658
 	.4byte 0x2
diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc
new file mode 100644
index 000000000..c96b4c95e
--- /dev/null
+++ b/data/maps/DewfordTown/events.inc
@@ -0,0 +1,24 @@
+DewfordTown_EventObjects: @ 8527964
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, 9, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, 740
+	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0
+	object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743
+	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0
+
+DewfordTown_MapWarps: @ 85279DC
+	warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL
+	warp_def 2, 10, 0, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F
+	warp_def 8, 17, 0, 0, MAP_DEWFORD_TOWN_GYM
+	warp_def 17, 14, 0, 0, MAP_DEWFORD_TOWN_HOUSE1
+	warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2
+
+DewfordTown_MapBGEvents: @ 8527A04
+	bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_1E95BA
+	bg_event 11, 16, 0, 0, 0, DewfordTown_EventScript_1E95C3
+	bg_event 4, 10, 0, 1, 0, DewfordTown_EventScript_271E73
+	bg_event 3, 10, 0, 1, 0, DewfordTown_EventScript_271E73
+	bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_1E95CC
+
+DewfordTown_MapEvents:: @ 8527A40
+	map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents
+
diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc
index 7437a42a2..7c6638aed 100644
--- a/data/maps/DewfordTown/header.inc
+++ b/data/maps/DewfordTown/header.inc
@@ -1,5 +1,5 @@
 DewfordTown: @ 84825EC
-	.4byte DewfordTown_MapAttributes
+	.4byte DewfordTown_Layout
 	.4byte DewfordTown_MapEvents
 	.4byte DewfordTown_MapScripts
 	.4byte DewfordTown_MapConnections
diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc
new file mode 100644
index 000000000..157c1f4d5
--- /dev/null
+++ b/data/maps/DewfordTown/scripts.inc
@@ -0,0 +1,805 @@
+DewfordTown_MapScripts:: @ 81E9507
+	map_script 3, DewfordTown_MapScript1_1E950D
+	.byte 0
+
+DewfordTown_MapScript1_1E950D: @ 81E950D
+	setflag FLAG_VISITED_DEWFORD_TOWN
+	end
+
+DewfordTown_EventScript_1E9511:: @ 81E9511
+	lock
+	faceplayer
+	checkflag FLAG_0x0BD
+	goto_if 0, DewfordTown_EventScript_1E9585
+	message DewfordTown_Text_1E9C8A
+	waitmessage
+	multichoicedefault 21, 6, 0, 2, 0
+	switch VAR_RESULT
+	case 0, DewfordTown_EventScript_1E955A
+	case 1, DewfordTown_EventScript_1E956A
+	case 2, DewfordTown_EventScript_1E957A
+	case 127, DewfordTown_EventScript_1E957A
+	end
+
+DewfordTown_EventScript_1E955A:: @ 81E955A
+	msgbox DewfordTown_Text_1E9CE5, 4
+	closemessage
+	goto DewfordTown_EventScript_1E9660
+	release
+	end
+
+DewfordTown_EventScript_1E956A:: @ 81E956A
+	msgbox DewfordTown_Text_1E9D3A, 4
+	closemessage
+	goto DewfordTown_EventScript_1E96E7
+	release
+	end
+
+DewfordTown_EventScript_1E957A:: @ 81E957A
+	msgbox DewfordTown_Text_1E9D8F, 4
+	closemessage
+	release
+	end
+
+DewfordTown_EventScript_1E9585:: @ 81E9585
+	msgbox DewfordTown_Text_1E9B24, 5
+	compare VAR_RESULT, 1
+	goto_eq DewfordTown_EventScript_1E95A2
+	msgbox DewfordTown_Text_1E9BD9, 4
+	release
+	end
+
+DewfordTown_EventScript_1E95A2:: @ 81E95A2
+	msgbox DewfordTown_Text_1E9B7F, 4
+	closemessage
+	goto DewfordTown_EventScript_1E9660
+	end
+
+DewfordTown_EventScript_1E95B1:: @ 81E95B1
+	msgbox DewfordTown_Text_1E99A8, 2
+	end
+
+DewfordTown_EventScript_1E95BA:: @ 81E95BA
+	msgbox DewfordTown_Text_1E9A0F, 3
+	end
+
+DewfordTown_EventScript_1E95C3:: @ 81E95C3
+	msgbox DewfordTown_Text_1E9A3D, 3
+	end
+
+DewfordTown_EventScript_1E95CC:: @ 81E95CC
+	msgbox DewfordTown_Text_1E9A7F, 3
+	end
+
+DewfordTown_EventScript_1E95D5:: @ 81E95D5
+	lock
+	faceplayer
+	checkflag FLAG_0x101
+	goto_eq DewfordTown_EventScript_1E962A
+	msgbox DewfordTown_Text_1E9DD1, 5
+	compare VAR_RESULT, 1
+	goto_eq DewfordTown_EventScript_1E95FF
+	compare VAR_RESULT, 0
+	goto_eq DewfordTown_EventScript_1E9620
+	end
+
+DewfordTown_EventScript_1E95FF:: @ 81E95FF
+	msgbox DewfordTown_Text_1E9E14, 4
+	giveitem_std ITEM_OLD_ROD
+	setflag FLAG_0x101
+	msgbox DewfordTown_Text_1E9E65, 4
+	release
+	end
+
+DewfordTown_EventScript_1E9620:: @ 81E9620
+	msgbox DewfordTown_Text_1E9F92, 4
+	release
+	end
+
+DewfordTown_EventScript_1E962A:: @ 81E962A
+	message DewfordTown_Text_1E9FB8
+	waitmessage
+	multichoice 20, 8, 50, 1
+	compare VAR_RESULT, 0
+	goto_eq DewfordTown_EventScript_1E964C
+	compare VAR_RESULT, 1
+	goto_eq DewfordTown_EventScript_1E9656
+	end
+
+DewfordTown_EventScript_1E964C:: @ 81E964C
+	msgbox DewfordTown_Text_1E9FD0, 4
+	release
+	end
+
+DewfordTown_EventScript_1E9656:: @ 81E9656
+	msgbox DewfordTown_Text_1EA004, 4
+	release
+	end
+
+DewfordTown_EventScript_1E9660:: @ 81E9660
+	call DewfordTown_EventScript_271E95
+	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
+	setobjectpriority 255, MAP_DEWFORD_TOWN, 0
+	applymovement 2, DewfordTown_Movement_1E991D
+	waitmovement 0
+	removeobject 2
+	applymovement 255, DewfordTown_Movement_1E9911
+	waitmovement 0
+	hideobjectat 255, MAP_DEWFORD_TOWN
+	call DewfordTown_EventScript_2720A0
+	applymovement 4, DewfordTown_Movement_1E97A2
+	applymovement 255, DewfordTown_Movement_1E97A2
+	waitmovement 0
+	showobjectat 255, MAP_ROUTE104
+	call DewfordTown_EventScript_2720A8
+	applymovement 255, DewfordTown_Movement_1E9914
+	waitmovement 0
+	showobjectat 255, MAP_ROUTE104
+	clearflag FLAG_0x2E3
+	clearflag FLAG_0x371
+	clearflag FLAG_0x2E6
+	setflag FLAG_0x2E7
+	hideobjectat 4, MAP_DEWFORD_TOWN
+	setvar VAR_0x408E, 2
+	resetobjectpriority 255, MAP_DEWFORD_TOWN
+	warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4
+	copyvar VAR_0x4096, VAR_0x8008
+	waitstate
+	release
+	end
+
+DewfordTown_EventScript_1E96E7:: @ 81E96E7
+	call DewfordTown_EventScript_271E95
+	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
+	setobjectpriority 255, MAP_DEWFORD_TOWN, 1
+	applymovement 2, DewfordTown_Movement_1E991D
+	waitmovement 0
+	removeobject 2
+	applymovement 255, DewfordTown_Movement_1E9911
+	waitmovement 0
+	hideobjectat 255, MAP_DEWFORD_TOWN
+	call DewfordTown_EventScript_2720A0
+	applymovement 4, DewfordTown_Movement_1E9865
+	applymovement 255, DewfordTown_Movement_1E9865
+	waitmovement 0
+	call DewfordTown_EventScript_2720A8
+	showobjectat 255, MAP_ROUTE109
+	applymovement 255, DewfordTown_Movement_1E9918
+	waitmovement 0
+	setobjectxyperm 2, 21, 26
+	addobject 2
+	setobjectpriority 2, MAP_ROUTE109, 0
+	applymovement 2, DewfordTown_Movement_1E991F
+	waitmovement 0
+	clearflag FLAG_0x2E5
+	addobject 1
+	clearflag FLAG_0x2E8
+	setflag FLAG_0x2E7
+	hideobjectat 4, MAP_DEWFORD_TOWN
+	checkflag FLAG_0x095
+	call_if 0, DewfordTown_EventScript_1E9790
+	checkflag FLAG_0x095
+	call_if 1, DewfordTown_EventScript_1E9799
+	closemessage
+	copyvar VAR_0x4096, VAR_0x8008
+	resetobjectpriority 255, MAP_DEWFORD_TOWN
+	resetobjectpriority 2, MAP_ROUTE109
+	moveobjectoffscreen 2
+	release
+	end
+
+DewfordTown_EventScript_1E9790:: @ 81E9790
+	msgbox DewfordTown_Text_1EEC1D, 4
+	return
+
+DewfordTown_EventScript_1E9799:: @ 81E9799
+	msgbox DewfordTown_Text_1EEDA7, 4
+	return
+
+DewfordTown_Movement_1E97A2: @ 81E97A2
+	walk_up
+	walk_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_left
+	walk_fast_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+DewfordTown_Movement_1E9865: @ 81E9865
+	walk_right
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	step_end
+
+DewfordTown_Movement_1E9911: @ 81E9911
+	walk_right
+	walk_up
+	step_end
+
+DewfordTown_Movement_1E9914: @ 81E9914
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+DewfordTown_Movement_1E9918: @ 81E9918
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	step_end
+
+DewfordTown_Movement_1E991D: @ 81E991D
+	walk_up
+	step_end
+
+DewfordTown_Movement_1E991F: @ 81E991F
+	walk_up
+	walk_up
+	step_end
+
+DewfordTown_EventScript_1E9922:: @ 81E9922
+	lock
+	faceplayer
+	call DewfordTown_EventScript_271E8B
+	msgbox DewfordTown_Text_1EA136, 5
+	compare VAR_RESULT, 1
+	goto_eq DewfordTown_EventScript_1E9948
+	compare VAR_RESULT, 0
+	goto_eq DewfordTown_EventScript_1E9952
+	end
+
+DewfordTown_EventScript_1E9948:: @ 81E9948
+	msgbox DewfordTown_Text_1EA491, 4
+	release
+	end
+
+DewfordTown_EventScript_1E9952:: @ 81E9952
+	msgbox DewfordTown_Text_1EA242, 4
+	setvar VAR_0x8004, 9
+	call DewfordTown_EventScript_271E7C
+	lock
+	faceplayer
+	compare VAR_RESULT, 1
+	goto_eq DewfordTown_EventScript_1E997D
+	compare VAR_RESULT, 0
+	goto_eq DewfordTown_EventScript_1E9994
+	end
+
+DewfordTown_EventScript_1E997D:: @ 81E997D
+	incrementgamestat 2
+	compare VAR_0x8004, 0
+	goto_eq DewfordTown_EventScript_1E999E
+	msgbox DewfordTown_Text_1EA2AA, 4
+	release
+	end
+
+DewfordTown_EventScript_1E9994:: @ 81E9994
+	msgbox DewfordTown_Text_1EA443, 4
+	release
+	end
+
+DewfordTown_EventScript_1E999E:: @ 81E999E
+	msgbox DewfordTown_Text_1EA3FE, 4
+	release
+	end
+
+DewfordTown_Text_1E99A8: @ 81E99A8
+	.string "DEWFORD is a tiny island community.\n"
+	.string "If something gets trendy here,\l"
+	.string "everyone picks up on it right away.$"
+
+DewfordTown_Text_1E9A0F: @ 81E9A0F
+	.string "DEWFORD TOWN\n"
+	.string "“A tiny island in the blue sea.”$"
+
+DewfordTown_Text_1E9A3D: @ 81E9A3D
+	.string "DEWFORD TOWN POKéMON GYM\n"
+	.string "LEADER: BRAWLY\l"
+	.string "“A big wave in fighting!”$"
+
+DewfordTown_Text_1E9A7F: @ 81E9A7F
+	.string "DEWFORD HALL\n"
+	.string "“Everyone’s information exchange!”$"
+
+Route104_Text_1E9AAF: @ 81E9AAF
+	.string "MR. BRINEY: Ahoy!\n"
+	.string "We’ve hit land in DEWFORD.\p"
+	.string "I suppose you’re off to deliver that\n"
+	.string "LETTER to, who was it now, STEVEN!$"
+
+DewfordTown_Text_1E9B24: @ 81E9B24
+	.string "MR. BRINEY: Have you delivered your\n"
+	.string "LETTER?\p"
+	.string "Or were you meaning to sail back to\n"
+	.string "PETALBURG?$"
+
+DewfordTown_Text_1E9B7F: @ 81E9B7F
+	.string "MR. BRINEY: PETALBURG it is, then!\p"
+	.string "Anchors aweigh!\n"
+	.string "PEEKO, we’re setting sail, my darling!$"
+
+DewfordTown_Text_1E9BD9: @ 81E9BD9
+	.string "MR. BRINEY: Then you go on and deliver\n"
+	.string "the LETTER. I’ll be waiting.$"
+
+Route104_Text_1E9C1D: @ 81E9C1D
+Route109_Text_1E9C1D: @ 81E9C1D
+	.string "MR. BRINEY: Ahoy!\n"
+	.string "We’ve hit land in DEWFORD!\p"
+	.string "You just go on and tell me whenever\n"
+	.string "you want to set sail again!$"
+
+DewfordTown_Text_1E9C8A: @ 81E9C8A
+	.string "MR. BRINEY: Ahoy!\n"
+	.string "For you, I’ll go out to sea anytime!\p"
+	.string "Now, my friend, where are we bound?$"
+
+DewfordTown_Text_1E9CE5: @ 81E9CE5
+	.string "MR. BRINEY: PETALBURG, is it?\p"
+	.string "Anchors aweigh!\n"
+	.string "PEEKO, we’re setting sail, my darling!$"
+
+DewfordTown_Text_1E9D3A: @ 81E9D3A
+	.string "MR. BRINEY: SLATEPORT, is it?\p"
+	.string "Anchors aweigh!\n"
+	.string "PEEKO, we’re setting sail, my darling!$"
+
+DewfordTown_Text_1E9D8F: @ 81E9D8F
+	.string "MR. BRINEY: You just tell me whenever\n"
+	.string "you need to set sail again!$"
+
+DewfordTown_Text_1E9DD1: @ 81E9DD1
+	.string "This is a renowned fishing spot.\n"
+	.string "Are you getting the itch to fish?$"
+
+DewfordTown_Text_1E9E14: @ 81E9E14
+	.string "I hear you, and I like what\n"
+	.string "you’re saying!\p"
+	.string "I’ll give you one of my fishing RODS.$"
+
+DewfordTown_Text_1E9E65: @ 81E9E65
+	.string "And, as an added bonus, I’ll even throw\n"
+	.string "in a little fishing advice!\p"
+	.string "First, you want to face the water,\n"
+	.string "then use the ROD.\p"
+	.string "Focus your mind…\n"
+	.string "If you get a bite, pull on the ROD.\p"
+	.string "Sometimes you can snag something\n"
+	.string "immediately, but with bigger catches,\l"
+	.string "you need to time the pulls on your ROD\l"
+	.string "to haul them in.$"
+
+DewfordTown_Text_1E9F92: @ 81E9F92
+	.string "Oh, is that so?\n"
+	.string "That’s too bad, then.$"
+
+DewfordTown_Text_1E9FB8: @ 81E9FB8
+	.string "Yo!\n"
+	.string "How’s your fishing?$"
+
+DewfordTown_Text_1E9FD0: @ 81E9FD0
+	.string "Is that right! That’s great!\n"
+	.string "Haul in some big ones!$"
+
+DewfordTown_Text_1EA004: @ 81EA004
+	.string "Oh, hey, don’t get down on yourself!\n"
+	.string "I’ll give you a little fishing advice.\p"
+	.string "First, you want to face the water,\n"
+	.string "then use the ROD.\p"
+	.string "Focus your mind…\n"
+	.string "If you get a bite, pull the ROD.\p"
+	.string "Sometimes you can snag something\n"
+	.string "immediately, but with bigger catches,\l"
+	.string "you need to time the pulls on your ROD\l"
+	.string "to haul them in.$"
+
+DewfordTown_Text_1EA136: @ 81EA136
+	.string "I like what’s hip, happening, and trendy.\n"
+	.string "I’m always checking it out.\p"
+	.string "Listen, have you heard about this new\n"
+	.string "“{STR_VAR_1}”?\p"
+	.string "That’s right!\n"
+	.string "Of course you know!\p"
+	.string "I mean, sheesh,\n"
+	.string "“{STR_VAR_1}”…\l"
+	.string "It’s the hottest thing in cool!\p"
+	.string "Wherever you’re from,\n"
+	.string "“{STR_VAR_1}”\l"
+	.string "is the biggest happening thing, right?$"
+
+DewfordTown_Text_1EA242: @ 81EA242
+	.string "Hunh?\n"
+	.string "It’s not the hip and happening thing?\p"
+	.string "Well, hey, you have to tell me,\n"
+	.string "what’s new and what’s “in”?$"
+
+DewfordTown_Text_1EA2AA: @ 81EA2AA
+	.string "Hunh?\n"
+	.string "“{STR_VAR_2}”?\p"
+	.string "… …\p"
+	.string "…Uh… Yeah! That’s right!\n"
+	.string "Yeah, I knew that! Knew it all along!\p"
+	.string "Of course I know about that!\n"
+	.string "“{STR_VAR_2},” right?\p"
+	.string "Yeah, that’s it, it’s there!\n"
+	.string "Isn’t “{STR_VAR_2}”\l"
+	.string "the coolest, or what?\p"
+	.string "It’s the hippest thing in hip.\n"
+	.string "You think I’d not know about it?\p"
+	.string "“{STR_VAR_1}”…\n"
+	.string "It’s, like, so five minutes ago.\p"
+	.string "Now, “{STR_VAR_2}” is\n"
+	.string "what’s vital and in tune with the times!$"
+
+DewfordTown_Text_1EA3FE: @ 81EA3FE
+	.string "Hmm…\n"
+	.string "“{STR_VAR_2},” huh?\p"
+	.string "But personally, I think\n"
+	.string "“{STR_VAR_1}”\l"
+	.string "is what’s real in cool.$"
+
+DewfordTown_Text_1EA443: @ 81EA443
+	.string "Well, if you hear of any happening new\n"
+	.string "trends, come share them with me, okay?$"
+
+DewfordTown_Text_1EA491: @ 81EA491
+	.string "Yeah, absolutely right!\p"
+	.string "“{STR_VAR_1}” is the\n"
+	.string "definition of “in” right now.$"
diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc
new file mode 100644
index 000000000..11f5d5a92
--- /dev/null
+++ b/data/maps/DewfordTown_Gym/events.inc
@@ -0,0 +1,23 @@
+DewfordTown_Gym_EventObjects: @ 852DB34
+	object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 4, 3, 0, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, 8, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 25, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0
+	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 8, 1, 10, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0
+	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, 8, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0
+	object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, 10, 1, 1, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0
+
+DewfordTown_Gym_MapWarps: @ 852DBF4
+	warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN
+	warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN
+
+DewfordTown_Gym_MapBGEvents: @ 852DC04
+	bg_event 4, 23, 3, 1, 0, DewfordTown_Gym_EventScript_1FC9A2
+	bg_event 7, 23, 3, 1, 0, DewfordTown_Gym_EventScript_1FC9B2
+	bg_event 4, 24, 0, 1, 0, DewfordTown_Gym_EventScript_1FC9A2
+	bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_1FC9B2
+
+DewfordTown_Gym_MapEvents:: @ 852DC34
+	map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents
+
diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc
index 4d2dbcef9..fcb55ee29 100644
--- a/data/maps/DewfordTown_Gym/header.inc
+++ b/data/maps/DewfordTown_Gym/header.inc
@@ -1,5 +1,5 @@
 DewfordTown_Gym: @ 8482C60
-	.4byte DewfordTown_Gym_MapAttributes
+	.4byte DewfordTown_Gym_Layout
 	.4byte DewfordTown_Gym_MapEvents
 	.4byte DewfordTown_Gym_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/scripts.inc
index 6acd67792..6acd67792 100644
--- a/data/scripts/maps/DewfordTown_Gym.inc
+++ b/data/maps/DewfordTown_Gym/scripts.inc
diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc
new file mode 100644
index 000000000..e12a02a3c
--- /dev/null
+++ b/data/maps/DewfordTown_Hall/events.inc
@@ -0,0 +1,22 @@
+DewfordTown_Hall_EventObjects: @ 852DC48
+	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0
+	object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0
+	object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940
+
+DewfordTown_Hall_MapWarps: @ 852DD20
+	warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN
+	warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN
+
+DewfordTown_Hall_MapBGEvents: @ 852DD30
+	bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD590
+	bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD5A0
+
+DewfordTown_Hall_MapEvents:: @ 852DD48
+	map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents
+
diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc
index 22466b2a8..31af0f14d 100644
--- a/data/maps/DewfordTown_Hall/header.inc
+++ b/data/maps/DewfordTown_Hall/header.inc
@@ -1,5 +1,5 @@
 DewfordTown_Hall: @ 8482C7C
-	.4byte DewfordTown_Hall_MapAttributes
+	.4byte DewfordTown_Hall_Layout
 	.4byte DewfordTown_Hall_MapEvents
 	.4byte DewfordTown_Hall_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/scripts.inc
index 37122a640..37122a640 100644
--- a/data/scripts/maps/DewfordTown_Hall.inc
+++ b/data/maps/DewfordTown_Hall/scripts.inc
diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc
new file mode 100644
index 000000000..849bb0244
--- /dev/null
+++ b/data/maps/DewfordTown_House1/events.inc
@@ -0,0 +1,12 @@
+DewfordTown_House1_EventObjects: @ 852D9C8
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0
+	object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, 8, 3, 1, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0
+
+DewfordTown_House1_MapWarps: @ 852DA10
+	warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN
+	warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN
+
+DewfordTown_House1_MapEvents:: @ 852DA20
+	map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc
index 399786aa9..c317b12bb 100644
--- a/data/maps/DewfordTown_House1/header.inc
+++ b/data/maps/DewfordTown_House1/header.inc
@@ -1,5 +1,5 @@
 DewfordTown_House1: @ 8482C0C
-	.4byte DewfordTown_House1_MapAttributes
+	.4byte House3_Layout
 	.4byte DewfordTown_House1_MapEvents
 	.4byte DewfordTown_House1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/scripts.inc
index 59c490d81..59c490d81 100644
--- a/data/scripts/maps/DewfordTown_House1.inc
+++ b/data/maps/DewfordTown_House1/scripts.inc
diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc
new file mode 100644
index 000000000..8aec9176b
--- /dev/null
+++ b/data/maps/DewfordTown_House2/events.inc
@@ -0,0 +1,11 @@
+DewfordTown_House2_EventObjects: @ 852DD5C
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0
+
+DewfordTown_House2_MapWarps: @ 852DD8C
+	warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN
+	warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN
+
+DewfordTown_House2_MapEvents:: @ 852DD9C
+	map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc
index d9a2162e2..6d285c437 100644
--- a/data/maps/DewfordTown_House2/header.inc
+++ b/data/maps/DewfordTown_House2/header.inc
@@ -1,5 +1,5 @@
 DewfordTown_House2: @ 8482C98
-	.4byte DewfordTown_House2_MapAttributes
+	.4byte House4_Layout
 	.4byte DewfordTown_House2_MapEvents
 	.4byte DewfordTown_House2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/scripts.inc
index 1805164af..1805164af 100644
--- a/data/scripts/maps/DewfordTown_House2.inc
+++ b/data/maps/DewfordTown_House2/scripts.inc
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..aad05249c
--- /dev/null
+++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc
@@ -0,0 +1,13 @@
+DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, 5, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0
+
+DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C
+	warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN
+	warp_def 6, 8, 3, 1, MAP_DEWFORD_TOWN
+	warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F
+
+DewfordTown_PokemonCenter_1F_MapEvents:: @ 852DA94
+	map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
index bdc1b5090..99d29f69c 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 DewfordTown_PokemonCenter_1F: @ 8482C28
-	.4byte DewfordTown_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte DewfordTown_PokemonCenter_1F_MapEvents
 	.4byte DewfordTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
index 15a1c81b9..15a1c81b9 100644
--- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..9c739974b
--- /dev/null
+++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702
+
+DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08
+	warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+DewfordTown_PokemonCenter_2F_MapEvents:: @ 852DB20
+	map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
index f5302fff1..4d6a71785 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 DewfordTown_PokemonCenter_2F: @ 8482C44
-	.4byte DewfordTown_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte DewfordTown_PokemonCenter_2F_MapEvents
 	.4byte DewfordTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
index f2a30ecd2..f2a30ecd2 100644
--- a/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc
new file mode 100644
index 000000000..f28e9e3e1
--- /dev/null
+++ b/data/maps/DoubleBattleColosseum/events.inc
@@ -0,0 +1,15 @@
+DoubleBattleColosseum_MapWarps: @ 8539E88
+	warp_def 5, 8, 3, 127, MAP_NONE
+	warp_def 6, 8, 3, 127, MAP_NONE
+	warp_def 7, 8, 3, 127, MAP_NONE
+	warp_def 8, 8, 3, 127, MAP_NONE
+
+DoubleBattleColosseum_MapCoordEvents: @ 8539EA8
+	coord_event 3, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277388
+	coord_event 3, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773BE
+	coord_event 10, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773A3
+	coord_event 10, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773D9
+
+DoubleBattleColosseum_MapEvents:: @ 8539EE8
+	map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0
+
diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc
index 6d102c5b1..d8275de59 100644
--- a/data/maps/DoubleBattleColosseum/header.inc
+++ b/data/maps/DoubleBattleColosseum/header.inc
@@ -1,5 +1,5 @@
 DoubleBattleColosseum: @ 8484D84
-	.4byte DoubleBattleColosseum_MapAttributes
+	.4byte DoubleBattleColosseum_Layout
 	.4byte DoubleBattleColosseum_MapEvents
 	.4byte DoubleBattleColosseum_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/scripts.inc
index ac64377ae..ac64377ae 100644
--- a/data/scripts/maps/DoubleBattleColosseum.inc
+++ b/data/maps/DoubleBattleColosseum/scripts.inc
diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc
index a472e456a..830240b07 100644
--- a/data/maps/EverGrandeCity/connections.inc
+++ b/data/maps/EverGrandeCity/connections.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_MapConnectionsList: @ 84867F8
-	connection left, 40, ROUTE_128, 0
+	connection left, 40, MAP_ROUTE128
 
 EverGrandeCity_MapConnections: @ 8486804
 	.4byte 0x1
diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc
new file mode 100644
index 000000000..b8ca9eea4
--- /dev/null
+++ b/data/maps/EverGrandeCity/events.inc
@@ -0,0 +1,29 @@
+EverGrandeCity_MapWarps: @ 8527588
+	warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
+	warp_def 27, 48, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F
+	warp_def 18, 41, 0, 0, MAP_VICTORY_ROAD_1F
+	warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F
+
+EverGrandeCity_MapCoordEvents: @ 85275A8
+	coord_event 17, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 16, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 18, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 19, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 20, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 21, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 22, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 23, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 24, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 25, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 26, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
+
+EverGrandeCity_MapBGEvents: @ 8527658
+	bg_event 19, 43, 5, 0, 0, EverGrandeCity_EventScript_1E7D2B
+	bg_event 29, 48, 0, 1, 0, EverGrandeCity_EventScript_271E73
+	bg_event 18, 52, 5, 0, 0, EverGrandeCity_EventScript_1E7D34
+	bg_event 23, 15, 0, 0, 0, EverGrandeCity_EventScript_1E7D3D
+	bg_event 28, 48, 0, 1, 0, EverGrandeCity_EventScript_271E73
+
+EverGrandeCity_MapEvents:: @ 8527694
+	map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents
+
diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc
index f7fc65752..890d8b79f 100644
--- a/data/maps/EverGrandeCity/header.inc
+++ b/data/maps/EverGrandeCity/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity: @ 8482598
-	.4byte EverGrandeCity_MapAttributes
+	.4byte EverGrandeCity_Layout
 	.4byte EverGrandeCity_MapEvents
 	.4byte EverGrandeCity_MapScripts
 	.4byte EverGrandeCity_MapConnections
diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/maps/EverGrandeCity/scripts.inc
index 178621217..178621217 100644
--- a/data/scripts/maps/EverGrandeCity.inc
+++ b/data/maps/EverGrandeCity/scripts.inc
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
new file mode 100644
index 000000000..c97236e41
--- /dev/null
+++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
@@ -0,0 +1,12 @@
+EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700
+	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 920
+	object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921
+
+EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748
+	warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4
+	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME
+
+EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758
+	map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
index 445536d27..e239ed146 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_ChampionsRoom: @ 8483C3C
-	.4byte EverGrandeCity_ChampionsRoom_MapAttributes
+	.4byte EverGrandeCity_ChampionsRoom_Layout
 	.4byte EverGrandeCity_ChampionsRoom_MapEvents
 	.4byte EverGrandeCity_ChampionsRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
new file mode 100644
index 000000000..3e68f4fed
--- /dev/null
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -0,0 +1,346 @@
+EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF
+	map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_2289FF
+	map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_228A05
+	map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_228A14
+	.byte 0
+
+EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF
+	call EverGrandeCity_ChampionsRoom_EventScript_271ED7
+	end
+
+EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A0F
+	.2byte 0
+
+EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F
+	turnobject 255, 2
+	end
+
+EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A1E
+	.2byte 0
+
+EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E
+	lockall
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725C1
+	waitmovement 0
+	delay 40
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228A42
+	waitmovement 0
+	setvar VAR_TEMP_1, 1
+	goto EverGrandeCity_ChampionsRoom_EventScript_228A45
+    releaseall
+    end
+
+EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42
+	walk_up
+	walk_up
+	step_end
+
+EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45
+	playbgm MUS_DAIGO, 0
+	msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, 4
+	trainerbattle 3, TRAINER_WALLACE, 0, EverGrandeCity_ChampionsRoom_Text_228EAC
+	goto EverGrandeCity_ChampionsRoom_EventScript_228A61
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61
+	playse SE_DOOR
+	setmetatile 6, 1, 838, 0
+	setmetatile 6, 2, 839, 0
+	special DrawWholeMapView
+	msgbox EverGrandeCity_ChampionsRoom_Text_228F66, 4
+	closemessage
+	playse SE_DOOR
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228ABC
+	compare VAR_RESULT, 1
+	call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228AC1
+	addobject 2
+	call EverGrandeCity_ChampionsRoom_EventScript_228BFD
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6
+	compare VAR_RESULT, 1
+	goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_228ABC:: @ 8228ABC
+	playbgm MUS_GIRL_SUP, 0
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_228AC1:: @ 8228AC1
+	playbgm MUS_BOY_SUP, 0
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6
+	msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, 4
+	delay 40
+	playse SE_PIN
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598
+	waitmovement 0
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A
+	waitmovement 0
+	call EverGrandeCity_ChampionsRoom_EventScript_228C12
+	msgbox EverGrandeCity_ChampionsRoom_Text_22910B, 4
+	goto EverGrandeCity_ChampionsRoom_EventScript_228B30
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB
+	msgbox EverGrandeCity_ChampionsRoom_Text_229152, 4
+	delay 40
+	playse SE_PIN
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598
+	waitmovement 0
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A
+	waitmovement 0
+	call EverGrandeCity_ChampionsRoom_EventScript_228C12
+	msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, 4
+	goto EverGrandeCity_ChampionsRoom_EventScript_228B30
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
+	closemessage
+	addobject 3
+	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43
+	waitmovement 0
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A8
+	waitmovement 0
+	msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, 4
+	call EverGrandeCity_ChampionsRoom_EventScript_272184
+	msgbox EverGrandeCity_ChampionsRoom_Text_22934D, 4
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6
+	waitmovement 0
+	delay 20
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA
+	waitmovement 0
+	msgbox EverGrandeCity_ChampionsRoom_Text_229399, 4
+	closemessage
+	delay 30
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C1D
+	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_2725A6
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38
+	waitmovement 0
+	delay 20
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725AA
+	waitmovement 0
+	msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, 4
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BEB
+	compare VAR_RESULT, 1
+	call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BF4
+	closemessage
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C20
+	waitmovement 0
+	setflag FLAG_0x30D
+	warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
+	waitstate
+	releaseall
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_228BEB:: @ 8228BEB
+	msgbox EverGrandeCity_ChampionsRoom_Text_229479, 4
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4
+	msgbox EverGrandeCity_ChampionsRoom_Text_2294F5, 4
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26
+	waitmovement 0
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A4
+	waitmovement 0
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_228C12:: @ 8228C12
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C2F
+	waitmovement 0
+	return
+
+EverGrandeCity_ChampionsRoom_Movement_228C1D: @ 8228C1D
+	walk_up
+	walk_up
+	step_end
+
+EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20
+	walk_up
+	delay_16
+	walk_up
+	delay_8
+	set_invisible
+	step_end
+
+EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_up
+	walk_in_place_fastest_right
+	step_end
+
+EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_fastest_right
+	delay_16
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_fastest_right
+	delay_16
+	step_end
+
+EverGrandeCity_ChampionsRoom_Movement_228C38: @ 8228C38
+	walk_right
+	walk_up
+	step_end
+
+EverGrandeCity_ChampionsRoom_Movement_228C3B: @ 8228C3B
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	step_end
+
+EverGrandeCity_ChampionsRoom_Movement_228C3F: @ 8228C3F
+	walk_up
+	delay_8
+	set_invisible
+	step_end
+
+EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_in_place_fastest_left
+	step_end
+
+EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C
+	.string "WALLACE: Welcome, {PLAYER}{KUN}.\p"
+	.string "That incident in SOOTOPOLIS CITY…\n"
+	.string "That was superb work, putting an end\l"
+	.string "to that crisis all by yourself.\p"
+	.string "Oops!\p"
+	.string "It wouldn’t be fair to say that you\n"
+	.string "alone ended the crisis.\p"
+	.string "You overcame that difficult situation\n"
+	.string "by working as one with your POKéMON.\p"
+	.string "We TRAINERS raise POKéMON by giving\n"
+	.string "them items and by teaching them new\l"
+	.string "techniques for battle.\p"
+	.string "But we ourselves also learn many\n"
+	.string "things from POKéMON.\p"
+	.string "And this is where your achievements\n"
+	.string "are put to the test against what\l"
+	.string "others like you have achieved.\p"
+	.string "Now!\p"
+	.string "Who can most elegantly dance with\n"
+	.string "their POKéMON in HOENN?\p"
+	.string "Show me right here and now!$"
+
+EverGrandeCity_ChampionsRoom_Text_228EAC: @ 8228EAC
+	.string "I, the CHAMPION, fall in defeat…\p"
+	.string "That was wonderful work.\n"
+	.string "You were elegant, infuriatingly so.\l"
+	.string "And yet it was utterly glorious!\p"
+	.string "Kudos to you, {PLAYER}{KUN}!\p"
+	.string "You are a truly noble POKéMON\n"
+	.string "TRAINER!$"
+
+EverGrandeCity_ChampionsRoom_Text_228F66: @ 8228F66
+	.string "WALLACE: The POKéMON you sent into\n"
+	.string "battle…\p"
+	.string "At times they danced like a spring\n"
+	.string "breeze, and at times they struck\l"
+	.string "like lightning.\p"
+	.string "It was with light, yet surefooted,\n"
+	.string "elegance that you led your POKéMON.\p"
+	.string "Even I felt bedazzled by your\n"
+	.string "masterful performance!\p"
+	.string "You now stand at the glorious peak\n"
+	.string "of the POKéMON LEAGUE.\p"
+	.string "I now proclaim you to be the new\n"
+	.string "HOENN region…$"
+
+EverGrandeCity_ChampionsRoom_Text_2290CA: @ 82290CA
+	.string "MAY: {PLAYER}{KUN}!\p"
+	.string "Here’s some advice before you challenge\n"
+	.string "the CHAMPION…$"
+
+EverGrandeCity_ChampionsRoom_Text_22910B: @ 822910B
+	.string "MAY: Huh?\n"
+	.string "What, what, what?\p"
+	.string "{PLAYER}{KUN}…\n"
+	.string "Could it be that…\l"
+	.string "It’s already over?$"
+
+EverGrandeCity_ChampionsRoom_Text_229152: @ 8229152
+	.string "BRENDAN: {PLAYER}!\p"
+	.string "How would you like some advice before\n"
+	.string "you challenge the CHAMPION?…$"
+
+EverGrandeCity_ChampionsRoom_Text_2291A2: @ 82291A2
+	.string "BRENDAN: {PLAYER}…\p"
+	.string "Are you trying to tell me…\n"
+	.string "You’ve beaten the CHAMPION?$"
+
+EverGrandeCity_ChampionsRoom_Text_2291E6: @ 82291E6
+	.string "PROF. BIRCH: See?\n"
+	.string "What did I tell you, {RIVAL}?\p"
+	.string "Didn’t I tell you that you don’t need\n"
+	.string "to worry about {PLAYER}{KUN}?\p"
+	.string "… … … … … … … …\n"
+	.string "{PLAYER}{KUN}, you’ve finally done it.\p"
+	.string "When I heard that you defeated your\n"
+	.string "own father at the PETALBURG GYM,\l"
+	.string "I thought perhaps you had a chance…\p"
+	.string "But to think you’ve actually become\n"
+	.string "the CHAMPION!\p"
+	.string "Ah, yes!\p"
+	.string "What became of your POKéDEX?\n"
+	.string "Here, let me see.$"
+
+EverGrandeCity_ChampionsRoom_Text_22934D: @ 822934D
+	.string "PROF. BIRCH: Anyways,\n"
+	.string "congratulations!\p"
+	.string "Now, go proudly into the final room!$"
+
+EverGrandeCity_ChampionsRoom_Text_229399: @ 8229399
+	.string "WALLACE: {PLAYER}{KUN}…\p"
+	.string "No, let me rephrase that properly.\p"
+	.string "The new CHAMPION!\p"
+	.string "Come with me.$"
+
+EverGrandeCity_ChampionsRoom_Text_2293EB: @ 82293EB
+	.string "WALLACE: I’m sorry, but…\p"
+	.string "From here on, only those TRAINERS who\n"
+	.string "have become CHAMPIONS may enter.\p"
+	.string "You’ll have to wait outside with\n"
+	.string "PROF. BIRCH.$"
+
+EverGrandeCity_ChampionsRoom_Text_229479: @ 8229479
+	.string "MAY: Groan…\p"
+	.string "… … … … … … … …\n"
+	.string "… … … … … … … …\p"
+	.string "I’m just joking! That’s okay!\n"
+	.string "That’s the rule!\p"
+	.string "{PLAYER}{KUN}!\n"
+	.string "Honestly, congratulations!$"
+
+EverGrandeCity_ChampionsRoom_Text_2294F5: @ 82294F5
+	.string "BRENDAN: Whaaaat?! … … … … …\n"
+	.string "… … … … … … … …\p"
+	.string "It can’t be helped if that’s the rule.\p"
+	.string "{PLAYER}, way to go!\n"
+	.string "Congratulations!$"
+
diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc
new file mode 100644
index 000000000..90c9af1c4
--- /dev/null
+++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc
@@ -0,0 +1,10 @@
+EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4
+	object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0
+
+EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC
+	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL3
+	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL4
+
+EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC
+	map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc
index 6d6438a79..0a4878176 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/header.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_DrakesRoom: @ 8483C20
-	.4byte EverGrandeCity_DrakesRoom_MapAttributes
+	.4byte EverGrandeCity_DrakesRoom_Layout
 	.4byte EverGrandeCity_DrakesRoom_MapEvents
 	.4byte EverGrandeCity_DrakesRoom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
index 4c90417af..4c90417af 100644
--- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc
new file mode 100644
index 000000000..5490ed006
--- /dev/null
+++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc
@@ -0,0 +1,10 @@
+EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688
+	object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0
+
+EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0
+	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL2
+	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL3
+
+EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0
+	map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
index b301c2aa1..dbc20fd80 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_GlaciasRoom: @ 8483C04
-	.4byte EverGrandeCity_GlaciasRoom_MapAttributes
+	.4byte EverGrandeCity_GlaciasRoom_Layout
 	.4byte EverGrandeCity_GlaciasRoom_MapEvents
 	.4byte EverGrandeCity_GlaciasRoom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
index f1d846f03..f1d846f03 100644
--- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
diff --git a/data/maps/EverGrandeCity_Hall1/events.inc b/data/maps/EverGrandeCity_Hall1/events.inc
new file mode 100644
index 000000000..3351b42e0
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall1/events.inc
@@ -0,0 +1,9 @@
+EverGrandeCity_Hall1_MapWarps: @ 853376C
+	warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM
+	warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM
+	warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM
+	warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM
+
+EverGrandeCity_Hall1_MapEvents:: @ 853378C
+	map_events 0x0, EverGrandeCity_Hall1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc
index 332a6cbb2..4dacefc77 100644
--- a/data/maps/EverGrandeCity_Hall1/header.inc
+++ b/data/maps/EverGrandeCity_Hall1/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Hall1: @ 8483C58
-	.4byte EverGrandeCity_Hall1_MapAttributes
+	.4byte EverGrandeCity_ShortHall_Layout
 	.4byte EverGrandeCity_Hall1_MapEvents
 	.4byte EverGrandeCity_Hall1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/EverGrandeCity_Hall1.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc
index 960918662..960918662 100644
--- a/data/scripts/maps/EverGrandeCity_Hall1.inc
+++ b/data/maps/EverGrandeCity_Hall1/scripts.inc
diff --git a/data/maps/EverGrandeCity_Hall2/events.inc b/data/maps/EverGrandeCity_Hall2/events.inc
new file mode 100644
index 000000000..e3eacab10
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall2/events.inc
@@ -0,0 +1,9 @@
+EverGrandeCity_Hall2_MapWarps: @ 85337A0
+	warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM
+	warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM
+	warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM
+	warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM
+
+EverGrandeCity_Hall2_MapEvents:: @ 85337C0
+	map_events 0x0, EverGrandeCity_Hall2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc
index b9029c027..0c160c76e 100644
--- a/data/maps/EverGrandeCity_Hall2/header.inc
+++ b/data/maps/EverGrandeCity_Hall2/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Hall2: @ 8483C74
-	.4byte EverGrandeCity_Hall2_MapAttributes
+	.4byte EverGrandeCity_ShortHall_Layout
 	.4byte EverGrandeCity_Hall2_MapEvents
 	.4byte EverGrandeCity_Hall2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/EverGrandeCity_Hall2.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc
index 1d76e3695..1d76e3695 100644
--- a/data/scripts/maps/EverGrandeCity_Hall2.inc
+++ b/data/maps/EverGrandeCity_Hall2/scripts.inc
diff --git a/data/maps/EverGrandeCity_Hall3/events.inc b/data/maps/EverGrandeCity_Hall3/events.inc
new file mode 100644
index 000000000..e44182b4f
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall3/events.inc
@@ -0,0 +1,9 @@
+EverGrandeCity_Hall3_MapWarps: @ 85337D4
+	warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM
+	warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_DRAKES_ROOM
+	warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM
+	warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM
+
+EverGrandeCity_Hall3_MapEvents:: @ 85337F4
+	map_events 0x0, EverGrandeCity_Hall3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc
index 282d06c66..da2ef5259 100644
--- a/data/maps/EverGrandeCity_Hall3/header.inc
+++ b/data/maps/EverGrandeCity_Hall3/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Hall3: @ 8483C90
-	.4byte EverGrandeCity_Hall3_MapAttributes
+	.4byte EverGrandeCity_ShortHall_Layout
 	.4byte EverGrandeCity_Hall3_MapEvents
 	.4byte EverGrandeCity_Hall3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/EverGrandeCity_Hall3.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc
index a100487f5..a100487f5 100644
--- a/data/scripts/maps/EverGrandeCity_Hall3.inc
+++ b/data/maps/EverGrandeCity_Hall3/scripts.inc
diff --git a/data/maps/EverGrandeCity_Hall4/events.inc b/data/maps/EverGrandeCity_Hall4/events.inc
new file mode 100644
index 000000000..b2d011234
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall4/events.inc
@@ -0,0 +1,7 @@
+EverGrandeCity_Hall4_MapWarps: @ 8533808
+	warp_def 5, 33, 3, 1, MAP_EVER_GRANDE_CITY_DRAKES_ROOM
+	warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM
+
+EverGrandeCity_Hall4_MapEvents:: @ 8533818
+	map_events 0x0, EverGrandeCity_Hall4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc
index 72fa22d75..da0b96380 100644
--- a/data/maps/EverGrandeCity_Hall4/header.inc
+++ b/data/maps/EverGrandeCity_Hall4/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Hall4: @ 8483CAC
-	.4byte EverGrandeCity_Hall4_MapAttributes
+	.4byte EverGrandeCity_Hall4_Layout
 	.4byte EverGrandeCity_Hall4_MapEvents
 	.4byte EverGrandeCity_Hall4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/EverGrandeCity_Hall4.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc
index a7c730594..a7c730594 100644
--- a/data/scripts/maps/EverGrandeCity_Hall4.inc
+++ b/data/maps/EverGrandeCity_Hall4/scripts.inc
diff --git a/data/maps/EverGrandeCity_Hall5/events.inc b/data/maps/EverGrandeCity_Hall5/events.inc
new file mode 100644
index 000000000..687920b71
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall5/events.inc
@@ -0,0 +1,9 @@
+EverGrandeCity_Hall5_MapWarps: @ 853382C
+	warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
+	warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM
+	warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
+	warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
+
+EverGrandeCity_Hall5_MapEvents:: @ 853384C
+	map_events 0x0, EverGrandeCity_Hall5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc
index eac2ba3fa..0c541bd58 100644
--- a/data/maps/EverGrandeCity_Hall5/header.inc
+++ b/data/maps/EverGrandeCity_Hall5/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Hall5: @ 8483CC8
-	.4byte EverGrandeCity_Hall5_MapAttributes
+	.4byte EverGrandeCity_ShortHall_Layout
 	.4byte EverGrandeCity_Hall5_MapEvents
 	.4byte EverGrandeCity_Hall5_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/EverGrandeCity_Hall5.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc
index 9ca9991e4..9ca9991e4 100644
--- a/data/scripts/maps/EverGrandeCity_Hall5.inc
+++ b/data/maps/EverGrandeCity_Hall5/scripts.inc
diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc
new file mode 100644
index 000000000..50fc7fbdc
--- /dev/null
+++ b/data/maps/EverGrandeCity_HallOfFame/events.inc
@@ -0,0 +1,9 @@
+EverGrandeCity_HallOfFame_EventObjects: @ 85338FC
+	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0
+
+EverGrandeCity_HallOfFame_MapWarps: @ 8533914
+	warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM
+
+EverGrandeCity_HallOfFame_MapEvents:: @ 853391C
+	map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc
index dd3726db9..786b7c598 100644
--- a/data/maps/EverGrandeCity_HallOfFame/header.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_HallOfFame: @ 8483D00
-	.4byte EverGrandeCity_HallOfFame_MapAttributes
+	.4byte EverGrandeCity_HallOfFame_Layout
 	.4byte EverGrandeCity_HallOfFame_MapEvents
 	.4byte EverGrandeCity_HallOfFame_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
index 60f0dd1ad..60f0dd1ad 100644
--- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc
new file mode 100644
index 000000000..296fe3240
--- /dev/null
+++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc
@@ -0,0 +1,10 @@
+EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C
+	object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0
+
+EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664
+	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL1
+	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL2
+
+EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674
+	map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
index a5ebfb823..2e7bef16d 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_PhoebesRoom: @ 8483BE8
-	.4byte EverGrandeCity_PhoebesRoom_MapAttributes
+	.4byte EverGrandeCity_PhoebesRoom_Layout
 	.4byte EverGrandeCity_PhoebesRoom_MapEvents
 	.4byte EverGrandeCity_PhoebesRoom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
index 679e4f663..679e4f663 100644
--- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..1f7e26046
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0
+	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793
+
+EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990
+	warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY
+	warp_def 6, 8, 3, 1, MAP_EVER_GRANDE_CITY
+	warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F
+
+EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 85339A8
+	map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
index a3747320b..613b47446 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_PokemonCenter_1F: @ 8483D1C
-	.4byte EverGrandeCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte EverGrandeCity_PokemonCenter_1F_MapEvents
 	.4byte EverGrandeCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index ed6e6a497..ed6e6a497 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..98671f414
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702
+
+EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C
+	warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 8533A34
+	map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
index 1ad6c5727..63539b7a1 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_PokemonCenter_2F: @ 8483D38
-	.4byte EverGrandeCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte EverGrandeCity_PokemonCenter_2F_MapEvents
 	.4byte EverGrandeCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
index 09d382b2b..09d382b2b 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc
new file mode 100644
index 000000000..ff2ca71c2
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc
@@ -0,0 +1,16 @@
+EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0
+	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0
+
+EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0
+	warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY
+	warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY
+	warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5
+	warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5
+	warp_def 1, 7, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F
+
+EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8
+	map_events EverGrandeCity_PokemonLeague_1F_EventObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
index 46fa79a73..d99e18907 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_PokemonLeague_1F: @ 8483CE4
-	.4byte EverGrandeCity_PokemonLeague_1F_MapAttributes
+	.4byte EverGrandeCity_PokemonLeague_1F_Layout
 	.4byte EverGrandeCity_PokemonLeague_1F_MapEvents
 	.4byte EverGrandeCity_PokemonLeague_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
index f1a6ce17f..f1a6ce17f 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc
new file mode 100644
index 000000000..a09e8ed31
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702
+
+EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8
+	warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+EverGrandeCity_PokemonLeague_2F_MapEvents:: @ 8533AC0
+	map_events EverGrandeCity_PokemonLeague_2F_EventObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
index 1d7775bfc..61d0b857a 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_PokemonLeague_2F: @ 8483D54
-	.4byte EverGrandeCity_PokemonLeague_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte EverGrandeCity_PokemonLeague_2F_MapEvents
 	.4byte EverGrandeCity_PokemonLeague_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
index d3a77a051..d3a77a051 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc
new file mode 100644
index 000000000..af4c5de98
--- /dev/null
+++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc
@@ -0,0 +1,10 @@
+EverGrandeCity_SidneysRoom_EventObjects: @ 8533610
+	object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0
+
+EverGrandeCity_SidneysRoom_MapWarps: @ 8533628
+	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL5
+	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL1
+
+EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638
+	map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc
index 594347dc3..3855eb87a 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/header.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_SidneysRoom: @ 8483BCC
-	.4byte EverGrandeCity_SidneysRoom_MapAttributes
+	.4byte EverGrandeCity_SidneysRoom_Layout
 	.4byte EverGrandeCity_SidneysRoom_MapEvents
 	.4byte EverGrandeCity_SidneysRoom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
index b2db55e36..b2db55e36 100644
--- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc
index 27b654f90..3808099d8 100644
--- a/data/maps/FallarborTown/connections.inc
+++ b/data/maps/FallarborTown/connections.inc
@@ -1,6 +1,6 @@
 FallarborTown_MapConnectionsList: @ 8486674
-	connection left, 0, ROUTE_114, 0
-	connection right, 0, ROUTE_113, 0
+	connection left, 0, MAP_ROUTE114
+	connection right, 0, MAP_ROUTE113
 
 FallarborTown_MapConnections: @ 848668C
 	.4byte 0x2
diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc
new file mode 100644
index 000000000..91a98cc28
--- /dev/null
+++ b/data/maps/FallarborTown/events.inc
@@ -0,0 +1,26 @@
+FallarborTown_EventObjects: @ 8527BE0
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, 8, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, 3, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0
+	object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907
+
+FallarborTown_MapWarps: @ 8527C40
+	warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART
+	warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY
+	warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F
+	warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1
+	warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2
+
+FallarborTown_MapBGEvents: @ 8527C68
+	bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_271E6A
+	bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_271E73
+	bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_1EB250
+	bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_271E73
+	bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_1EB259
+	bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_271E6A
+	bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_1EB262
+	bg_event 2, 15, 3, 7, 0, ITEM_NUGGET, 28, 0
+
+FallarborTown_MapEvents:: @ 8527CC8
+	map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
+
diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc
index a6ea87c04..c26b91f29 100644
--- a/data/maps/FallarborTown/header.inc
+++ b/data/maps/FallarborTown/header.inc
@@ -1,5 +1,5 @@
 FallarborTown: @ 8482624
-	.4byte FallarborTown_MapAttributes
+	.4byte FallarborTown_Layout
 	.4byte FallarborTown_MapEvents
 	.4byte FallarborTown_MapScripts
 	.4byte FallarborTown_MapConnections
diff --git a/data/scripts/maps/FallarborTown.inc b/data/maps/FallarborTown/scripts.inc
index 21cea72e1..21cea72e1 100644
--- a/data/scripts/maps/FallarborTown.inc
+++ b/data/maps/FallarborTown/scripts.inc
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc
new file mode 100644
index 000000000..c4e35ebbb
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc
@@ -0,0 +1,8 @@
+FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444
+	object_event 1, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, 7, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 1, 1, 0, 0, 0x0, 0
+
+FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C
+	map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
index 2a5695153..be81ffe6e 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
@@ -1,5 +1,5 @@
 FallarborTown_BattleTentBattleRoom: @ 8482DCC
-	.4byte FallarborTown_BattleTentBattleRoom_MapAttributes
+	.4byte BattleTentBattleRoom_Layout
 	.4byte FallarborTown_BattleTentBattleRoom_MapEvents
 	.4byte FallarborTown_BattleTentBattleRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
new file mode 100644
index 000000000..e373ff5ad
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
@@ -0,0 +1,268 @@
+FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899
+	map_script 3, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9
+	map_script 2, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD
+	map_script 4, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0
+	.byte 0
+
+FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9
+	call FallarborTown_BattleTentBattleRoom_EventScript_2008AF
+	end
+
+FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008C7
+	compare VAR_RESULT, 1
+	goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008D2
+	return
+
+FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7
+	setvar VAR_OBJ_GFX_ID_1, 100
+	setvar VAR_OBJ_GFX_ID_0, 100
+	return
+
+FallarborTown_BattleTentBattleRoom_EventScript_2008D2:: @ 82008D2
+	setvar VAR_OBJ_GFX_ID_1, 105
+	setvar VAR_OBJ_GFX_ID_0, 105
+	return
+
+FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD
+	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentBattleRoom_EventScript_2008E7
+	.2byte 0
+
+FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7
+	lockall
+	showobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
+	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B8D
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, FallarborTown_BattleTentBattleRoom_EventScript_200B73
+
+FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
+	setvar VAR_0x8004, 3
+	special sub_8161F74
+	addobject 3
+	applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B96
+	waitmovement 0
+	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3
+	playse SE_W187
+	waitse
+	waitmovement 0
+	msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, 4
+	setvar VAR_0x8004, 4
+	special sub_81B99B4
+	msgbox 0x2021fc4, 4
+	waitmessage
+	call FallarborTown_BattleTentBattleRoom_EventScript_257B6C
+	switch VAR_RESULT
+	case 1, FallarborTown_BattleTentBattleRoom_EventScript_20099C
+	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3
+	playse SE_W173
+	waitse
+	waitmovement 0
+	setvar VAR_0x8004, 6
+	special sub_81B9B80
+	msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, 4
+
+FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 4
+	special sub_81A1780
+	special LoadPlayerParty
+	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
+	waitstate
+
+FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C
+	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3
+	playse SE_BAN
+	waitse
+	waitmovement 0
+	msgbox FallarborTown_BattleTentBattleRoom_Text_257CB3, 4
+	closemessage
+
+FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	addvar VAR_RESULT, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	switch VAR_RESULT
+	case 3, FallarborTown_BattleTentBattleRoom_EventScript_200AF3
+	applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B9E
+	waitmovement 0
+	removeobject 3
+	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA6
+	waitmovement 0
+	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94
+	waitmovement 0
+	msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, 4
+	special LoadPlayerParty
+	special SavePlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+
+FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B43
+	compare VAR_RESULT, 2
+	call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B4A
+	multichoice 20, 6, 104, 1
+	switch VAR_RESULT
+	case 0, FallarborTown_BattleTentBattleRoom_EventScript_200AD8
+	case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A78
+	case 2, FallarborTown_BattleTentBattleRoom_EventScript_200AA6
+
+FallarborTown_BattleTentBattleRoom_EventScript_200A78:: @ 8200A78
+	msgbox FallarborTown_BattleTentBattleRoom_Text_257E6B, 5
+	switch VAR_RESULT
+	case 0, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
+	case 1, FallarborTown_BattleTentBattleRoom_EventScript_200B51
+	case 127, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
+
+FallarborTown_BattleTentBattleRoom_EventScript_200AA6:: @ 8200AA6
+	message FallarborTown_BattleTentBattleRoom_Text_257E9E
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
+	case 0, FallarborTown_BattleTentBattleRoom_EventScript_20097E
+	case 127, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
+
+FallarborTown_BattleTentBattleRoom_EventScript_200AD8:: @ 8200AD8
+	closemessage
+	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BAB
+	waitmovement 0
+	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B92
+	waitmovement 0
+	goto FallarborTown_BattleTentBattleRoom_EventScript_20090F
+	waitstate
+
+FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3
+	delay 60
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 3
+	special sub_81A1780
+	special LoadPlayerParty
+	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
+	waitstate
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	special sub_81A5238
+	compare VAR_RESULT, 9999
+	goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3
+	addvar VAR_RESULT, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A5238
+
+FallarborTown_BattleTentBattleRoom_EventScript_200B43:: @ 8200B43
+	message FallarborTown_BattleTentBattleRoom_Text_257D17
+	waitmessage
+	return
+
+FallarborTown_BattleTentBattleRoom_EventScript_200B4A:: @ 8200B4A
+	message FallarborTown_BattleTentBattleRoom_Text_257D50
+	waitmessage
+	return
+
+FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51
+	message FallarborTown_BattleTentBattleRoom_Text_257EDB
+	waitmessage
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 2
+	special sub_81B9B80
+	playse SE_SAVE
+	waitse
+	fadescreen 1
+	setvar VAR_0x8004, 4
+	special sub_81A1780
+	end
+
+FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73
+	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA6
+	waitmovement 0
+	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94
+	waitmovement 0
+	goto FallarborTown_BattleTentBattleRoom_EventScript_200A2A
+	end
+
+FallarborTown_BattleTentBattleRoom_Movement_200B8D: @ 8200B8D
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
+	step_end
+
+FallarborTown_BattleTentBattleRoom_Movement_200B92: @ 8200B92
+	walk_in_place_fastest_right
+	step_end
+
+FallarborTown_BattleTentBattleRoom_Movement_200B94: @ 8200B94
+	walk_in_place_fastest_left
+	step_end
+
+FallarborTown_BattleTentBattleRoom_Movement_200B96: @ 8200B96
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+FallarborTown_BattleTentBattleRoom_Movement_200B9C: @ 8200B9C
+	walk_left
+	step_end
+
+FallarborTown_BattleTentBattleRoom_Movement_200B9E: @ 8200B9E
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+FallarborTown_BattleTentBattleRoom_Movement_200BA3: @ 8200BA3
+	disable_jump_landing_ground_effect
+	jump_in_place_down
+	step_end
+
+FallarborTown_BattleTentBattleRoom_Movement_200BA6: @ 8200BA6
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	step_end
+
+FallarborTown_BattleTentBattleRoom_Movement_200BAB: @ 8200BAB
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	step_end
+
+FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0
+	map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentBattleRoom_EventScript_200BBA
+	.2byte 0
+
+FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA
+	hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
+	hideobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
+	removeobject 3
+	setvar VAR_TEMP_1, 1
+	end
+
diff --git a/data/maps/FallarborTown_BattleTentCorridor/events.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc
new file mode 100644
index 000000000..471ca66a3
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentCorridor/events.inc
@@ -0,0 +1,6 @@
+FallarborTown_BattleTentCorridor_EventObjects: @ 852E418
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 6, 3, 7, 1, 1, 0, 0, 0x0, 0
+
+FallarborTown_BattleTentCorridor_MapEvents:: @ 852E430
+	map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc
index 6ac376874..5f2023a71 100644
--- a/data/maps/FallarborTown_BattleTentCorridor/header.inc
+++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc
@@ -1,5 +1,5 @@
 FallarborTown_BattleTentCorridor: @ 8482DB0
-	.4byte FallarborTown_BattleTentCorridor_MapAttributes
+	.4byte BattleTentCorridor_Layout
 	.4byte FallarborTown_BattleTentCorridor_MapEvents
 	.4byte FallarborTown_BattleTentCorridor_MapScripts
 	.4byte 0x0
diff --git a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
new file mode 100644
index 000000000..f1a144a14
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
@@ -0,0 +1,64 @@
+FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7
+	map_script 2, FallarborTown_BattleTentCorridor_MapScript2_2006AD
+	.byte 0
+
+FallarborTown_BattleTentCorridor_MapScript2_2006AD: @ 82006AD
+	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentCorridor_EventScript_2006B7
+	.2byte 0
+
+FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7
+	lockall
+	setvar VAR_TEMP_0, 1
+	applymovement 1, FallarborTown_BattleTentCorridor_Movement_2006FB
+	applymovement 255, FallarborTown_BattleTentCorridor_Movement_2006FB
+	waitmovement 0
+	opendoor 2, 1
+	waitdooranim
+	applymovement 1, FallarborTown_BattleTentCorridor_Movement_200701
+	applymovement 255, FallarborTown_BattleTentCorridor_Movement_200700
+	waitmovement 0
+	closedoor 2, 1
+	waitdooranim
+	setvar VAR_0x8006, 0
+	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4
+	waitstate
+	releaseall
+	end
+
+FallarborTown_BattleTentCorridor_Movement_2006FB: @ 82006FB
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+FallarborTown_BattleTentCorridor_Movement_200700: @ 8200700
+	walk_up
+
+FallarborTown_BattleTentCorridor_Movement_200701: @ 8200701
+	walk_up
+	set_invisible
+	step_end
+
+FallarborTown_BattleTentCorridor_Text_200704: @ 8200704
+	.string "We do all right in the preliminary round,\n"
+	.string "but we can never win the appeals…\p"
+	.string "Maybe it means I have to watch what\n"
+	.string "other contestants are doing…$"
+
+FallarborTown_BattleTentCorridor_Text_200791: @ 8200791
+	.string "See!\n"
+	.string "My POKéMON won all these RIBBONS!\p"
+	.string "Have your POKéMON earned any RIBBONS?\n"
+	.string "You can check them on your POKéNAV.$"
+
+FallarborTown_BattleTentCorridor_Text_200802: @ 8200802
+	.string "I can’t beat GYM LEADERS…\p"
+	.string "I can’t win any CONTESTS…\p"
+	.string "I’ve been here, there, and everywhere,\n"
+	.string "and it’s all for naught…$"
+
+FallarborTown_BattleTentCorridor_Text_200876: @ 8200876
+	.string "POKéMON CONTESTS\n"
+	.string "SUPER RANK STAGE!$"
+
diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc
new file mode 100644
index 000000000..570287ae3
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentLobby/events.inc
@@ -0,0 +1,17 @@
+FallarborTown_BattleTentLobby_EventObjects: @ 852E370
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, 8, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, 5, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 12, 6, 3, 3, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, 8, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0
+	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, 10, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767
+
+FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8
+	warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN
+	warp_def 7, 9, 0, 1, MAP_FALLARBOR_TOWN
+
+FallarborTown_BattleTentLobby_MapBGEvents: @ 852E3F8
+	bg_event 4, 5, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20024F
+
+FallarborTown_BattleTentLobby_MapEvents:: @ 852E404
+	map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents
+
diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc
index 64d4180a5..ba86df464 100644
--- a/data/maps/FallarborTown_BattleTentLobby/header.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/header.inc
@@ -1,5 +1,5 @@
 FallarborTown_BattleTentLobby: @ 8482D94
-	.4byte FallarborTown_BattleTentLobby_MapAttributes
+	.4byte BattleTentLobby_Layout
 	.4byte FallarborTown_BattleTentLobby_MapEvents
 	.4byte FallarborTown_BattleTentLobby_MapScripts
 	.4byte 0x0
diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
new file mode 100644
index 000000000..00efa5394
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
@@ -0,0 +1,402 @@
+FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66
+	map_script 2, FallarborTown_BattleTentLobby_MapScript2_1FFE85
+	map_script 4, FallarborTown_BattleTentLobby_MapScript2_1FFE71
+	.byte 0
+
+FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71
+	map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentLobby_EventScript_1FFE7B
+	.2byte 0
+
+FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85
+	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentLobby_EventScript_1FFEAF
+	map_script_2 VAR_TEMP_0, 1, FallarborTown_BattleTentLobby_EventScript_1FFEB8
+	map_script_2 VAR_TEMP_0, 2, FallarborTown_BattleTentLobby_EventScript_1FFFCD
+	map_script_2 VAR_TEMP_0, 3, FallarborTown_BattleTentLobby_EventScript_1FFEED
+	map_script_2 VAR_TEMP_0, 4, FallarborTown_BattleTentLobby_EventScript_1FFF93
+	.2byte 0
+
+FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF
+	setvar VAR_0x8004, 0
+	special sub_81A1780
+	end
+
+FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8
+	lockall
+	msgbox FallarborTown_BattleTentLobby_Text_2C4DED, 4
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	releaseall
+	end
+
+FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED
+	lockall
+	msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4
+	message FallarborTown_BattleTentLobby_Text_2C4EFF
+	waitmessage
+	setvar VAR_0x8004, 4
+	special sub_81B9B80
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 0
+	special sub_81B9B80
+	playse SE_SAVE
+	waitse
+
+FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27
+	msgbox FallarborTown_BattleTentLobby_Text_2C4F22, 4
+	setvar VAR_0x8004, 5
+	special sub_81B9B80
+	switch VAR_RESULT
+	case 0, FallarborTown_BattleTentLobby_EventScript_1FFF73
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	message FallarborTown_BattleTentLobby_Text_2C4F69
+	waitmessage
+	playfanfare MUS_FANFA4
+	waitfanfare
+	msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73
+	msgbox FallarborTown_BattleTentLobby_Text_2C4F83, 4
+	waitmessage
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+FallarborTown_BattleTentLobby_EventScript_1FFF84:: @ 81FFF84
+	lockall
+	msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4
+	goto FallarborTown_BattleTentLobby_EventScript_1FFF27
+	end
+
+FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93
+	lockall
+	message FallarborTown_BattleTentLobby_Text_2C4FD7
+	waitmessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 0
+	special sub_81B9B80
+	playse SE_SAVE
+	waitse
+	msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD
+	lockall
+	message FallarborTown_BattleTentLobby_Text_2C504C
+	waitmessage
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 1
+	special sub_81B9B80
+	playse SE_SAVE
+	waitse
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	goto FallarborTown_BattleTentLobby_EventScript_20013C
+
+FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001
+	lock
+	faceplayer
+	setvar VAR_0x8004, 1
+	special sub_81B9B80
+	compare VAR_RESULT, 0
+	goto_if 5, FallarborTown_BattleTentLobby_EventScript_1FFF84
+	special SavePlayerParty
+	msgbox FallarborTown_BattleTentLobby_Text_2C47EB, 4
+
+FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021
+	message FallarborTown_BattleTentLobby_Text_2C4843
+	waitmessage
+	multichoice 17, 6, 23, 0
+	switch VAR_RESULT
+	case 0, FallarborTown_BattleTentLobby_EventScript_20005D
+	case 1, FallarborTown_BattleTentLobby_EventScript_200169
+	case 2, FallarborTown_BattleTentLobby_EventScript_2001C5
+	case 127, FallarborTown_BattleTentLobby_EventScript_2001C5
+
+FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
+	setvar VAR_FRONTIER_FACILITY, 3
+	setvar VAR_0x40CE, 0
+	setvar VAR_RESULT, 2
+	setvar VAR_0x8004, 15
+	special sub_81A1780
+	compare VAR_0x8004, 1
+	goto_eq FallarborTown_BattleTentLobby_EventScript_200176
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 2
+	special sub_81A1780
+	msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, 4
+	fadescreen 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	special sub_80F9490
+	waitstate
+	compare VAR_RESULT, 0
+	goto_eq FallarborTown_BattleTentLobby_EventScript_2001C2
+	msgbox FallarborTown_BattleTentLobby_Text_2C4B35, 5
+	switch VAR_RESULT
+	case 0, FallarborTown_BattleTentLobby_EventScript_2001C2
+	case 1, FallarborTown_BattleTentLobby_EventScript_2000E2
+	case 127, FallarborTown_BattleTentLobby_EventScript_2001C2
+
+FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
+	setvar VAR_TEMP_0, 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	special sub_81A1780
+	setvar VAR_0x8004, 0
+	special sub_81B9B80
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special LoadPlayerParty
+	closemessage
+	delay 2
+	call FallarborTown_BattleTentLobby_EventScript_27134F
+	setvar VAR_TEMP_0, 255
+	compare VAR_RESULT, 0
+	goto_eq FallarborTown_BattleTentLobby_EventScript_2001AB
+
+FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C
+	special SavePlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4
+	closemessage
+	call FallarborTown_BattleTentLobby_EventScript_2001CF
+	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7
+	setvar VAR_TEMP_0, 0
+	waitstate
+	end
+
+FallarborTown_BattleTentLobby_EventScript_200169:: @ 8200169
+	msgbox FallarborTown_BattleTentLobby_Text_2C48AC, 4
+	goto FallarborTown_BattleTentLobby_EventScript_200021
+
+FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176
+	switch VAR_RESULT
+	case 0, FallarborTown_BattleTentLobby_EventScript_200191
+	case 1, FallarborTown_BattleTentLobby_EventScript_20019E
+
+FallarborTown_BattleTentLobby_EventScript_200191:: @ 8200191
+	msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, 4
+	goto FallarborTown_BattleTentLobby_EventScript_2001CD
+
+FallarborTown_BattleTentLobby_EventScript_20019E:: @ 820019E
+	msgbox FallarborTown_BattleTentLobby_Text_2C4CC0, 4
+	goto FallarborTown_BattleTentLobby_EventScript_2001CD
+
+FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	goto FallarborTown_BattleTentLobby_EventScript_2001C5
+
+FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2
+	special LoadPlayerParty
+
+FallarborTown_BattleTentLobby_EventScript_2001C5:: @ 82001C5
+	msgbox FallarborTown_BattleTentLobby_Text_2C487F, 4
+
+FallarborTown_BattleTentLobby_EventScript_2001CD:: @ 82001CD
+	release
+	end
+
+FallarborTown_BattleTentLobby_EventScript_2001CF:: @ 82001CF
+	applymovement 1, FallarborTown_BattleTentLobby_Movement_2001FE
+	applymovement 255, FallarborTown_BattleTentLobby_Movement_200205
+	waitmovement 0
+	opendoor 6, 1
+	waitdooranim
+	applymovement 1, FallarborTown_BattleTentLobby_Movement_200202
+	applymovement 255, FallarborTown_BattleTentLobby_Movement_200209
+	waitmovement 0
+	closedoor 6, 1
+	waitdooranim
+	return
+
+FallarborTown_BattleTentLobby_Movement_2001FE: @ 82001FE
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+FallarborTown_BattleTentLobby_Movement_200202: @ 8200202
+	walk_up
+	set_invisible
+	step_end
+
+FallarborTown_BattleTentLobby_Movement_200205: @ 8200205
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+FallarborTown_BattleTentLobby_Movement_200209: @ 8200209
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+FallarborTown_BattleTentLobby_EventScript_20020D:: @ 820020D
+	msgbox FallarborTown_BattleTentLobby_Text_20045A, 2
+	end
+
+FallarborTown_BattleTentLobby_EventScript_200216:: @ 8200216
+	msgbox FallarborTown_BattleTentLobby_Text_200304, 2
+	end
+
+FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F
+	msgbox FallarborTown_BattleTentLobby_Text_200382, 2
+	end
+
+FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228
+	lock
+	faceplayer
+	checkflag FLAG_0x1CD
+	goto_eq FallarborTown_BattleTentLobby_EventScript_200245
+	msgbox FallarborTown_BattleTentLobby_Text_200501, 4
+	addvar VAR_0x40D1, 1
+	setflag FLAG_0x1CD
+	release
+	end
+
+FallarborTown_BattleTentLobby_EventScript_200245:: @ 8200245
+	msgbox FallarborTown_BattleTentLobby_Text_200653, 4
+	release
+	end
+
+FallarborTown_BattleTentLobby_EventScript_20024F:: @ 820024F
+	lockall
+	msgbox FallarborTown_BattleTentLobby_Text_256DB8, 4
+	goto FallarborTown_BattleTentLobby_EventScript_20025E
+	end
+
+FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E
+	message FallarborTown_BattleTentLobby_Text_256DDF
+	waitmessage
+	multichoice 17, 0, 112, 0
+	switch VAR_RESULT
+	case 0, FallarborTown_BattleTentLobby_EventScript_2002BC
+	case 1, FallarborTown_BattleTentLobby_EventScript_2002CA
+	case 2, FallarborTown_BattleTentLobby_EventScript_2002D8
+	case 3, FallarborTown_BattleTentLobby_EventScript_2002E6
+	case 4, FallarborTown_BattleTentLobby_EventScript_2002F4
+	case 5, FallarborTown_BattleTentLobby_EventScript_200302
+	case 127, FallarborTown_BattleTentLobby_EventScript_200302
+	end
+
+FallarborTown_BattleTentLobby_EventScript_2002BC:: @ 82002BC
+	msgbox FallarborTown_BattleTentLobby_Text_2C67CD, 4
+	goto FallarborTown_BattleTentLobby_EventScript_20025E
+	end
+
+FallarborTown_BattleTentLobby_EventScript_2002CA:: @ 82002CA
+	msgbox FallarborTown_BattleTentLobby_Text_256E02, 4
+	goto FallarborTown_BattleTentLobby_EventScript_20025E
+	end
+
+FallarborTown_BattleTentLobby_EventScript_2002D8:: @ 82002D8
+	msgbox FallarborTown_BattleTentLobby_Text_256F43, 4
+	goto FallarborTown_BattleTentLobby_EventScript_20025E
+	end
+
+FallarborTown_BattleTentLobby_EventScript_2002E6:: @ 82002E6
+	msgbox FallarborTown_BattleTentLobby_Text_256FF2, 4
+	goto FallarborTown_BattleTentLobby_EventScript_20025E
+	end
+
+FallarborTown_BattleTentLobby_EventScript_2002F4:: @ 82002F4
+	msgbox FallarborTown_BattleTentLobby_Text_257202, 4
+	goto FallarborTown_BattleTentLobby_EventScript_20025E
+	end
+
+FallarborTown_BattleTentLobby_EventScript_200302:: @ 8200302
+	releaseall
+	end
+
+FallarborTown_BattleTentLobby_Text_200304: @ 8200304
+	.string "Fufufufufu.\p"
+	.string "I’m going to make everyone think\n"
+	.string "I’m just a kid and let them play down.\p"
+	.string "Then, I’ll shock them and grab\n"
+	.string "the title!$"
+
+FallarborTown_BattleTentLobby_Text_200382: @ 8200382
+	.string "You know how BATTLE TENTS offer\n"
+	.string "different events in different towns?\p"
+	.string "My favorite is definitely the BATTLE\n"
+	.string "TENT in FALLARBOR TOWN.\p"
+	.string "I think it’s fantastic how TRAINERS\n"
+	.string "try to win with all their faith in\l"
+	.string "their POKéMON.$"
+
+FallarborTown_BattleTentLobby_Text_20045A: @ 820045A
+	.string "I heard something about some tent,\n"
+	.string "so I came to camp out.\p"
+	.string "I didn’t know that tents these days\n"
+	.string "are so luxurious!\p"
+	.string "Since I’m here, I may as well try\n"
+	.string "my hand at battling!$"
+
+FallarborTown_BattleTentLobby_Text_200501: @ 8200501
+	.string "SCOTT: Hi, {PLAYER}{KUN}!\n"
+	.string "So you came out to this BATTLE TENT!\p"
+	.string "The people in these parts tend to be\n"
+	.string "easygoing and laid-back.\p"
+	.string "But, you see, what I’m looking for are\n"
+	.string "people with…\p"
+	.string "How should I say this?\p"
+	.string "Someone bursting with the desire\n"
+	.string "and the drive to win.\p"
+	.string "If there were a TRAINER like that,\n"
+	.string "I’d immediately…\p"
+	.string "Whoops! Never mind!\n"
+	.string "Keep working at it!$"
+
+FallarborTown_BattleTentLobby_Text_200653: @ 8200653
+	.string "SCOTT: Instead of wasting your\n"
+	.string "time with the likes of me, why not\l"
+	.string "make a challenge?$"
+
diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc
new file mode 100644
index 000000000..5c2323b74
--- /dev/null
+++ b/data/maps/FallarborTown_House1/events.inc
@@ -0,0 +1,11 @@
+FallarborTown_House1_EventObjects: @ 852E5B8
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, 2, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, 928
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0
+
+FallarborTown_House1_MapWarps: @ 852E5E8
+	warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN
+	warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN
+
+FallarborTown_House1_MapEvents:: @ 852E5F8
+	map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc
index bbe9d895c..443a4dc27 100644
--- a/data/maps/FallarborTown_House1/header.inc
+++ b/data/maps/FallarborTown_House1/header.inc
@@ -1,5 +1,5 @@
 FallarborTown_House1: @ 8482E20
-	.4byte FallarborTown_House1_MapAttributes
+	.4byte House1_Layout
 	.4byte FallarborTown_House1_MapEvents
 	.4byte FallarborTown_House1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/scripts.inc
index 47459f8d5..47459f8d5 100644
--- a/data/scripts/maps/FallarborTown_House1.inc
+++ b/data/maps/FallarborTown_House1/scripts.inc
diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc
new file mode 100644
index 000000000..342e2e60b
--- /dev/null
+++ b/data/maps/FallarborTown_House2/events.inc
@@ -0,0 +1,10 @@
+FallarborTown_House2_EventObjects: @ 852E60C
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0
+
+FallarborTown_House2_MapWarps: @ 852E624
+	warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN
+	warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN
+
+FallarborTown_House2_MapEvents:: @ 852E634
+	map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc
index bf6d91d02..17cadef2b 100644
--- a/data/maps/FallarborTown_House2/header.inc
+++ b/data/maps/FallarborTown_House2/header.inc
@@ -1,5 +1,5 @@
 FallarborTown_House2: @ 8482E3C
-	.4byte FallarborTown_House2_MapAttributes
+	.4byte House2_Layout
 	.4byte FallarborTown_House2_MapEvents
 	.4byte FallarborTown_House2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/scripts.inc
index b78756e0a..b78756e0a 100644
--- a/data/scripts/maps/FallarborTown_House2.inc
+++ b/data/maps/FallarborTown_House2/scripts.inc
diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc
new file mode 100644
index 000000000..6d7188c6a
--- /dev/null
+++ b/data/maps/FallarborTown_Mart/events.inc
@@ -0,0 +1,14 @@
+FallarborTown_Mart_EventObjects: @ 852E2D4
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, 2, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0
+	object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, 1, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0
+
+FallarborTown_Mart_MapWarps: @ 852E34C
+	warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN
+	warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN
+
+FallarborTown_Mart_MapEvents:: @ 852E35C
+	map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc
index 70ff79eb7..6e8aa3ef3 100644
--- a/data/maps/FallarborTown_Mart/header.inc
+++ b/data/maps/FallarborTown_Mart/header.inc
@@ -1,5 +1,5 @@
 FallarborTown_Mart: @ 8482D78
-	.4byte FallarborTown_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte FallarborTown_Mart_MapEvents
 	.4byte FallarborTown_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/scripts.inc
index dbaf33f4e..dbaf33f4e 100644
--- a/data/scripts/maps/FallarborTown_Mart.inc
+++ b/data/maps/FallarborTown_Mart/scripts.inc
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..368190914
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
@@ -0,0 +1,14 @@
+FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871
+
+FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500
+	warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN
+	warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN
+	warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F
+
+FallarborTown_PokemonCenter_1F_MapEvents:: @ 852E518
+	map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
index c3b9ec95d..515518d9a 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 FallarborTown_PokemonCenter_1F: @ 8482DE8
-	.4byte FallarborTown_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte FallarborTown_PokemonCenter_1F_MapEvents
 	.4byte FallarborTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
index 15f5d2b9e..15f5d2b9e 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..9162a2822
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702
+
+FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C
+	warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+FallarborTown_PokemonCenter_2F_MapEvents:: @ 852E5A4
+	map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
index 655221b8a..2c67be178 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 FallarborTown_PokemonCenter_2F: @ 8482E04
-	.4byte FallarborTown_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte FallarborTown_PokemonCenter_2F_MapEvents
 	.4byte FallarborTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
index 93482e860..93482e860 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/FarawayIsland_Entrance/events.inc b/data/maps/FarawayIsland_Entrance/events.inc
new file mode 100644
index 000000000..8af15533b
--- /dev/null
+++ b/data/maps/FarawayIsland_Entrance/events.inc
@@ -0,0 +1,19 @@
+FarawayIsland_Entrance_EventObjects: @ 853D710
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 39, 3, 7, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0
+
+FarawayIsland_Entrance_MapWarps: @ 853D740
+	warp_def 22, 7, 3, 0, MAP_FARAWAY_ISLAND_INTERIOR
+	warp_def 23, 7, 3, 1, MAP_FARAWAY_ISLAND_INTERIOR
+
+FarawayIsland_Entrance_MapCoordEvents: @ 853D750
+	coord_event 9, 18, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C98
+	coord_event 10, 20, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C9D
+	coord_event 22, 9, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C98
+
+FarawayIsland_Entrance_MapBGEvents: @ 853D780
+	bg_event 3, 32, 0, 1, 0, FarawayIsland_Entrance_EventScript_267CF1
+
+FarawayIsland_Entrance_MapEvents:: @ 853D78C
+	map_events FarawayIsland_Entrance_EventObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents
+
diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc
index 8e943d6c3..5d7879d64 100644
--- a/data/maps/FarawayIsland_Entrance/header.inc
+++ b/data/maps/FarawayIsland_Entrance/header.inc
@@ -1,5 +1,5 @@
 FarawayIsland_Entrance: @ 848575C
-	.4byte FarawayIsland_Entrance_MapAttributes
+	.4byte FarawayIsland_Entrance_Layout
 	.4byte FarawayIsland_Entrance_MapEvents
 	.4byte FarawayIsland_Entrance_MapScripts
 	.4byte 0x0
diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc
new file mode 100644
index 000000000..08331b33b
--- /dev/null
+++ b/data/maps/FarawayIsland_Entrance/scripts.inc
@@ -0,0 +1,46 @@
+FarawayIsland_Entrance_MapScripts:: @ 8267C8E
+	map_script 3, FarawayIsland_Entrance_MapScript1_267C94
+	.byte 0
+
+FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94
+	setflag FLAG_0x8D8
+	end
+
+FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98
+	setweather 1
+	doweather
+	end
+
+FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D
+	setweather 0
+	doweather
+	end
+
+FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2
+	lock
+	faceplayer
+	msgbox FarawayIsland_Entrance_Text_2C6B42, 5
+	compare VAR_RESULT, 0
+	goto_eq FarawayIsland_Entrance_EventScript_267CE7
+	msgbox FarawayIsland_Entrance_Text_2A6A5D, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA
+	waitmovement 0
+	delay 30
+	hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE
+	setvar VAR_0x8004, 2
+	call FarawayIsland_Entrance_EventScript_272250
+	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
+	waitstate
+	release
+	end
+
+FarawayIsland_Entrance_EventScript_267CE7:: @ 8267CE7
+	msgbox FarawayIsland_Entrance_Text_2A6A82, 4
+	release
+	end
+
+FarawayIsland_Entrance_EventScript_267CF1:: @ 8267CF1
+	msgbox FarawayIsland_Entrance_Text_2C6D5A, 3
+	end
+
diff --git a/data/maps/FarawayIsland_Interior/events.inc b/data/maps/FarawayIsland_Interior/events.inc
new file mode 100644
index 000000000..c2cd25b40
--- /dev/null
+++ b/data/maps/FarawayIsland_Interior/events.inc
@@ -0,0 +1,10 @@
+FarawayIsland_Interior_EventObjects: @ 853D7A0
+	object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, 60, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718
+
+FarawayIsland_Interior_MapWarps: @ 853D7B8
+	warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE
+	warp_def 13, 19, 0, 1, MAP_FARAWAY_ISLAND_ENTRANCE
+
+FarawayIsland_Interior_MapEvents:: @ 853D7C8
+	map_events FarawayIsland_Interior_EventObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc
index 6d5e3f2d7..dd29fcc26 100644
--- a/data/maps/FarawayIsland_Interior/header.inc
+++ b/data/maps/FarawayIsland_Interior/header.inc
@@ -1,5 +1,5 @@
 FarawayIsland_Interior: @ 8485778
-	.4byte FarawayIsland_Interior_MapAttributes
+	.4byte FarawayIsland_Interior_Layout
 	.4byte FarawayIsland_Interior_MapEvents
 	.4byte FarawayIsland_Interior_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/maps/FarawayIsland_Interior/scripts.inc
index e7d67431d..e7d67431d 100644
--- a/data/scripts/maps/FarawayIsland_Interior.inc
+++ b/data/maps/FarawayIsland_Interior/scripts.inc
diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc
new file mode 100644
index 000000000..37fecaf5e
--- /dev/null
+++ b/data/maps/FieryPath/events.inc
@@ -0,0 +1,17 @@
+FieryPath_EventObjects: @ 8534C80
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_29119E, 1091
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_291191, 1111
+
+FieryPath_MapWarps: @ 8534D40
+	warp_def 26, 36, 3, 4, MAP_ROUTE112
+	warp_def 26, 4, 3, 5, MAP_ROUTE112
+
+FieryPath_MapEvents:: @ 8534D50
+	map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc
index 0cb60553b..c02896935 100644
--- a/data/maps/FieryPath/header.inc
+++ b/data/maps/FieryPath/header.inc
@@ -1,5 +1,5 @@
 FieryPath: @ 8484048
-	.4byte FieryPath_MapAttributes
+	.4byte FieryPath_Layout
 	.4byte FieryPath_MapEvents
 	.4byte FieryPath_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FieryPath.inc b/data/maps/FieryPath/scripts.inc
index a040a5327..a040a5327 100644
--- a/data/scripts/maps/FieryPath.inc
+++ b/data/maps/FieryPath/scripts.inc
diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc
index 08541215c..83b48c0ad 100644
--- a/data/maps/FortreeCity/connections.inc
+++ b/data/maps/FortreeCity/connections.inc
@@ -1,6 +1,6 @@
 FortreeCity_MapConnectionsList: @ 8486784
-	connection left, 0, ROUTE_119, 0
-	connection right, 0, ROUTE_120, 0
+	connection left, 0, MAP_ROUTE119
+	connection right, 0, MAP_ROUTE120
 
 FortreeCity_MapConnections: @ 848679C
 	.4byte 0x2
diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc
new file mode 100644
index 000000000..c943e230d
--- /dev/null
+++ b/data/maps/FortreeCity/events.inc
@@ -0,0 +1,31 @@
+FortreeCity_EventObjects: @ 8526B9C
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, 2, 1, 1, 0, 0, FortreeCity_EventScript_1E25DE, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, 3, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0
+	object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, 76, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, 969
+
+FortreeCity_MapWarps: @ 8526C44
+	warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F
+	warp_def 10, 3, 0, 0, MAP_FORTREE_CITY_HOUSE1
+	warp_def 22, 11, 0, 0, MAP_FORTREE_CITY_GYM
+	warp_def 4, 14, 0, 0, MAP_FORTREE_CITY_MART
+	warp_def 17, 3, 0, 0, MAP_FORTREE_CITY_HOUSE2
+	warp_def 25, 3, 0, 0, MAP_FORTREE_CITY_HOUSE3
+	warp_def 32, 2, 0, 0, MAP_FORTREE_CITY_HOUSE4
+	warp_def 12, 13, 0, 0, MAP_FORTREE_CITY_HOUSE5
+	warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP
+
+FortreeCity_MapBGEvents: @ 8526C8C
+	bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_1E2602
+	bg_event 7, 6, 0, 1, 0, FortreeCity_EventScript_271E73
+	bg_event 5, 14, 0, 1, 0, FortreeCity_EventScript_271E6A
+	bg_event 26, 10, 0, 0, 0, FortreeCity_EventScript_1E260B
+	bg_event 6, 6, 0, 1, 0, FortreeCity_EventScript_271E73
+	bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_271E6A
+
+FortreeCity_MapEvents:: @ 8526CD4
+	map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents
+
diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc
index 6b78eeee1..b091e166f 100644
--- a/data/maps/FortreeCity/header.inc
+++ b/data/maps/FortreeCity/header.inc
@@ -1,5 +1,5 @@
 FortreeCity: @ 8482528
-	.4byte FortreeCity_MapAttributes
+	.4byte FortreeCity_Layout
 	.4byte FortreeCity_MapEvents
 	.4byte FortreeCity_MapScripts
 	.4byte FortreeCity_MapConnections
diff --git a/data/scripts/maps/FortreeCity.inc b/data/maps/FortreeCity/scripts.inc
index 4a28a180b..4a28a180b 100644
--- a/data/scripts/maps/FortreeCity.inc
+++ b/data/maps/FortreeCity/scripts.inc
diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc
new file mode 100644
index 000000000..fe85e94d6
--- /dev/null
+++ b/data/maps/FortreeCity_DecorationShop/events.inc
@@ -0,0 +1,13 @@
+FortreeCity_DecorationShop_EventObjects: @ 85310B0
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 1, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0
+	object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0
+	object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0
+
+FortreeCity_DecorationShop_MapWarps: @ 8531110
+	warp_def 3, 5, 0, 8, MAP_FORTREE_CITY
+	warp_def 4, 5, 0, 8, MAP_FORTREE_CITY
+
+FortreeCity_DecorationShop_MapEvents:: @ 8531120
+	map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc
index 000c589c6..4ebde8a93 100644
--- a/data/maps/FortreeCity_DecorationShop/header.inc
+++ b/data/maps/FortreeCity_DecorationShop/header.inc
@@ -1,5 +1,5 @@
 FortreeCity_DecorationShop: @ 848361C
-	.4byte FortreeCity_DecorationShop_MapAttributes
+	.4byte FortreeCity_DecorationShop_Layout
 	.4byte FortreeCity_DecorationShop_MapEvents
 	.4byte FortreeCity_DecorationShop_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc
index 2229ab702..2229ab702 100644
--- a/data/scripts/maps/FortreeCity_DecorationShop.inc
+++ b/data/maps/FortreeCity_DecorationShop/scripts.inc
diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc
new file mode 100644
index 000000000..234c10b0c
--- /dev/null
+++ b/data/maps/FortreeCity_Gym/events.inc
@@ -0,0 +1,21 @@
+FortreeCity_Gym_EventObjects: @ 8530C98
+	object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 4, 14, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, 9, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 5, 17, 3, 9, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 9, 8, 3, 8, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 15, 21, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 23, 3, 10, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 1, 10, 3, 7, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0
+
+FortreeCity_Gym_MapWarps: @ 8530D58
+	warp_def 15, 24, 0, 2, MAP_FORTREE_CITY
+	warp_def 16, 24, 0, 2, MAP_FORTREE_CITY
+
+FortreeCity_Gym_MapBGEvents: @ 8530D68
+	bg_event 14, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216751
+	bg_event 17, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216761
+
+FortreeCity_Gym_MapEvents:: @ 8530D80
+	map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents
+
diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc
index 08e50e944..eb241b368 100644
--- a/data/maps/FortreeCity_Gym/header.inc
+++ b/data/maps/FortreeCity_Gym/header.inc
@@ -1,5 +1,5 @@
 FortreeCity_Gym: @ 848353C
-	.4byte FortreeCity_Gym_MapAttributes
+	.4byte FortreeCity_Gym_Layout
 	.4byte FortreeCity_Gym_MapEvents
 	.4byte FortreeCity_Gym_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/scripts.inc
index 1b1100cf3..1b1100cf3 100644
--- a/data/scripts/maps/FortreeCity_Gym.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc
new file mode 100644
index 000000000..99d34626c
--- /dev/null
+++ b/data/maps/FortreeCity_House1/events.inc
@@ -0,0 +1,12 @@
+FortreeCity_House1_EventObjects: @ 8530C2C
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, 1, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0
+
+FortreeCity_House1_MapWarps: @ 8530C74
+	warp_def 3, 5, 0, 1, MAP_FORTREE_CITY
+	warp_def 4, 5, 0, 1, MAP_FORTREE_CITY
+
+FortreeCity_House1_MapEvents:: @ 8530C84
+	map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc
index 4aeeb4425..06dd18e1c 100644
--- a/data/maps/FortreeCity_House1/header.inc
+++ b/data/maps/FortreeCity_House1/header.inc
@@ -1,5 +1,5 @@
 FortreeCity_House1: @ 8483520
-	.4byte FortreeCity_House1_MapAttributes
+	.4byte FortreeCity_House1_Layout
 	.4byte FortreeCity_House1_MapEvents
 	.4byte FortreeCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/scripts.inc
index 7e45bf87a..7e45bf87a 100644
--- a/data/scripts/maps/FortreeCity_House1.inc
+++ b/data/maps/FortreeCity_House1/scripts.inc
diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc
new file mode 100644
index 000000000..2d78b2774
--- /dev/null
+++ b/data/maps/FortreeCity_House2/events.inc
@@ -0,0 +1,11 @@
+FortreeCity_House2_EventObjects: @ 8530F30
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0
+
+FortreeCity_House2_MapWarps: @ 8530F60
+	warp_def 3, 5, 0, 4, MAP_FORTREE_CITY
+	warp_def 4, 5, 0, 4, MAP_FORTREE_CITY
+
+FortreeCity_House2_MapEvents:: @ 8530F70
+	map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc
index 30cad4def..62461784f 100644
--- a/data/maps/FortreeCity_House2/header.inc
+++ b/data/maps/FortreeCity_House2/header.inc
@@ -1,5 +1,5 @@
 FortreeCity_House2: @ 84835AC
-	.4byte FortreeCity_House2_MapAttributes
+	.4byte FortreeCity_House2_Layout
 	.4byte FortreeCity_House2_MapEvents
 	.4byte FortreeCity_House2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/scripts.inc
index 8f75b20d9..8f75b20d9 100644
--- a/data/scripts/maps/FortreeCity_House2.inc
+++ b/data/maps/FortreeCity_House2/scripts.inc
diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc
new file mode 100644
index 000000000..54ac6ed6a
--- /dev/null
+++ b/data/maps/FortreeCity_House3/events.inc
@@ -0,0 +1,11 @@
+FortreeCity_House3_EventObjects: @ 8530F84
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House3_EventScript_217AF1, 0
+
+FortreeCity_House3_MapWarps: @ 8530FB4
+	warp_def 3, 5, 0, 5, MAP_FORTREE_CITY
+	warp_def 4, 5, 0, 5, MAP_FORTREE_CITY
+
+FortreeCity_House3_MapEvents:: @ 8530FC4
+	map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc
index 2e2c7813d..54297f446 100644
--- a/data/maps/FortreeCity_House3/header.inc
+++ b/data/maps/FortreeCity_House3/header.inc
@@ -1,5 +1,5 @@
 FortreeCity_House3: @ 84835C8
-	.4byte FortreeCity_House3_MapAttributes
+	.4byte FortreeCity_House1_Layout
 	.4byte FortreeCity_House3_MapEvents
 	.4byte FortreeCity_House3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/scripts.inc
index 92b963811..92b963811 100644
--- a/data/scripts/maps/FortreeCity_House3.inc
+++ b/data/maps/FortreeCity_House3/scripts.inc
diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc
new file mode 100644
index 000000000..1bddf3416
--- /dev/null
+++ b/data/maps/FortreeCity_House4/events.inc
@@ -0,0 +1,12 @@
+FortreeCity_House4_EventObjects: @ 8530FD8
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933
+
+FortreeCity_House4_MapWarps: @ 8531020
+	warp_def 3, 5, 0, 6, MAP_FORTREE_CITY
+	warp_def 4, 5, 0, 6, MAP_FORTREE_CITY
+
+FortreeCity_House4_MapEvents:: @ 8531030
+	map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc
index 59c17803e..71002c7da 100644
--- a/data/maps/FortreeCity_House4/header.inc
+++ b/data/maps/FortreeCity_House4/header.inc
@@ -1,5 +1,5 @@
 FortreeCity_House4: @ 84835E4
-	.4byte FortreeCity_House4_MapAttributes
+	.4byte FortreeCity_House2_Layout
 	.4byte FortreeCity_House4_MapEvents
 	.4byte FortreeCity_House4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/scripts.inc
index 27ead9ec2..27ead9ec2 100644
--- a/data/scripts/maps/FortreeCity_House4.inc
+++ b/data/maps/FortreeCity_House4/scripts.inc
diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc
new file mode 100644
index 000000000..d6c03578e
--- /dev/null
+++ b/data/maps/FortreeCity_House5/events.inc
@@ -0,0 +1,12 @@
+FortreeCity_House5_EventObjects: @ 8531044
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0
+
+FortreeCity_House5_MapWarps: @ 853108C
+	warp_def 3, 5, 0, 7, MAP_FORTREE_CITY
+	warp_def 4, 5, 0, 7, MAP_FORTREE_CITY
+
+FortreeCity_House5_MapEvents:: @ 853109C
+	map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc
index deaa634a8..6513cde1e 100644
--- a/data/maps/FortreeCity_House5/header.inc
+++ b/data/maps/FortreeCity_House5/header.inc
@@ -1,5 +1,5 @@
 FortreeCity_House5: @ 8483600
-	.4byte FortreeCity_House5_MapAttributes
+	.4byte FortreeCity_House1_Layout
 	.4byte FortreeCity_House5_MapEvents
 	.4byte FortreeCity_House5_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/scripts.inc
index d4f1f2b02..d4f1f2b02 100644
--- a/data/scripts/maps/FortreeCity_House5.inc
+++ b/data/maps/FortreeCity_House5/scripts.inc
diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc
new file mode 100644
index 000000000..115b04ccd
--- /dev/null
+++ b/data/maps/FortreeCity_Mart/events.inc
@@ -0,0 +1,13 @@
+FortreeCity_Mart_EventObjects: @ 8530EAC
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, 2, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, 10, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0
+
+FortreeCity_Mart_MapWarps: @ 8530F0C
+	warp_def 3, 7, 0, 3, MAP_FORTREE_CITY
+	warp_def 4, 7, 0, 3, MAP_FORTREE_CITY
+
+FortreeCity_Mart_MapEvents:: @ 8530F1C
+	map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc
index 03ee88852..18cb7b971 100644
--- a/data/maps/FortreeCity_Mart/header.inc
+++ b/data/maps/FortreeCity_Mart/header.inc
@@ -1,5 +1,5 @@
 FortreeCity_Mart: @ 8483590
-	.4byte FortreeCity_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte FortreeCity_Mart_MapEvents
 	.4byte FortreeCity_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/scripts.inc
index 050fc8f4c..050fc8f4c 100644
--- a/data/scripts/maps/FortreeCity_Mart.inc
+++ b/data/maps/FortreeCity_Mart/scripts.inc
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..4b681b5cb
--- /dev/null
+++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,14 @@
+FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0
+
+FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4
+	warp_def 7, 8, 3, 0, MAP_FORTREE_CITY
+	warp_def 6, 8, 3, 0, MAP_FORTREE_CITY
+	warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F
+
+FortreeCity_PokemonCenter_1F_MapEvents:: @ 8530E0C
+	map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
index d065198ad..ae2b8e0e8 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 FortreeCity_PokemonCenter_1F: @ 8483558
-	.4byte FortreeCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte FortreeCity_PokemonCenter_1F_MapEvents
 	.4byte FortreeCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
index e119a0f29..e119a0f29 100644
--- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..7a7f666b2
--- /dev/null
+++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702
+
+FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80
+	warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+FortreeCity_PokemonCenter_2F_MapEvents:: @ 8530E98
+	map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
index 5eb3483c3..adb7a7bde 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 FortreeCity_PokemonCenter_2F: @ 8483574
-	.4byte FortreeCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte FortreeCity_PokemonCenter_2F_MapEvents
 	.4byte FortreeCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
index f631aa3c6..f631aa3c6 100644
--- a/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc
new file mode 100644
index 000000000..83368e186
--- /dev/null
+++ b/data/maps/GraniteCave_1F/events.inc
@@ -0,0 +1,13 @@
+GraniteCave_1F_EventObjects: @ 85343BC
+	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050
+
+GraniteCave_1F_MapWarps: @ 85343EC
+	warp_def 37, 12, 3, 0, MAP_ROUTE106
+	warp_def 35, 3, 3, 0, MAP_GRANITE_CAVE_B1F
+	warp_def 17, 11, 3, 1, MAP_GRANITE_CAVE_B1F
+	warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM
+
+GraniteCave_1F_MapEvents:: @ 853440C
+	map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc
index ebd93d4eb..3d29c272a 100644
--- a/data/maps/GraniteCave_1F/header.inc
+++ b/data/maps/GraniteCave_1F/header.inc
@@ -1,5 +1,5 @@
 GraniteCave_1F: @ 8483F84
-	.4byte GraniteCave_1F_MapAttributes
+	.4byte GraniteCave_1F_Layout
 	.4byte GraniteCave_1F_MapEvents
 	.4byte GraniteCave_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/scripts.inc
index f3d303c0f..f3d303c0f 100644
--- a/data/scripts/maps/GraniteCave_1F.inc
+++ b/data/maps/GraniteCave_1F/scripts.inc
diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc
new file mode 100644
index 000000000..90b0f498e
--- /dev/null
+++ b/data/maps/GraniteCave_B1F/events.inc
@@ -0,0 +1,15 @@
+GraniteCave_B1F_EventObjects: @ 8534420
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051
+
+GraniteCave_B1F_MapWarps: @ 8534438
+	warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F
+	warp_def 4, 21, 3, 2, MAP_GRANITE_CAVE_1F
+	warp_def 29, 13, 3, 0, MAP_GRANITE_CAVE_B2F
+	warp_def 28, 21, 3, 1, MAP_GRANITE_CAVE_B2F
+	warp_def 8, 5, 3, 2, MAP_GRANITE_CAVE_B2F
+	warp_def 12, 3, 3, 3, MAP_GRANITE_CAVE_B2F
+	warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F
+
+GraniteCave_B1F_MapEvents:: @ 8534470
+	map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc
index de946f84c..6ab42f082 100644
--- a/data/maps/GraniteCave_B1F/header.inc
+++ b/data/maps/GraniteCave_B1F/header.inc
@@ -1,5 +1,5 @@
 GraniteCave_B1F: @ 8483FA0
-	.4byte GraniteCave_B1F_MapAttributes
+	.4byte GraniteCave_B1F_Layout
 	.4byte GraniteCave_B1F_MapEvents
 	.4byte GraniteCave_B1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc
new file mode 100644
index 000000000..360b10a08
--- /dev/null
+++ b/data/maps/GraniteCave_B1F/scripts.inc
@@ -0,0 +1,11 @@
+GraniteCave_B1F_MapScripts:: @ 822DC5E
+	map_script 2, GraniteCave_B1F_MapScript2_2A8327
+	map_script 3, GraniteCave_B1F_MapScript1_2A8331
+	map_script 5, GraniteCave_B1F_MapScript1_22DC6E
+	.byte 0
+
+GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E
+	setstepcallback 7
+	setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0
+	end
+
diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc
new file mode 100644
index 000000000..d7ce41812
--- /dev/null
+++ b/data/maps/GraniteCave_B2F/events.inc
@@ -0,0 +1,25 @@
+GraniteCave_B2F_EventObjects: @ 8534484
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22
+	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23
+
+GraniteCave_B2F_MapWarps: @ 853455C
+	warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F
+	warp_def 28, 21, 3, 3, MAP_GRANITE_CAVE_B1F
+	warp_def 8, 5, 3, 4, MAP_GRANITE_CAVE_B1F
+	warp_def 12, 3, 3, 5, MAP_GRANITE_CAVE_B1F
+	warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F
+
+GraniteCave_B2F_MapBGEvents: @ 8534584
+	bg_event 28, 6, 3, 7, 0, ITEM_EVERSTONE, 48, 0
+	bg_event 15, 11, 3, 7, 0, ITEM_EVERSTONE, 49, 0
+
+GraniteCave_B2F_MapEvents:: @ 853459C
+	map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents
+
diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc
index 0442638f9..95935c283 100644
--- a/data/maps/GraniteCave_B2F/header.inc
+++ b/data/maps/GraniteCave_B2F/header.inc
@@ -1,5 +1,5 @@
 GraniteCave_B2F: @ 8483FBC
-	.4byte GraniteCave_B2F_MapAttributes
+	.4byte GraniteCave_B2F_Layout
 	.4byte GraniteCave_B2F_MapEvents
 	.4byte GraniteCave_B2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/scripts.inc
index d8cacbe38..d8cacbe38 100644
--- a/data/scripts/maps/GraniteCave_B2F.inc
+++ b/data/maps/GraniteCave_B2F/scripts.inc
diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc
new file mode 100644
index 000000000..49e808cda
--- /dev/null
+++ b/data/maps/GraniteCave_StevensRoom/events.inc
@@ -0,0 +1,9 @@
+GraniteCave_StevensRoom_EventObjects: @ 85345B0
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833
+
+GraniteCave_StevensRoom_MapWarps: @ 85345C8
+	warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F
+
+GraniteCave_StevensRoom_MapEvents:: @ 85345D0
+	map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc
index 569d46b98..0644d8cb7 100644
--- a/data/maps/GraniteCave_StevensRoom/header.inc
+++ b/data/maps/GraniteCave_StevensRoom/header.inc
@@ -1,5 +1,5 @@
 GraniteCave_StevensRoom: @ 8483FD8
-	.4byte GraniteCave_StevensRoom_MapAttributes
+	.4byte GraniteCave_StevensRoom_Layout
 	.4byte GraniteCave_StevensRoom_MapEvents
 	.4byte GraniteCave_StevensRoom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc
index b057a0548..b057a0548 100644
--- a/data/scripts/maps/GraniteCave_StevensRoom.inc
+++ b/data/maps/GraniteCave_StevensRoom/scripts.inc
diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc
new file mode 100644
index 000000000..5dafdf1fd
--- /dev/null
+++ b/data/maps/InsideOfTruck/events.inc
@@ -0,0 +1,25 @@
+InsideOfTruck_EventObjects: @ 853A078
+	object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0
+	object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0
+	object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0
+
+InsideOfTruck_MapWarps: @ 853A0C0
+	warp_def 4, 1, 0, 127, MAP_NONE
+	warp_def 4, 2, 0, 127, MAP_NONE
+	warp_def 4, 3, 0, 127, MAP_NONE
+
+InsideOfTruck_MapCoordEvents: @ 853A0D8
+	coord_event 3, 1, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04
+	coord_event 3, 2, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04
+	coord_event 3, 3, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04
+
+InsideOfTruck_MapBGEvents: @ 853A108
+	bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
+	bg_event 3, 4, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
+	bg_event 2, 3, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
+	bg_event 0, 1, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
+	bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
+
+InsideOfTruck_MapEvents:: @ 853A144
+	map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents
+
diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc
index 7e63d060f..c77ea5934 100644
--- a/data/maps/InsideOfTruck/header.inc
+++ b/data/maps/InsideOfTruck/header.inc
@@ -1,5 +1,5 @@
 InsideOfTruck: @ 8484EF0
-	.4byte InsideOfTruck_MapAttributes
+	.4byte InsideOfTruck_Layout
 	.4byte InsideOfTruck_MapEvents
 	.4byte InsideOfTruck_MapScripts
 	.4byte 0x0
diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc
new file mode 100644
index 000000000..963dd196d
--- /dev/null
+++ b/data/maps/InsideOfTruck/scripts.inc
@@ -0,0 +1,60 @@
+InsideOfTruck_MapScripts:: @ 823BEDA
+	map_script 1, InsideOfTruck_MapScript1_23BEE5
+	map_script 5, InsideOfTruck_MapScript1_23BF01
+	.byte 0
+
+InsideOfTruck_MapScript1_23BEE5: @ 823BEE5
+	setmetatile 4, 1, 520, 0
+	setmetatile 4, 2, 528, 0
+	setmetatile 4, 3, 536, 0
+	end
+
+InsideOfTruck_MapScript1_23BF01: @ 823BF01
+	setstepcallback 5
+	end
+
+InsideOfTruck_EventScript_23BF04:: @ 823BF04
+	lockall
+	setflag FLAG_SPECIAL_FLAG_0x4000
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq InsideOfTruck_EventScript_23BF20
+	compare VAR_RESULT, 1
+	goto_eq InsideOfTruck_EventScript_23BF46
+	end
+
+InsideOfTruck_EventScript_23BF20:: @ 823BF20
+	setrespawn 1
+	setvar VAR_0x4092, 1
+	setflag FLAG_0x2F7
+	setflag FLAG_0x2FA
+	setflag FLAG_0x310
+	setflag FLAG_0x2DF
+	setflag FLAG_0x331
+	setvar VAR_0x408C, 1
+	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10
+	releaseall
+	end
+
+InsideOfTruck_EventScript_23BF46:: @ 823BF46
+	setrespawn 2
+	setvar VAR_0x4092, 2
+	setflag FLAG_0x2F6
+	setflag FLAG_0x2F9
+	setflag FLAG_0x311
+	setflag FLAG_0x2E0
+	setflag FLAG_0x332
+	setvar VAR_0x4082, 1
+	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10
+	releaseall
+	end
+
+InsideOfTruck_EventScript_23BF6C:: @ 823BF6C
+	msgbox InsideOfTruck_Text_23BF75, 3
+	end
+
+InsideOfTruck_Text_23BF75: @ 823BF75
+	.string "The box is printed with a POKéMON logo.\p"
+	.string "It’s a POKéMON brand moving and\n"
+	.string "delivery service.$"
+
diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc
new file mode 100644
index 000000000..d7807a725
--- /dev/null
+++ b/data/maps/IslandCave/events.inc
@@ -0,0 +1,16 @@
+IslandCave_EventObjects: @ 8536C74
+	object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936
+
+IslandCave_MapWarps: @ 8536C8C
+	warp_def 8, 29, 3, 0, MAP_ROUTE105
+	warp_def 8, 20, 0, 2, MAP_ISLAND_CAVE
+	warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE
+
+IslandCave_MapBGEvents: @ 8536CA4
+	bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_238EEF
+	bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_238F1D
+	bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_238F1D
+
+IslandCave_MapEvents:: @ 8536CC8
+	map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents
+
diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc
index 9b9e2b739..6ff291c29 100644
--- a/data/maps/IslandCave/header.inc
+++ b/data/maps/IslandCave/header.inc
@@ -1,5 +1,5 @@
 IslandCave: @ 8484614
-	.4byte IslandCave_MapAttributes
+	.4byte IslandCave_Layout
 	.4byte IslandCave_MapEvents
 	.4byte IslandCave_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/IslandCave.inc b/data/maps/IslandCave/scripts.inc
index a96d13902..a96d13902 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/maps/IslandCave/scripts.inc
diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc
new file mode 100644
index 000000000..fe193cd97
--- /dev/null
+++ b/data/maps/JaggedPass/events.inc
@@ -0,0 +1,35 @@
+JaggedPass_EventObjects: @ 8534AE4
+	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, 10, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0
+	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, 14, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, 16, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, 7, 1, 1, 0, 0, JaggedPass_EventScript_230718, 847
+	object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, 10, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0
+	object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, 9, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0
+
+JaggedPass_MapWarps: @ 8534B8C
+	warp_def 14, 40, 3, 2, MAP_ROUTE112
+	warp_def 15, 40, 3, 3, MAP_ROUTE112
+	warp_def 13, 5, 3, 2, MAP_MT_CHIMNEY
+	warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY
+	warp_def 16, 18, 0, 0, MAP_MAGMA_HIDEOUT_1F
+
+JaggedPass_MapCoordEvents: @ 8534BB4
+	coord_event 13, 15, 3, 0, 2, 0, 0, 0x0
+	coord_event 21, 12, 3, 0, 8, 0, 0, 0x0
+	coord_event 14, 15, 3, 0, 2, 0, 0, 0x0
+	coord_event 18, 17, 3, 0, 2, 0, 0, 0x0
+	coord_event 22, 19, 3, 0, 2, 0, 0, 0x0
+	coord_event 21, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
+	coord_event 22, 20, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
+	coord_event 21, 20, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
+	coord_event 14, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
+	coord_event 13, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
+
+JaggedPass_MapBGEvents: @ 8534C54
+	bg_event 8, 10, 3, 7, 0, ITEM_FULL_HEAL, 77, 0
+	bg_event 7, 29, 3, 7, 0, ITEM_GREAT_BALL, 76, 0
+
+JaggedPass_MapEvents:: @ 8534C6C
+	map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents
+
diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc
index ad1a4640f..f6fc90e4e 100644
--- a/data/maps/JaggedPass/header.inc
+++ b/data/maps/JaggedPass/header.inc
@@ -1,5 +1,5 @@
 JaggedPass: @ 848402C
-	.4byte JaggedPass_MapAttributes
+	.4byte JaggedPass_Layout
 	.4byte JaggedPass_MapEvents
 	.4byte JaggedPass_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/JaggedPass.inc b/data/maps/JaggedPass/scripts.inc
index 15ac1bae6..15ac1bae6 100644
--- a/data/scripts/maps/JaggedPass.inc
+++ b/data/maps/JaggedPass/scripts.inc
diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc
index c522a3460..0b8181615 100644
--- a/data/maps/LavaridgeTown/connections.inc
+++ b/data/maps/LavaridgeTown/connections.inc
@@ -1,5 +1,5 @@
 LavaridgeTown_MapConnectionsList: @ 8486660
-	connection right, -40, ROUTE_112, 0
+	connection right, -40, MAP_ROUTE112
 
 LavaridgeTown_MapConnections: @ 848666C
 	.4byte 0x1
diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc
new file mode 100644
index 000000000..cf32b8377
--- /dev/null
+++ b/data/maps/LavaridgeTown/events.inc
@@ -0,0 +1,35 @@
+LavaridgeTown_EventObjects: @ 8527A54
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, 3, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0
+	object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0
+	object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0
+	object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, 930
+	object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, 8, 0, 0, 0, 0, 0x0, 929
+	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, 8, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0
+
+LavaridgeTown_MapWarps: @ 8527B2C
+	warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP
+	warp_def 5, 15, 0, 0, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 15, 5, 0, 0, MAP_LAVARIDGE_TOWN_MART
+	warp_def 9, 6, 0, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F
+	warp_def 16, 15, 0, 0, MAP_LAVARIDGE_TOWN_HOUSE
+	warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F
+
+LavaridgeTown_MapCoordEvents: @ 8527B5C
+	coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA6FA
+
+LavaridgeTown_MapBGEvents: @ 8527B6C
+	bg_event 14, 16, 0, 0, 0, LavaridgeTown_EventScript_1EA7B7
+	bg_event 7, 15, 0, 0, 0, LavaridgeTown_EventScript_1EA7AE
+	bg_event 17, 5, 0, 1, 0, LavaridgeTown_EventScript_271E6A
+	bg_event 13, 8, 0, 0, 0, LavaridgeTown_EventScript_1EA7A5
+	bg_event 10, 6, 0, 1, 0, LavaridgeTown_EventScript_271E73
+	bg_event 16, 5, 0, 1, 0, LavaridgeTown_EventScript_271E6A
+	bg_event 11, 6, 0, 1, 0, LavaridgeTown_EventScript_271E73
+	bg_event 4, 5, 3, 7, 0, ITEM_ICE_HEAL, 0, 0
+
+LavaridgeTown_MapEvents:: @ 8527BCC
+	map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents
+
diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc
index 138cc6778..12cc74b5f 100644
--- a/data/maps/LavaridgeTown/header.inc
+++ b/data/maps/LavaridgeTown/header.inc
@@ -1,5 +1,5 @@
 LavaridgeTown: @ 8482608
-	.4byte LavaridgeTown_MapAttributes
+	.4byte LavaridgeTown_Layout
 	.4byte LavaridgeTown_MapEvents
 	.4byte LavaridgeTown_MapScripts
 	.4byte LavaridgeTown_MapConnections
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/maps/LavaridgeTown/scripts.inc
index 5670d9b6e..5670d9b6e 100644
--- a/data/scripts/maps/LavaridgeTown.inc
+++ b/data/maps/LavaridgeTown/scripts.inc
diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc
new file mode 100644
index 000000000..cc35053f0
--- /dev/null
+++ b/data/maps/LavaridgeTown_Gym_1F/events.inc
@@ -0,0 +1,43 @@
+LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C
+	object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 14, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 2, 15, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 3, 10, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0
+
+LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC
+	warp_def 13, 18, 3, 1, MAP_LAVARIDGE_TOWN
+	warp_def 14, 18, 3, 1, MAP_LAVARIDGE_TOWN
+	warp_def 10, 18, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 8, 9, 3, 2, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 4, 18, 3, 4, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 5, 14, 3, 3, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 0, 17, 3, 1, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 5, 9, 3, 5, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 2, 15, 3, 6, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 3, 14, 3, 7, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 1, 14, 3, 8, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 0, 10, 3, 9, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 3, 10, 3, 10, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 0, 6, 3, 11, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 3, 6, 3, 12, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 5, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 2, 3, 3, 14, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 5, 2, 3, 15, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 7, 2, 3, 16, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 8, 6, 3, 17, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 10, 6, 3, 18, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 4, 16, 0, 20, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 12, 3, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 14, 6, 3, 21, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 13, 17, 3, 22, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 12, 12, 3, 23, MAP_LAVARIDGE_TOWN_GYM_B1F
+
+LavaridgeTown_Gym_1F_MapBGEvents: @ 852DF7C
+	bg_event 10, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE98B
+	bg_event 16, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE99B
+
+LavaridgeTown_Gym_1F_MapEvents:: @ 852DF94
+	map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents
+
diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc
index f473ddaee..30cde2e9c 100644
--- a/data/maps/LavaridgeTown_Gym_1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/header.inc
@@ -1,5 +1,5 @@
 LavaridgeTown_Gym_1F: @ 8482CD0
-	.4byte LavaridgeTown_Gym_1F_MapAttributes
+	.4byte LavaridgeTown_Gym_1F_Layout
 	.4byte LavaridgeTown_Gym_1F_MapEvents
 	.4byte LavaridgeTown_Gym_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
index 1d317d43b..1d317d43b 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
diff --git a/data/maps/LavaridgeTown_Gym_B1F/events.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc
new file mode 100644
index 000000000..eabf8e51d
--- /dev/null
+++ b/data/maps/LavaridgeTown_Gym_B1F/events.inc
@@ -0,0 +1,35 @@
+LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8
+	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 4, 18, 3, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 6, 0, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 13, 17, 0, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0
+	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0
+
+LavaridgeTown_Gym_B1F_MapWarps: @ 852E008
+	warp_def 10, 18, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 0, 17, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 8, 9, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 5, 14, 3, 5, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 4, 18, 3, 4, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 5, 9, 3, 7, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 2, 15, 3, 8, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 3, 14, 3, 9, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 1, 14, 3, 10, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 0, 10, 3, 11, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 3, 10, 3, 12, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 0, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 3, 6, 3, 14, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 5, 6, 3, 15, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 2, 3, 3, 16, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 5, 2, 3, 17, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 7, 2, 3, 18, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 8, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 10, 6, 3, 20, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 12, 3, 3, 22, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 4, 16, 3, 21, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 14, 6, 3, 23, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 13, 17, 3, 24, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 12, 12, 3, 25, MAP_LAVARIDGE_TOWN_GYM_1F
+
+LavaridgeTown_Gym_B1F_MapEvents:: @ 852E0C8
+	map_events LavaridgeTown_Gym_B1F_EventObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc
index c188cd5ba..66d732921 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc
@@ -1,5 +1,5 @@
 LavaridgeTown_Gym_B1F: @ 8482CEC
-	.4byte LavaridgeTown_Gym_B1F_MapAttributes
+	.4byte LavaridgeTown_Gym_B1F_Layout
 	.4byte LavaridgeTown_Gym_B1F_MapEvents
 	.4byte LavaridgeTown_Gym_B1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
index ad2be83ea..ad2be83ea 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc
new file mode 100644
index 000000000..dd5ffdbe9
--- /dev/null
+++ b/data/maps/LavaridgeTown_HerbShop/events.inc
@@ -0,0 +1,12 @@
+LavaridgeTown_HerbShop_EventObjects: @ 852DDB0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, 1, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, 5, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0
+
+LavaridgeTown_HerbShop_MapWarps: @ 852DDF8
+	warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN
+	warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN
+
+LavaridgeTown_HerbShop_MapEvents:: @ 852DE08
+	map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc
index 5e3fd99a0..c9ef33f92 100644
--- a/data/maps/LavaridgeTown_HerbShop/header.inc
+++ b/data/maps/LavaridgeTown_HerbShop/header.inc
@@ -1,5 +1,5 @@
 LavaridgeTown_HerbShop: @ 8482CB4
-	.4byte LavaridgeTown_HerbShop_MapAttributes
+	.4byte LavaridgeTown_HerbShop_Layout
 	.4byte LavaridgeTown_HerbShop_MapEvents
 	.4byte LavaridgeTown_HerbShop_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc
index 6af8132e4..6af8132e4 100644
--- a/data/scripts/maps/LavaridgeTown_HerbShop.inc
+++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc
diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc
new file mode 100644
index 000000000..17809fc45
--- /dev/null
+++ b/data/maps/LavaridgeTown_House/events.inc
@@ -0,0 +1,12 @@
+LavaridgeTown_House_EventObjects: @ 852E0DC
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 4, 3, 2, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0
+
+LavaridgeTown_House_MapWarps: @ 852E124
+	warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN
+	warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN
+
+LavaridgeTown_House_MapEvents:: @ 852E134
+	map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc
index f48bf4035..aa8a822f5 100644
--- a/data/maps/LavaridgeTown_House/header.inc
+++ b/data/maps/LavaridgeTown_House/header.inc
@@ -1,5 +1,5 @@
 LavaridgeTown_House: @ 8482D08
-	.4byte LavaridgeTown_House_MapAttributes
+	.4byte House3_Layout
 	.4byte LavaridgeTown_House_MapEvents
 	.4byte LavaridgeTown_House_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/scripts.inc
index 14d112de9..14d112de9 100644
--- a/data/scripts/maps/LavaridgeTown_House.inc
+++ b/data/maps/LavaridgeTown_House/scripts.inc
diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc
new file mode 100644
index 000000000..0206eefd7
--- /dev/null
+++ b/data/maps/LavaridgeTown_Mart/events.inc
@@ -0,0 +1,12 @@
+LavaridgeTown_Mart_EventObjects: @ 852E148
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0
+
+LavaridgeTown_Mart_MapWarps: @ 852E190
+	warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN
+	warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN
+
+LavaridgeTown_Mart_MapEvents:: @ 852E1A0
+	map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc
index b3f901570..72d8699f1 100644
--- a/data/maps/LavaridgeTown_Mart/header.inc
+++ b/data/maps/LavaridgeTown_Mart/header.inc
@@ -1,5 +1,5 @@
 LavaridgeTown_Mart: @ 8482D24
-	.4byte LavaridgeTown_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte LavaridgeTown_Mart_MapEvents
 	.4byte LavaridgeTown_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/scripts.inc
index 2c5681983..2c5681983 100644
--- a/data/scripts/maps/LavaridgeTown_Mart.inc
+++ b/data/maps/LavaridgeTown_Mart/scripts.inc
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..767f01713
--- /dev/null
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0
+	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0
+
+LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214
+	warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN
+	warp_def 6, 8, 3, 3, MAP_LAVARIDGE_TOWN
+	warp_def 1, 6, 4, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F
+	warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN
+
+LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 852E234
+	map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
index 30009b084..b3444dc0f 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 LavaridgeTown_PokemonCenter_1F: @ 8482D40
-	.4byte LavaridgeTown_PokemonCenter_1F_MapAttributes
+	.4byte LavaridgeTown_PokemonCenter_1F_Layout
 	.4byte LavaridgeTown_PokemonCenter_1F_MapEvents
 	.4byte LavaridgeTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
index 24f19b1d0..24f19b1d0 100644
--- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..3191e7533
--- /dev/null
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702
+
+LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8
+	warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 852E2C0
+	map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
index 26a5fd642..596b0e189 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 LavaridgeTown_PokemonCenter_2F: @ 8482D5C
-	.4byte LavaridgeTown_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte LavaridgeTown_PokemonCenter_2F_MapEvents
 	.4byte LavaridgeTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
index b1491f621..b1491f621 100644
--- a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc
index e19e02829..d5469e561 100644
--- a/data/maps/LilycoveCity/connections.inc
+++ b/data/maps/LilycoveCity/connections.inc
@@ -1,6 +1,6 @@
 LilycoveCity_MapConnectionsList: @ 84867A4
-	connection left, 10, ROUTE_121, 0
-	connection right, -10, ROUTE_124, 0
+	connection left, 10, MAP_ROUTE121
+	connection right, -10, MAP_ROUTE124
 
 LilycoveCity_MapConnections: @ 84867BC
 	.4byte 0x2
diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc
new file mode 100644
index 000000000..343249c2d
--- /dev/null
+++ b/data/maps/LilycoveCity/events.inc
@@ -0,0 +1,58 @@
+LilycoveCity_EventObjects: @ 8526CE8
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, 3, 0, 1, 0, 0, LilycoveCity_EventScript_1E2C53, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C2B, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C4A, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C72, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0
+	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042
+	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852
+	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852
+	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852
+	object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852
+	object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0
+	object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, 8, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, 971
+	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, 10, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0
+	object_event 19, EVENT_OBJ_GFX_WOMAN_4, 0, 41, 25, 3, 9, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0
+	object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, 10, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0
+	object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, 8, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CCB, 0
+	object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, 7, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CD4, 0
+
+LilycoveCity_MapWarps: @ 8526EF8
+	warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F
+	warp_def 37, 24, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F
+	warp_def 24, 14, 0, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F
+	warp_def 11, 5, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
+	warp_def 23, 24, 0, 0, MAP_LILYCOVE_CITY_CONTEST_LOBBY
+	warp_def 39, 14, 0, 1, MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB
+	warp_def 70, 5, 1, 0, MAP_AQUA_HIDEOUT_1F
+	warp_def 36, 6, 0, 0, MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE
+	warp_def 42, 6, 0, 0, MAP_LILYCOVE_CITY_HOUSE1
+	warp_def 55, 15, 0, 0, MAP_LILYCOVE_CITY_HOUSE2
+	warp_def 11, 22, 0, 0, MAP_LILYCOVE_CITY_HOUSE3
+	warp_def 12, 14, 0, 0, MAP_LILYCOVE_CITY_HOUSE4
+	warp_def 12, 32, 0, 0, MAP_LILYCOVE_CITY_HARBOR
+	warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
+
+LilycoveCity_MapBGEvents: @ 8526F68
+	bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_1E2D1A
+	bg_event 25, 14, 0, 1, 0, LilycoveCity_EventScript_271E73
+	bg_event 29, 7, 0, 0, 0, LilycoveCity_EventScript_1E2D6B
+	bg_event 26, 14, 0, 1, 0, LilycoveCity_EventScript_271E73
+	bg_event 6, 15, 0, 0, 0, LilycoveCity_EventScript_1E2CFF
+	bg_event 29, 24, 0, 0, 0, LilycoveCity_EventScript_1E2D08
+	bg_event 35, 24, 0, 0, 0, LilycoveCity_EventScript_1E2D11
+	bg_event 6, 30, 3, 0, 0, LilycoveCity_EventScript_1E2D44
+	bg_event 36, 14, 0, 0, 0, LilycoveCity_EventScript_1E2D62
+	bg_event 34, 6, 0, 0, 0, LilycoveCity_EventScript_1E2D74
+	bg_event 36, 31, 3, 7, 0, ITEM_HEART_SCALE, 27, 0
+	bg_event 61, 7, 0, 7, 0, ITEM_PP_UP, 43, 0
+	bg_event 64, 31, 0, 7, 0, ITEM_POKE_BALL, 75, 0
+
+LilycoveCity_MapEvents:: @ 8527004
+	map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents
+
diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc
index 37ec48371..1ec7fa26e 100644
--- a/data/maps/LilycoveCity/header.inc
+++ b/data/maps/LilycoveCity/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity: @ 8482544
-	.4byte LilycoveCity_MapAttributes
+	.4byte LilycoveCity_Layout
 	.4byte LilycoveCity_MapEvents
 	.4byte LilycoveCity_MapScripts
 	.4byte LilycoveCity_MapConnections
diff --git a/data/scripts/maps/LilycoveCity.inc b/data/maps/LilycoveCity/scripts.inc
index 87a129620..87a129620 100644
--- a/data/scripts/maps/LilycoveCity.inc
+++ b/data/maps/LilycoveCity/scripts.inc
diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc
new file mode 100644
index 000000000..dd5655beb
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestHall/events.inc
@@ -0,0 +1,51 @@
+LilycoveCity_ContestHall_EventObjects: @ 8531850
+	object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, 2, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, 2, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0
+	object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0
+	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0
+	object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0
+	object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0
+	object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0
+	object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0
+	object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0
+	object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0
+	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0
+	object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0
+	object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0
+	object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0
+	object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0
+	object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0
+	object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0
+	object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0
+	object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0
+	object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0
+	object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0
+	object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0
+	object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0
+	object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0
+	object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0
+
+LilycoveCity_ContestHall_MapWarps: @ 8531B50
+	warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY
+	warp_def 30, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY
+	warp_def 20, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY
+	warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY
+
+LilycoveCity_ContestHall_MapBGEvents: @ 8531B70
+	bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B733
+	bg_event 39, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B73C
+	bg_event 11, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B745
+	bg_event 15, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B745
+	bg_event 23, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B733
+	bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B73C
+
+LilycoveCity_ContestHall_MapEvents:: @ 8531BB8
+	map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents
+
diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc
index f8f05f874..d0b17f863 100644
--- a/data/maps/LilycoveCity_ContestHall/header.inc
+++ b/data/maps/LilycoveCity_ContestHall/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_ContestHall: @ 84836C4
-	.4byte LilycoveCity_ContestHall_MapAttributes
+	.4byte LilycoveCity_ContestHall_Layout
 	.4byte LilycoveCity_ContestHall_MapEvents
 	.4byte LilycoveCity_ContestHall_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc
index 3f02a404c..3f02a404c 100644
--- a/data/scripts/maps/LilycoveCity_ContestHall.inc
+++ b/data/maps/LilycoveCity_ContestHall/scripts.inc
diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc
new file mode 100644
index 000000000..d7c31c837
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestLobby/events.inc
@@ -0,0 +1,50 @@
+LilycoveCity_ContestLobby_EventObjects: @ 8531534
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 26, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0
+	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, 1, 0, 0, 0, 0, 0x0, 774
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0
+	object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0
+	object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0
+	object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802
+	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0
+	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0
+	object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, 8, 0, 0, 0, 0, 0x0, 895
+	object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0
+	object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0
+	object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 7, 3, 3, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0
+	object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 5, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873
+	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 27, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832
+	object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832
+	object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 28, 7, 3, 7, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832
+	object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, 7, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832
+	object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, 7, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832
+	object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832
+	object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 26, 5, 3, 10, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832
+	object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 10, 3, 10, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0
+
+LilycoveCity_ContestLobby_MapWarps: @ 853178C
+	warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY
+	warp_def 15, 11, 0, 4, MAP_LILYCOVE_CITY
+	warp_def 9, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL
+	warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL
+
+LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC
+	bg_event 23, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_294055
+	bg_event 23, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293E1E
+	bg_event 23, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A753
+	bg_event 25, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A75A
+	bg_event 27, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A761
+	bg_event 30, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A77A
+	bg_event 3, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A73E
+	bg_event 5, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A745
+	bg_event 7, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A74C
+	bg_event 27, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293C3E
+	bg_event 27, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293D4D
+	bg_event 18, 3, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A784
+
+LilycoveCity_ContestLobby_MapEvents:: @ 853183C
+	map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents
+
diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc
index 674726f47..ddd0d6284 100644
--- a/data/maps/LilycoveCity_ContestLobby/header.inc
+++ b/data/maps/LilycoveCity_ContestLobby/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_ContestLobby: @ 84836A8
-	.4byte LilycoveCity_ContestLobby_MapAttributes
+	.4byte LilycoveCity_ContestLobby_Layout
 	.4byte LilycoveCity_ContestLobby_MapEvents
 	.4byte LilycoveCity_ContestLobby_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
new file mode 100644
index 000000000..a4609ab54
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -0,0 +1,1121 @@
+LilycoveCity_ContestLobby_MapScripts:: @ 821A211
+	map_script 3, LilycoveCity_ContestLobby_MapScript1_21A21C
+	map_script 2, LilycoveCity_ContestLobby_MapScript2_21A243
+	.byte 0
+
+LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C
+	call LilycoveCity_ContestLobby_EventScript_28CB2B
+	call LilycoveCity_ContestLobby_EventScript_21A227
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227
+	getpricereduction 4
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A23C
+	clearflag FLAG_0x369
+	setflag FLAG_0x340
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C
+	setflag FLAG_0x369
+	clearflag FLAG_0x340
+	return
+
+LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243
+	map_script_2 VAR_0x4099, 1, LilycoveCity_ContestLobby_EventScript_21A255
+	map_script_2 VAR_0x4099, 2, LilycoveCity_ContestLobby_EventScript_21A427
+	.2byte 0
+
+LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255
+	checkflag FLAG_0x307
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A264
+	setvar VAR_0x4099, 0
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264
+	lockall
+	addobject 4
+	applymovement 4, LilycoveCity_ContestLobby_Movement_21A407
+	waitmovement 4
+	applymovement 255, LilycoveCity_ContestLobby_Movement_21A418
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_21ADB9, 4
+	lockall
+	fadescreen 1
+	drawcontestwinner 0
+	lockall
+	msgbox LilycoveCity_ContestLobby_Text_21AE78, 5
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A2E4
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA
+	msgbox LilycoveCity_ContestLobby_Text_21AF63, 4
+	closemessage
+	special sub_80F88DC
+	setvar VAR_0x4099, 0
+	specialvar VAR_RESULT, sub_80F8C7C
+	compare VAR_RESULT, 1
+	call_if 1, LilycoveCity_ContestLobby_EventScript_21A314
+	applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F
+	waitmovement 0
+	removeobject 4
+	call LilycoveCity_ContestLobby_EventScript_21A360
+	call LilycoveCity_ContestLobby_EventScript_21A3B6
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4
+	msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA
+	msgbox LilycoveCity_ContestLobby_Text_21B132, 4
+	closemessage
+	applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F
+	waitmovement 0
+	setvar VAR_0x4099, 0
+	removeobject 4
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314
+	incrementgamestat 42
+	special sub_80F8390
+	applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A
+	waitmovement 0
+	playse SE_PIN
+	applymovement 4, LilycoveCity_ContestLobby_Movement_272598
+	waitmovement 0
+	applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_21B030, 4
+	playfanfare MUS_FANFA4
+	msgbox LilycoveCity_ContestLobby_Text_21B07E, 4
+	waitfanfare
+	msgbox LilycoveCity_ContestLobby_Text_21B094, 4
+	msgbox LilycoveCity_ContestLobby_Text_21B0AD, 4
+	closemessage
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A360:: @ 821A360
+	specialvar VAR_0x8004, sub_80F8940
+	switch VAR_0x8004
+	case 1, LilycoveCity_ContestLobby_EventScript_21A3A2
+	case 2, LilycoveCity_ContestLobby_EventScript_21A3A6
+	case 3, LilycoveCity_ContestLobby_EventScript_21A3AA
+	case 4, LilycoveCity_ContestLobby_EventScript_21A3AE
+	case 5, LilycoveCity_ContestLobby_EventScript_21A3B2
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A3A2:: @ 821A3A2
+	clearflag FLAG_0x308
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A3A6:: @ 821A3A6
+	clearflag FLAG_0x309
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A3AA:: @ 821A3AA
+	clearflag FLAG_0x30A
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A3AE:: @ 821A3AE
+	clearflag FLAG_0x30B
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A3B2:: @ 821A3B2
+	clearflag FLAG_0x30C
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A3B6:: @ 821A3B6
+	switch VAR_CONTEST_CATEGORY
+	case 0, LilycoveCity_ContestLobby_EventScript_21A3F3
+	case 1, LilycoveCity_ContestLobby_EventScript_21A3F7
+	case 2, LilycoveCity_ContestLobby_EventScript_21A3FB
+	case 3, LilycoveCity_ContestLobby_EventScript_21A3FF
+	case 4, LilycoveCity_ContestLobby_EventScript_21A403
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A3F3:: @ 821A3F3
+	setflag FLAG_0x0A0
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A3F7:: @ 821A3F7
+	setflag FLAG_0x0A1
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A3FB:: @ 821A3FB
+	setflag FLAG_0x0A2
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A3FF:: @ 821A3FF
+	setflag FLAG_0x0A3
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A403:: @ 821A403
+	setflag FLAG_0x0A4
+	return
+
+LilycoveCity_ContestLobby_Movement_21A407: @ 821A407
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21A418: @ 821A418
+	walk_in_place_fastest_left
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21A41A: @ 821A41A
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_in_place_fastest_right
+	step_end
+
+LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427
+	checkflag FLAG_0x307
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A436
+	setvar VAR_0x4099, 0
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436
+	lockall
+	addobject 11
+	applymovement 11, LilycoveCity_ContestLobby_Movement_21A533
+	waitmovement 11
+	applymovement 255, LilycoveCity_ContestLobby_Movement_21A545
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_21ADB9, 4
+	lockall
+	fadescreen 1
+	drawcontestwinner 0
+	msgbox LilycoveCity_ContestLobby_Text_21AE78, 5
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A47A
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A4B4
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A
+	msgbox LilycoveCity_ContestLobby_Text_21AF63, 4
+	closemessage
+	special sub_80F88DC
+	setvar VAR_0x4099, 0
+	specialvar VAR_RESULT, sub_80F8C7C
+	compare VAR_RESULT, 1
+	call_if 1, LilycoveCity_ContestLobby_EventScript_21A4E4
+	applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C
+	waitmovement 0
+	removeobject 11
+	call LilycoveCity_ContestLobby_EventScript_21A360
+	call LilycoveCity_ContestLobby_EventScript_21A3B6
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4
+	msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A47A
+	msgbox LilycoveCity_ContestLobby_Text_21B132, 4
+	closemessage
+	applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C
+	waitmovement 0
+	setvar VAR_0x4099, 0
+	removeobject 11
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4
+	incrementgamestat 42
+	setflag FLAG_SYS_RIBBON_GET
+	special sub_80F8390
+	applymovement 11, LilycoveCity_ContestLobby_Movement_21A547
+	waitmovement 0
+	playse SE_PIN
+	applymovement 11, LilycoveCity_ContestLobby_Movement_272598
+	waitmovement 0
+	applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_21B030, 4
+	playfanfare MUS_FANFA4
+	msgbox LilycoveCity_ContestLobby_Text_21B07E, 4
+	waitfanfare
+	msgbox LilycoveCity_ContestLobby_Text_21B094, 4
+	msgbox LilycoveCity_ContestLobby_Text_21B0AD, 4
+	closemessage
+	return
+
+LilycoveCity_ContestLobby_Movement_21A533: @ 821A533
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21A545: @ 821A545
+	walk_in_place_fastest_right
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21A547: @ 821A547
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_in_place_fastest_left
+	step_end
+
+LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554
+	special sub_80F9154
+	specialvar VAR_RESULT, sub_80F8D24
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A5CF
+	call LilycoveCity_ContestLobby_EventScript_279CC5
+	call LilycoveCity_ContestLobby_EventScript_21A670
+	special sub_80F87D8
+	call LilycoveCity_ContestLobby_EventScript_23BEB6
+	call LilycoveCity_ContestLobby_EventScript_21A585
+	call LilycoveCity_ContestLobby_EventScript_21A5EF
+	waitstate
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A585:: @ 821A585
+	switch VAR_CONTEST_RANK
+	case 0, LilycoveCity_ContestLobby_EventScript_21A5B7
+	case 1, LilycoveCity_ContestLobby_EventScript_21A5BD
+	case 2, LilycoveCity_ContestLobby_EventScript_21A5C3
+	case 3, LilycoveCity_ContestLobby_EventScript_21A5C9
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A5B7:: @ 821A5B7
+	setvar VAR_0x4088, 1
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A5BD:: @ 821A5BD
+	setvar VAR_0x4088, 2
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A5C3:: @ 821A5C3
+	setvar VAR_0x4088, 3
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9
+	setvar VAR_0x4088, 4
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF
+	setflag FLAG_0x307
+	copyvar VAR_0x4094, 0x1
+	giveitem ITEM_CONTEST_PASS, 1
+	setvar VAR_0x800B, 8
+	setvar VAR_CONTEST_RANK, 3
+	setvar VAR_0x4099, 1
+	setflag FLAG_SYS_RIBBON_GET
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A5EF:: @ 821A5EF
+	setflag FLAG_0x155
+	switch VAR_CONTEST_CATEGORY
+	case 0, LilycoveCity_ContestLobby_EventScript_21A62F
+	case 1, LilycoveCity_ContestLobby_EventScript_21A63C
+	case 2, LilycoveCity_ContestLobby_EventScript_21A649
+	case 3, LilycoveCity_ContestLobby_EventScript_21A656
+	case 4, LilycoveCity_ContestLobby_EventScript_21A663
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A62F:: @ 821A62F
+	setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5
+	special sub_80AFC60
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A63C:: @ 821A63C
+	setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5
+	special sub_80AFC60
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A649:: @ 821A649
+	setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5
+	special sub_80AFC60
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A656:: @ 821A656
+	setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5
+	special sub_80AFC60
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A663:: @ 821A663
+	setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5
+	special sub_80AFC60
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670
+	lockall
+	applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F5
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 12, 2, 545, 1
+	setmetatile 12, 3, 609, 1
+	special DrawWholeMapView
+	applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F9
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 12, 2, 721, 1
+	setmetatile 12, 3, 729, 1
+	special DrawWholeMapView
+	delay 20
+	applymovement 1, LilycoveCity_ContestLobby_Movement_21A706
+	waitmovement 0
+	applymovement 255, LilycoveCity_ContestLobby_Movement_21A6F2
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_27B653, 4
+	closemessage
+	applymovement 1, LilycoveCity_ContestLobby_Movement_21A6FD
+	applymovement 255, LilycoveCity_ContestLobby_Movement_21A6E8
+	waitmovement 0
+	releaseall
+	return
+
+LilycoveCity_ContestLobby_Movement_21A6E8: @ 821A6E8
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21A6F2: @ 821A6F2
+	walk_in_place_fastest_left
+	walk_left
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21A6F5: @ 821A6F5
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21A6F9: @ 821A6F9
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21A706: @ 821A706
+	walk_in_place_fastest_right
+	step_end
+
+LilycoveCity_ContestLobby_EventScript_21A708:: @ 821A708
+	msgbox LilycoveCity_ContestLobby_Text_21B1B1, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A711:: @ 821A711
+	msgbox LilycoveCity_ContestLobby_Text_21B24D, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A71A:: @ 821A71A
+	msgbox LilycoveCity_ContestLobby_Text_21B2BA, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A723:: @ 821A723
+	msgbox LilycoveCity_ContestLobby_Text_21B334, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A72C:: @ 821A72C
+	msgbox LilycoveCity_ContestLobby_Text_21B392, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A735:: @ 821A735
+	msgbox LilycoveCity_ContestLobby_Text_21B3FC, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A73E:: @ 821A73E
+	lockall
+	fadescreen 1
+	drawcontestwinner 1
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A745:: @ 821A745
+	lockall
+	fadescreen 1
+	drawcontestwinner 2
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A74C:: @ 821A74C
+	lockall
+	fadescreen 1
+	drawcontestwinner 3
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A753:: @ 821A753
+	lockall
+	fadescreen 1
+	drawcontestwinner 4
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A75A:: @ 821A75A
+	lockall
+	fadescreen 1
+	drawcontestwinner 5
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A761:: @ 821A761
+	lockall
+	fadescreen 1
+	drawcontestwinner 6
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A768:: @ 821A768
+	msgbox LilycoveCity_ContestLobby_Text_2931AA, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A771:: @ 821A771
+	msgbox LilycoveCity_ContestLobby_Text_2931C6, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A
+	lockall
+	special ShowBerryBlenderRecordWindow
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784
+	lockall
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 7
+	special sub_81A1780
+	waitbuttonpress
+	special RemoveRecordsWindow
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A798:: @ 821A798
+	lock
+	faceplayer
+	msgbox LilycoveCity_ContestLobby_Text_2C427C, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A7F9
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A7A8:: @ 821A7A8
+	lock
+	msgbox LilycoveCity_ContestLobby_Text_2C464B, 4
+	release
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A7B3:: @ 821A7B3
+	lock
+	msgbox LilycoveCity_ContestLobby_Text_2C465A, 4
+	release
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A7BE:: @ 821A7BE
+	lock
+	msgbox LilycoveCity_ContestLobby_Text_2C4669, 4
+	release
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A7C9:: @ 821A7C9
+	lock
+	faceplayer
+	msgbox LilycoveCity_ContestLobby_Text_2C4679, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A7F9
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A7D9:: @ 821A7D9
+	lock
+	faceplayer
+	msgbox LilycoveCity_ContestLobby_Text_2C46B1, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A7F9
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9
+	lock
+	faceplayer
+	msgbox LilycoveCity_ContestLobby_Text_2C4763, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A7F9
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9
+	closemessage
+	applymovement VAR_LAST_TALKED, LilycoveCity_ContestLobby_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A806:: @ 821A806
+	special sub_80F9154
+	lock
+	faceplayer
+	msgbox LilycoveCity_ContestLobby_Text_27C063, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A819
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819
+	message LilycoveCity_ContestLobby_Text_27C0F6
+	waitmessage
+	multichoice 0, 0, 2, 0
+	switch VAR_RESULT
+	case 0, LilycoveCity_ContestLobby_EventScript_21A856
+	case 1, LilycoveCity_ContestLobby_EventScript_21A90D
+	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
+	case 127, LilycoveCity_ContestLobby_EventScript_21A97F
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856
+	msgbox LilycoveCity_ContestLobby_Text_27BD17, 5
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A97F
+	call LilycoveCity_ContestLobby_EventScript_27134F
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A97F
+	message LilycoveCity_ContestLobby_Text_27C8FD
+	waitmessage
+	specialvar VAR_TEMP_D, sub_80093CC
+	multichoice 0, 0, 85, 0
+	switch VAR_RESULT
+	case 0, LilycoveCity_ContestLobby_EventScript_21A8BB
+	case 1, LilycoveCity_ContestLobby_EventScript_21A8C6
+	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
+	case 127, LilycoveCity_ContestLobby_EventScript_21A97F
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A8BB:: @ 821A8BB
+	setvar VAR_TEMP_C, 0
+	goto LilycoveCity_ContestLobby_EventScript_21A8DC
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A8C6:: @ 821A8C6
+	setvar VAR_TEMP_C, 1
+	compare VAR_TEMP_D, 1
+	goto_eq LilycoveCity_ContestLobby_EventScript_21AAFC
+	goto LilycoveCity_ContestLobby_EventScript_21A8DC
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A8DC:: @ 821A8DC
+	message LilycoveCity_ContestLobby_Text_27C119
+	waitmessage
+	multichoice 0, 0, 4, 0
+	switch VAR_RESULT
+	case 5, LilycoveCity_ContestLobby_EventScript_21A97F
+	case 127, LilycoveCity_ContestLobby_EventScript_21A97F
+	copyvar VAR_CONTEST_CATEGORY, VAR_RESULT
+	goto LilycoveCity_ContestLobby_EventScript_21A98C
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A90D:: @ 821A90D
+	message LilycoveCity_ContestLobby_Text_27C0DA
+	waitmessage
+	multichoice 0, 0, 84, 0
+	switch VAR_RESULT
+	case 0, LilycoveCity_ContestLobby_EventScript_21A955
+	case 1, LilycoveCity_ContestLobby_EventScript_21A963
+	case 2, LilycoveCity_ContestLobby_EventScript_21A971
+	case 3, LilycoveCity_ContestLobby_EventScript_21A819
+	case 127, LilycoveCity_ContestLobby_EventScript_21A819
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A955:: @ 821A955
+	msgbox LilycoveCity_ContestLobby_Text_27C340, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A90D
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A963:: @ 821A963
+	msgbox LilycoveCity_ContestLobby_Text_27C5B1, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A90D
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A971:: @ 821A971
+	msgbox LilycoveCity_ContestLobby_Text_27C742, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A90D
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A97F:: @ 821A97F
+	special CloseLink
+	msgbox LilycoveCity_ContestLobby_Text_27BD4F, 4
+	release
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C
+	msgbox LilycoveCity_ContestLobby_Text_27C1C3, 4
+	setvar VAR_CONTEST_RANK, 0
+	choosecontestmon
+	compare VAR_0x8004, 255
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A97F
+	special sub_80F7F30
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A9E0
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A
+	compare VAR_RESULT, 2
+	goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A
+	compare VAR_RESULT, 3
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A9EE
+	compare VAR_RESULT, 4
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A9FC
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A9E0:: @ 821A9E0
+	msgbox LilycoveCity_ContestLobby_Text_27B471, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A98C
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A9EE:: @ 821A9EE
+	msgbox LilycoveCity_ContestLobby_Text_27C186, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A98C
+	end
+
+LilycoveCity_ContestLobby_EventScript_21A9FC:: @ 821A9FC
+	msgbox LilycoveCity_ContestLobby_Text_27C140, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A98C
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AA0A:: @ 821AA0A
+	copyvar VAR_0x8008, VAR_0x8004
+	goto LilycoveCity_ContestLobby_EventScript_21AA15
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15
+	compare VAR_TEMP_D, 1
+	goto_eq LilycoveCity_ContestLobby_EventScript_21AB4B
+	compare VAR_TEMP_D, 2
+	goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F
+	message LilycoveCity_ContestLobby_Text_27BF85
+	waitmessage
+	copyvar VAR_0x8004, VAR_RESULT
+	compare VAR_TEMP_C, 0
+	call_if 1, LilycoveCity_ContestLobby_EventScript_21AABB
+	compare VAR_TEMP_C, 1
+	call_if 1, LilycoveCity_ContestLobby_EventScript_21AAC0
+	compare VAR_TEMP_C, 2
+	goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F
+	compare VAR_RESULT, 4
+	goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3
+	compare VAR_RESULT, 3
+	goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3
+	compare VAR_RESULT, 5
+	goto_eq LilycoveCity_ContestLobby_EventScript_21A97F
+	compare VAR_RESULT, 6
+	goto_eq LilycoveCity_ContestLobby_EventScript_21AAEF
+	compare VAR_RESULT, 10
+	goto_eq LilycoveCity_ContestLobby_EventScript_21AAE1
+	message3 LilycoveCity_ContestLobby_Text_27BEEC
+	contestlinktransfer
+	switch VAR_0x8004
+	case 0, LilycoveCity_ContestLobby_EventScript_21AB17
+	case 1, LilycoveCity_ContestLobby_EventScript_21AAC5
+	case 2, LilycoveCity_ContestLobby_EventScript_21AB09
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AABB:: @ 821AABB
+	special sub_80B3028
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_21AAC0:: @ 821AAC0
+	special sub_80B3000
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_21AAC5:: @ 821AAC5
+	msgbox LilycoveCity_ContestLobby_Text_27BF0E, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A97F
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AAD3:: @ 821AAD3
+	msgbox LilycoveCity_ContestLobby_Text_27BF4B, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A97F
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1
+	msgbox LilycoveCity_ContestLobby_Text_27C254, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A97F
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF
+	special CloseLink
+	msgbox LilycoveCity_ContestLobby_Text_27821C, 4
+	release
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AAFC:: @ 821AAFC
+	special CloseLink
+	msgbox LilycoveCity_ContestLobby_Text_27C879, 4
+	release
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AB09:: @ 821AB09
+	msgbox LilycoveCity_ContestLobby_Text_27BEFA, 4
+	goto LilycoveCity_ContestLobby_EventScript_21A97F
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17
+	special sub_80F84B0
+	addvar VAR_0x8004, 1
+	buffernumberstring 1, VAR_0x8004
+	messageautoscroll LilycoveCity_ContestLobby_Text_27BFF8
+	waitmessage
+	subvar VAR_0x8004, 1
+	call LilycoveCity_ContestLobby_EventScript_21AC49
+	setvar VAR_0x4086, 1
+	special sub_80F8AFC
+	setvar VAR_0x4088, 5
+	setvar VAR_CONTEST_RANK, 3
+	call LilycoveCity_ContestLobby_EventScript_21A5EF
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AB4B:: @ 821AB4B
+	compare VAR_CONTEST_CATEGORY, 0
+	call_if 1, LilycoveCity_ContestLobby_EventScript_21AB88
+	compare VAR_CONTEST_CATEGORY, 1
+	call_if 1, LilycoveCity_ContestLobby_EventScript_21AB8E
+	compare VAR_CONTEST_CATEGORY, 2
+	call_if 1, LilycoveCity_ContestLobby_EventScript_21AB94
+	compare VAR_CONTEST_CATEGORY, 3
+	call_if 1, LilycoveCity_ContestLobby_EventScript_21AB9A
+	compare VAR_CONTEST_CATEGORY, 4
+	call_if 1, LilycoveCity_ContestLobby_EventScript_21ABA0
+	goto LilycoveCity_ContestLobby_EventScript_21ABA6
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AB88:: @ 821AB88
+	setvar VAR_0x8004, 15
+	return
+
+LilycoveCity_ContestLobby_EventScript_21AB8E:: @ 821AB8E
+	setvar VAR_0x8004, 16
+	return
+
+LilycoveCity_ContestLobby_EventScript_21AB94:: @ 821AB94
+	setvar VAR_0x8004, 17
+	return
+
+LilycoveCity_ContestLobby_EventScript_21AB9A:: @ 821AB9A
+	setvar VAR_0x8004, 18
+	return
+
+LilycoveCity_ContestLobby_EventScript_21ABA0:: @ 821ABA0
+	setvar VAR_0x8004, 19
+	return
+
+LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6
+	message LilycoveCity_ContestLobby_Text_27C1EA
+	waitmessage
+	multichoice 16, 6, 81, 0
+	switch VAR_RESULT
+	case 0, LilycoveCity_ContestLobby_EventScript_21AC0B
+	case 1, LilycoveCity_ContestLobby_EventScript_21ABE3
+	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
+	case 127, LilycoveCity_ContestLobby_EventScript_21A97F
+	end
+
+LilycoveCity_ContestLobby_EventScript_21ABE3:: @ 821ABE3
+	call LilycoveCity_ContestLobby_EventScript_21AC33
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D
+	compare VAR_RESULT, 5
+	goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6
+	compare VAR_RESULT, 8
+	goto_eq LilycoveCity_ContestLobby_EventScript_21ABE3
+	release
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B
+	call LilycoveCity_ContestLobby_EventScript_21AC38
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D
+	compare VAR_RESULT, 5
+	goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6
+	compare VAR_RESULT, 8
+	goto_eq LilycoveCity_ContestLobby_EventScript_21AC0B
+	release
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AC33:: @ 821AC33
+	special BerryBlenderLinkBecomeLeader
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_21AC38:: @ 821AC38
+	special BerryBlenderLinkJoinGroup
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_21AC3D:: @ 821AC3D
+	message3 LilycoveCity_ContestLobby_Text_27BEEC
+	contestlinktransfer
+	goto LilycoveCity_ContestLobby_EventScript_21AB17
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49
+	messageautoscroll LilycoveCity_ContestLobby_Text_27C043
+	waitmessage
+	delay 20
+	closemessage
+	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACDD
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 17, 2, 545, 1
+	setmetatile 17, 3, 609, 1
+	special DrawWholeMapView
+	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE1
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 17, 2, 721, 1
+	setmetatile 17, 3, 729, 1
+	special DrawWholeMapView
+	delay 20
+	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACEF
+	waitmovement 0
+	applymovement 255, LilycoveCity_ContestLobby_Movement_21ACDB
+	waitmovement 0
+	messageautoscroll LilycoveCity_ContestLobby_Text_27B653
+	waitmessage
+	delay 20
+	closemessage
+	call LilycoveCity_ContestLobby_EventScript_27AD92
+	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE5
+	applymovement 255, LilycoveCity_ContestLobby_Movement_21ACD0
+	waitmovement 0
+	release
+	return
+
+LilycoveCity_ContestLobby_Movement_21ACD0: @ 821ACD0
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21ACDB: @ 821ACDB
+	walk_right
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21ACDD: @ 821ACDD
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21ACE1: @ 821ACE1
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	step_end
+
+LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF
+	walk_in_place_fastest_left
+	step_end
+
+LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1
+	lock
+	faceplayer
+	checkflag FLAG_0x05F
+	goto_eq LilycoveCity_ContestLobby_EventScript_21AD06
+	msgbox LilycoveCity_ContestLobby_Text_21AD10, 4
+	release
+	end
+
+LilycoveCity_ContestLobby_EventScript_21AD06:: @ 821AD06
+	msgbox LilycoveCity_ContestLobby_Text_21AD55, 4
+	release
+	end
+
+LilycoveCity_ContestLobby_Text_21AD10: @ 821AD10
+	.string "Yippee!\p"
+	.string "The lady at the reception counter\n"
+	.string "gave me a case for {POKEBLOCK}S!$"
+
+LilycoveCity_ContestLobby_Text_21AD55: @ 821AD55
+	.string "Make {POKEBLOCK}S and put them in there.\p"
+	.string "When you make a {POKEBLOCK}, everyone\n"
+	.string "has to put in a different BERRY.$"
+
+LilycoveCity_ContestLobby_Text_21ADB9: @ 821ADB9
+	.string "Congratulations!\p"
+	.string "I did a painting of your POKéMON to\n"
+	.string "commemorate its victory…\p"
+	.string "Well, your POKéMON’s appeals were\n"
+	.string "so fantastic, it spurred me into\l"
+	.string "painting better than I usually do.\l"
+	.string "Look, see?$"
+
+LilycoveCity_ContestLobby_Text_21AE78: @ 821AE78
+	.string "What do you think? I’m confident in\n"
+	.string "what I’ve done, but do you like it?\p"
+	.string "A work of this caliber, it wouldn’t look\n"
+	.string "out of place in an art museum.\p"
+	.string "Huh? An art museum really is looking\n"
+	.string "for paintings?\p"
+	.string "Do you think I should take this there?$"
+
+LilycoveCity_ContestLobby_Text_21AF63: @ 821AF63
+	.string "What, really? Then, sure, I will take\n"
+	.string "this painting there right now.\p"
+	.string "I’ll give it a proper title, too.\p"
+	.string "I hope they’ll like it and consider\n"
+	.string "exhibiting this.\p"
+	.string "Please check if they did accept this.\n"
+	.string "Thank you!$"
+
+LilycoveCity_ContestLobby_Text_21B030: @ 821B030
+	.string "Oh, that’s right!\p"
+	.string "As a memento of me painting your\n"
+	.string "POKéMON, please take this.$"
+
+LilycoveCity_ContestLobby_Text_21B07E: @ 821B07E
+	.string "{PLAYER} received a RIBBON.$"
+
+LilycoveCity_ContestLobby_Text_21B094: @ 821B094
+	.string "{PLAYER} put the RIBBON on\n"
+	.string "{STR_VAR_1}.$"
+
+LilycoveCity_ContestLobby_Text_21B0AD: @ 821B0AD
+	.string "Okay, see you!$"
+
+LilycoveCity_ContestLobby_Text_21B0BC: @ 821B0BC
+	.string "Oh… Then, I guess I’ll just take\n"
+	.string "this home with me…\p"
+	.string "But, you know, I would like to take\n"
+	.string "this to the art museum… Okay?$"
+
+LilycoveCity_ContestLobby_Text_21B132: @ 821B132
+	.string "Oh, fine, that’s the way it is.\n"
+	.string "I will hang this in my own house.\p"
+	.string "I’ll just have to try harder next time.\n"
+	.string "Well, be seeing you.$"
+
+LilycoveCity_ContestLobby_Text_21B1B1: @ 821B1B1
+	.string "Hoo, boy… Master Rank CONTESTS,\n"
+	.string "here I come.\p"
+	.string "The world will know that my dearest\n"
+	.string "POKéMON is the cutest being in all\l"
+	.string "existence. The time has come!\l"
+	.string "Uheheheh.$"
+
+LilycoveCity_ContestLobby_Text_21B24D: @ 821B24D
+	.string "You can see a whole variety of\n"
+	.string "POKéMON here.\p"
+	.string "That’s why I make this place a regular\n"
+	.string "part of my daily stroll.$"
+
+LilycoveCity_ContestLobby_Text_21B2BA: @ 821B2BA
+	.string "Wow, coming out to a CONTEST is\n"
+	.string "a feast for these eyes!\p"
+	.string "Would you look at all the POKéMON\n"
+	.string "that just scream to be painted?$"
+
+LilycoveCity_ContestLobby_Text_21B334: @ 821B334
+	.string "The TOUGHNESS CONTEST is like\n"
+	.string "extreme, man!\p"
+	.string "Those muscular appeals…\n"
+	.string "Cascading sweat… I swoon!$"
+
+LilycoveCity_ContestLobby_Text_21B392: @ 821B392
+	.string "Day in and day out, I lavished my care\n"
+	.string "on this POKéMON.\p"
+	.string "Its condition is peaking.\n"
+	.string "Today, victory is mine!$"
+
+LilycoveCity_ContestLobby_Text_21B3FC: @ 821B3FC
+	.string "I made {POKEBLOCK}S with Mom, Dad, and\n"
+	.string "Big Sister. They turned out great!\p"
+	.string "I bet you can make smoother, better\n"
+	.string "{POKEBLOCK}S if you have more people.$"
+
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc
new file mode 100644
index 000000000..7ccbc4aec
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc
@@ -0,0 +1,14 @@
+LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0
+
+LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C
+	warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY
+	warp_def 6, 8, 0, 1, MAP_LILYCOVE_CITY
+	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F
+
+LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: @ 8531164
+	coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211
+
+LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 8531174
+	map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0
+
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
index 149ff5359..ed380598b 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_CoveLilyMotel_1F: @ 8483638
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes
+	.4byte LilycoveCity_CoveLilyMotel_1F_Layout
 	.4byte LilycoveCity_CoveLilyMotel_1F_MapEvents
 	.4byte LilycoveCity_CoveLilyMotel_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
index 3468299a9..3468299a9 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
new file mode 100644
index 000000000..631eba91b
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
@@ -0,0 +1,15 @@
+LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925
+	object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925
+	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, 9, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925
+	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787
+
+LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230
+	warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F
+
+LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8531238
+	map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
index ade9f1a37..200e1b7bb 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_CoveLilyMotel_2F: @ 8483654
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes
+	.4byte LilycoveCity_CoveLilyMotel_2F_Layout
 	.4byte LilycoveCity_CoveLilyMotel_2F_MapEvents
 	.4byte LilycoveCity_CoveLilyMotel_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
index 90769b550..90769b550 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc
new file mode 100644
index 000000000..bdeda0bd9
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc
@@ -0,0 +1,10 @@
+LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0
+
+LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8
+	warp_def 1, 5, 3, 127, MAP_NONE
+	warp_def 2, 5, 3, 127, MAP_NONE
+
+LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 85324D8
+	map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
index 959699237..b5135b1ff 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_DepartmentStoreElevator: @ 84838A0
-	.4byte LilycoveCity_DepartmentStoreElevator_MapAttributes
+	.4byte LilycoveCity_DepartmentStoreElevator_Layout
 	.4byte LilycoveCity_DepartmentStoreElevator_MapEvents
 	.4byte LilycoveCity_DepartmentStoreElevator_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
new file mode 100644
index 000000000..234751910
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
@@ -0,0 +1,129 @@
+LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 8220623
+	.byte 0
+
+LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624
+	lock
+	faceplayer
+	setvar VAR_0x8004, 0
+	checkflag FLAG_0x002
+	call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC
+	copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR
+	special sub_8139B60
+	message gUnknown_08272C1D
+	waitmessage
+	setvar VAR_0x8004, 0
+	specialvar VAR_RESULT, sub_81399F4
+	switch VAR_RESULT
+	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_220689
+	case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220695
+	case 2, LilycoveCity_DepartmentStoreElevator_EventScript_2206A1
+	case 3, LilycoveCity_DepartmentStoreElevator_EventScript_2206AD
+	case 4, LilycoveCity_DepartmentStoreElevator_EventScript_2206B9
+	end
+
+LilycoveCity_DepartmentStoreElevator_EventScript_220689:: @ 8220689
+	multichoicedefault 0, 0, 57, 0, 0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	end
+
+LilycoveCity_DepartmentStoreElevator_EventScript_220695:: @ 8220695
+	multichoicedefault 0, 0, 57, 1, 0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	end
+
+LilycoveCity_DepartmentStoreElevator_EventScript_2206A1:: @ 82206A1
+	multichoicedefault 0, 0, 57, 2, 0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	end
+
+LilycoveCity_DepartmentStoreElevator_EventScript_2206AD:: @ 82206AD
+	multichoicedefault 0, 0, 57, 3, 0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	end
+
+LilycoveCity_DepartmentStoreElevator_EventScript_2206B9:: @ 82206B9
+	multichoicedefault 0, 0, 57, 4, 0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	end
+
+LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5
+	switch VAR_RESULT
+	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207B8
+	case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220790
+	case 2, LilycoveCity_DepartmentStoreElevator_EventScript_220768
+	case 3, LilycoveCity_DepartmentStoreElevator_EventScript_220740
+	case 4, LilycoveCity_DepartmentStoreElevator_EventScript_220718
+	case 5, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	case 127, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	end
+
+LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718
+	setvar VAR_0x8006, 4
+	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1
+	compare VAR_DEPT_STORE_FLOOR, 4
+	goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	setvar VAR_DEPT_STORE_FLOOR, 4
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	end
+
+LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740
+	setvar VAR_0x8006, 5
+	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1
+	compare VAR_DEPT_STORE_FLOOR, 5
+	goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	setvar VAR_DEPT_STORE_FLOOR, 5
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	end
+
+LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768
+	setvar VAR_0x8006, 6
+	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1
+	compare VAR_DEPT_STORE_FLOOR, 6
+	goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	setvar VAR_DEPT_STORE_FLOOR, 6
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	end
+
+LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790
+	setvar VAR_0x8006, 7
+	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1
+	compare VAR_DEPT_STORE_FLOOR, 7
+	goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	setvar VAR_DEPT_STORE_FLOOR, 7
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	end
+
+LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8
+	setvar VAR_0x8006, 8
+	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1
+	compare VAR_DEPT_STORE_FLOOR, 8
+	goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	setvar VAR_DEPT_STORE_FLOOR, 8
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	end
+
+LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0
+	special sub_8139C10
+	release
+	end
+
+LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
+	special sub_8139C10
+	closemessage
+	applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA
+	waitmovement 0
+	waitse
+	special sub_8139A78
+	waitstate
+	setflag FLAG_0x002
+	return
+
+LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC
+	special sub_8139994
+	return
+
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
new file mode 100644
index 000000000..aca7598ec
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
@@ -0,0 +1,16 @@
+LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0
+	object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0
+
+LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C
+	warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F
+
+LilycoveCity_DepartmentStoreRooftop_MapBGEvents: @ 8532484
+	bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295
+	bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295
+
+LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 853249C
+	map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents
+
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
index 3cf0cac45..3a96f4c3b 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_DepartmentStoreRooftop: @ 8483884
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes
+	.4byte LilycoveCity_DepartmentStoreRooftop_Layout
 	.4byte LilycoveCity_DepartmentStoreRooftop_MapEvents
 	.4byte LilycoveCity_DepartmentStoreRooftop_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index da97bbf81..da97bbf81 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
new file mode 100644
index 000000000..17a6db615
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
@@ -0,0 +1,20 @@
+LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0
+	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0
+	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, 1, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0
+
+LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C
+	warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY
+	warp_def 9, 7, 0, 0, MAP_LILYCOVE_CITY
+	warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F
+	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+
+LilycoveCity_DepartmentStore_1F_MapBGEvents: @ 853213C
+	bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F85D
+
+LilycoveCity_DepartmentStore_1F_MapEvents:: @ 8532148
+	map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
index 140fe3568..2ad060976 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_DepartmentStore_1F: @ 84837F8
-	.4byte LilycoveCity_DepartmentStore_1F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_1F_Layout
 	.4byte LilycoveCity_DepartmentStore_1F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
index 8de2d5d6f..8de2d5d6f 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
new file mode 100644
index 000000000..1747ece5a
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C
+	object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0
+
+LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4
+	warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F
+	warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F
+	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+
+LilycoveCity_DepartmentStore_2F_MapEvents:: @ 85321EC
+	map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
index 7d28c44b6..e4ebc314a 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_DepartmentStore_2F: @ 8483814
-	.4byte LilycoveCity_DepartmentStore_2F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_2F_Layout
 	.4byte LilycoveCity_DepartmentStore_2F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
index 8bc6d8b29..8bc6d8b29 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
new file mode 100644
index 000000000..93ef37b4b
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200
+	object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0
+
+LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278
+	warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F
+	warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F
+	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+
+LilycoveCity_DepartmentStore_3F_MapEvents:: @ 8532290
+	map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
index 2f94cc924..bb8cd73f7 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_DepartmentStore_3F: @ 8483830
-	.4byte LilycoveCity_DepartmentStore_3F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_3F_Layout
 	.4byte LilycoveCity_DepartmentStore_3F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_3F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
index 1d980f83e..1d980f83e 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
new file mode 100644
index 000000000..5e6d0d94a
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0
+
+LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C
+	warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F
+	warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F
+	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+
+LilycoveCity_DepartmentStore_4F_MapEvents:: @ 8532334
+	map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
index 8318c0edc..9bc54b809 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_DepartmentStore_4F: @ 848384C
-	.4byte LilycoveCity_DepartmentStore_4F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_4F_Layout
 	.4byte LilycoveCity_DepartmentStore_4F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_4F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
index b162c4740..b162c4740 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
new file mode 100644
index 000000000..f2b9b130a
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
@@ -0,0 +1,17 @@
+LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, 17, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, 10, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0
+
+LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0
+	warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F
+	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+	warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP
+
+LilycoveCity_DepartmentStore_5F_MapEvents:: @ 8532408
+	map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
index da0c4a399..cf1448ab8 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_DepartmentStore_5F: @ 8483868
-	.4byte LilycoveCity_DepartmentStore_5F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_5F_Layout
 	.4byte LilycoveCity_DepartmentStore_5F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_5F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
index d5f5e49ad..d5f5e49ad 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc
new file mode 100644
index 000000000..73d21e9ce
--- /dev/null
+++ b/data/maps/LilycoveCity_Harbor/events.inc
@@ -0,0 +1,14 @@
+LilycoveCity_Harbor_EventObjects: @ 8531E1C
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 861
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, 2, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0
+	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, 909
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 10, 3, 8, 1, 1, 0, 0, 0x0, 748
+
+LilycoveCity_Harbor_MapWarps: @ 8531E94
+	warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY
+	warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY
+
+LilycoveCity_Harbor_MapEvents:: @ 8531EA4
+	map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc
index 1d8faa5d4..abaf3ad3f 100644
--- a/data/maps/LilycoveCity_Harbor/header.inc
+++ b/data/maps/LilycoveCity_Harbor/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_Harbor: @ 8483750
-	.4byte LilycoveCity_Harbor_MapAttributes
+	.4byte Harbor_Layout
 	.4byte LilycoveCity_Harbor_MapEvents
 	.4byte LilycoveCity_Harbor_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc
new file mode 100644
index 000000000..1dfd9c29a
--- /dev/null
+++ b/data/maps/LilycoveCity_Harbor/scripts.inc
@@ -0,0 +1,630 @@
+LilycoveCity_Harbor_MapScripts:: @ 821E000
+	map_script 3, LilycoveCity_Harbor_MapScript1_21E006
+	.byte 0
+
+LilycoveCity_Harbor_MapScript1_21E006: @ 821E006
+	setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33
+	end
+
+LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F
+	lock
+	faceplayer
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_if 0, LilycoveCity_Harbor_EventScript_21E54D
+	call LilycoveCity_Harbor_EventScript_21E194
+	call LilycoveCity_Harbor_EventScript_21E1C6
+	call LilycoveCity_Harbor_EventScript_21E1F8
+	call LilycoveCity_Harbor_EventScript_21E22A
+	call LilycoveCity_Harbor_EventScript_21E25C
+	call LilycoveCity_Harbor_EventScript_21E2A6
+	compare VAR_TEMP_C, 2
+	goto_eq LilycoveCity_Harbor_EventScript_21E350
+	compare VAR_TEMP_B, 1
+	goto_eq LilycoveCity_Harbor_EventScript_21E2F0
+	compare VAR_TEMP_B, 2
+	goto_eq LilycoveCity_Harbor_EventScript_21E320
+	compare VAR_TEMP_B, 4
+	goto_eq LilycoveCity_Harbor_EventScript_21E350
+	compare VAR_TEMP_B, 8
+	goto_eq LilycoveCity_Harbor_EventScript_21E41D
+	compare VAR_TEMP_B, 0
+	goto_if 5, LilycoveCity_Harbor_EventScript_21E44D
+	goto LilycoveCity_Harbor_EventScript_21E080
+	end
+
+LilycoveCity_Harbor_EventScript_21E080:: @ 821E080
+	compare VAR_TEMP_A, 0
+	goto_eq LilycoveCity_Harbor_EventScript_21E557
+	msgbox LilycoveCity_Harbor_Text_21E758, 4
+	message LilycoveCity_Harbor_Text_21E7ED
+	waitmessage
+	goto LilycoveCity_Harbor_EventScript_21E09F
+	end
+
+LilycoveCity_Harbor_EventScript_21E09F:: @ 821E09F
+	setvar VAR_0x8004, 0
+	special sub_80E2548
+	waitstate
+	special sub_80E2878
+	switch VAR_RESULT
+	case 0, LilycoveCity_Harbor_EventScript_21E149
+	case 1, LilycoveCity_Harbor_EventScript_21E171
+	case 2, LilycoveCity_Harbor_EventScript_21E109
+	case 3, LilycoveCity_Harbor_EventScript_21E119
+	case 4, LilycoveCity_Harbor_EventScript_21E129
+	case 5, LilycoveCity_Harbor_EventScript_21E139
+	case 6, LilycoveCity_Harbor_EventScript_21E626
+	case 127, LilycoveCity_Harbor_EventScript_21E626
+	end
+
+LilycoveCity_Harbor_EventScript_21E109:: @ 821E109
+	call LilycoveCity_Harbor_EventScript_21E5CC
+	warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E119:: @ 821E119
+	call LilycoveCity_Harbor_EventScript_21E5CC
+	warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E129:: @ 821E129
+	call LilycoveCity_Harbor_EventScript_21E5CC
+	warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E139:: @ 821E139
+	call LilycoveCity_Harbor_EventScript_21E5CC
+	warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E149:: @ 821E149
+	msgbox LilycoveCity_Harbor_Text_21E864, 5
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_Harbor_EventScript_21E5C0
+	setvar VAR_PORTHOLE, 5
+	call LilycoveCity_Harbor_EventScript_21E5CC
+	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E171:: @ 821E171
+	msgbox LilycoveCity_Harbor_Text_21E880, 5
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_Harbor_EventScript_21E5C0
+	call LilycoveCity_Harbor_EventScript_21E5CC
+	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E194:: @ 821E194
+	setvar VAR_TEMP_E, 0
+	checkflag FLAG_SYS_HAS_EON_TICKET
+	goto_if 0, LilycoveCity_Harbor_EventScript_27374E
+	checkitem ITEM_EON_TICKET, 1
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_Harbor_EventScript_27374E
+	setvar VAR_TEMP_E, 1
+	checkflag FLAG_0x1AE
+	goto_eq LilycoveCity_Harbor_EventScript_27374E
+	setvar VAR_TEMP_E, 2
+	return
+
+LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6
+	setvar VAR_TEMP_D, 0
+	checkflag FLAG_0x8D5
+	goto_if 0, LilycoveCity_Harbor_EventScript_27374E
+	checkitem ITEM_AURORA_TICKET, 1
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_Harbor_EventScript_27374E
+	setvar VAR_TEMP_D, 1
+	checkflag FLAG_0x1AF
+	goto_eq LilycoveCity_Harbor_EventScript_27374E
+	setvar VAR_TEMP_D, 2
+	return
+
+LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8
+	setvar VAR_TEMP_C, 0
+	checkflag FLAG_0x8D6
+	goto_if 0, LilycoveCity_Harbor_EventScript_27374E
+	checkitem ITEM_OLD_SEA_MAP, 1
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_Harbor_EventScript_27374E
+	setvar VAR_TEMP_C, 1
+	checkflag FLAG_0x1B0
+	goto_eq LilycoveCity_Harbor_EventScript_27374E
+	setvar VAR_TEMP_C, 2
+	return
+
+LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A
+	setvar VAR_TEMP_9, 0
+	checkflag FLAG_0x8E0
+	goto_if 0, LilycoveCity_Harbor_EventScript_27374E
+	checkitem ITEM_MYSTIC_TICKET, 1
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_Harbor_EventScript_27374E
+	setvar VAR_TEMP_9, 1
+	checkflag FLAG_0x1DB
+	goto_eq LilycoveCity_Harbor_EventScript_27374E
+	setvar VAR_TEMP_9, 2
+	return
+
+LilycoveCity_Harbor_EventScript_21E25C:: @ 821E25C
+	setvar VAR_TEMP_B, 0
+	compare VAR_TEMP_E, 2
+	call_if 1, LilycoveCity_Harbor_EventScript_21E28E
+	compare VAR_TEMP_D, 2
+	call_if 1, LilycoveCity_Harbor_EventScript_21E294
+	compare VAR_TEMP_C, 2
+	call_if 1, LilycoveCity_Harbor_EventScript_21E29A
+	compare VAR_TEMP_9, 2
+	call_if 1, LilycoveCity_Harbor_EventScript_21E2A0
+	return
+
+LilycoveCity_Harbor_EventScript_21E28E:: @ 821E28E
+	addvar VAR_TEMP_B, 1
+	return
+
+LilycoveCity_Harbor_EventScript_21E294:: @ 821E294
+	addvar VAR_TEMP_B, 2
+	return
+
+LilycoveCity_Harbor_EventScript_21E29A:: @ 821E29A
+	addvar VAR_TEMP_B, 4
+	return
+
+LilycoveCity_Harbor_EventScript_21E2A0:: @ 821E2A0
+	addvar VAR_TEMP_B, 8
+	return
+
+LilycoveCity_Harbor_EventScript_21E2A6:: @ 821E2A6
+	setvar VAR_TEMP_A, 0
+	compare VAR_TEMP_E, 1
+	call_if 1, LilycoveCity_Harbor_EventScript_21E2D8
+	compare VAR_TEMP_D, 1
+	call_if 1, LilycoveCity_Harbor_EventScript_21E2DE
+	compare VAR_TEMP_C, 1
+	call_if 1, LilycoveCity_Harbor_EventScript_21E2E4
+	compare VAR_TEMP_9, 1
+	call_if 1, LilycoveCity_Harbor_EventScript_21E2EA
+	return
+
+LilycoveCity_Harbor_EventScript_21E2D8:: @ 821E2D8
+	addvar VAR_TEMP_A, 1
+	return
+
+LilycoveCity_Harbor_EventScript_21E2DE:: @ 821E2DE
+	addvar VAR_TEMP_A, 2
+	return
+
+LilycoveCity_Harbor_EventScript_21E2E4:: @ 821E2E4
+	addvar VAR_TEMP_A, 4
+	return
+
+LilycoveCity_Harbor_EventScript_21E2EA:: @ 821E2EA
+	addvar VAR_TEMP_A, 8
+	return
+
+LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0
+	setflag FLAG_0x1AE
+	msgbox LilycoveCity_Harbor_Text_2A68D2, 4
+	closemessage
+	call LilycoveCity_Harbor_EventScript_21E4EE
+	msgbox LilycoveCity_Harbor_Text_2A68FC, 4
+	goto LilycoveCity_Harbor_EventScript_21E30F
+	end
+
+LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F
+	closemessage
+	call LilycoveCity_Harbor_EventScript_21E514
+	warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E320:: @ 821E320
+	setflag FLAG_0x1AF
+	msgbox LilycoveCity_Harbor_Text_2A68D2, 4
+	closemessage
+	call LilycoveCity_Harbor_EventScript_21E4EE
+	msgbox LilycoveCity_Harbor_Text_2C6A71, 4
+	goto LilycoveCity_Harbor_EventScript_21E33F
+	end
+
+LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F
+	closemessage
+	call LilycoveCity_Harbor_EventScript_21E514
+	warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E350:: @ 821E350
+	setflag FLAG_0x1B0
+	msgbox LilycoveCity_Harbor_Text_2A6848, 4
+	closemessage
+	call LilycoveCity_Harbor_EventScript_21E4EE
+	msgbox LilycoveCity_Harbor_Text_2C68A5, 4
+	closemessage
+	applymovement 4, LilycoveCity_Harbor_Movement_2725A6
+	waitmovement 0
+	playse SE_PIN
+	applymovement 4, LilycoveCity_Harbor_Movement_272598
+	waitmovement 0
+	applymovement 4, LilycoveCity_Harbor_Movement_27259A
+	waitmovement 0
+	compare VAR_FACING, 2
+	call_if 1, LilycoveCity_Harbor_EventScript_21E656
+	compare VAR_FACING, 4
+	call_if 1, LilycoveCity_Harbor_EventScript_21E661
+	addobject 5
+	compare VAR_FACING, 2
+	call_if 1, LilycoveCity_Harbor_EventScript_21E675
+	compare VAR_FACING, 4
+	call_if 1, LilycoveCity_Harbor_EventScript_21E680
+	msgbox LilycoveCity_Harbor_Text_2C6951, 4
+	compare VAR_FACING, 2
+	call_if 1, LilycoveCity_Harbor_EventScript_21E68B
+	compare VAR_FACING, 4
+	call_if 1, LilycoveCity_Harbor_EventScript_21E696
+	msgbox LilycoveCity_Harbor_Text_2C69AA, 4
+	closemessage
+	compare VAR_FACING, 2
+	call_if 1, LilycoveCity_Harbor_EventScript_21E6A1
+	compare VAR_FACING, 4
+	call_if 1, LilycoveCity_Harbor_EventScript_21E6BA
+	setvar VAR_0x8004, 2
+	call LilycoveCity_Harbor_EventScript_2721E2
+	warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C
+	closemessage
+	call LilycoveCity_Harbor_EventScript_21E514
+	warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D
+	setflag FLAG_0x1DB
+	msgbox LilycoveCity_Harbor_Text_2A68D2, 4
+	closemessage
+	call LilycoveCity_Harbor_EventScript_21E4EE
+	msgbox LilycoveCity_Harbor_Text_2C6A71, 4
+	goto LilycoveCity_Harbor_EventScript_21E43C
+	end
+
+LilycoveCity_Harbor_EventScript_21E43C:: @ 821E43C
+	closemessage
+	call LilycoveCity_Harbor_EventScript_21E514
+	warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D
+	msgbox LilycoveCity_Harbor_Text_2A68D2, 4
+	closemessage
+	call LilycoveCity_Harbor_EventScript_21E4EE
+	message LilycoveCity_Harbor_Text_2C6BD4
+	waitmessage
+	setvar VAR_0x8004, 1
+	special sub_80E2548
+	waitstate
+	special sub_80E2878
+	switch VAR_RESULT
+	case 2, LilycoveCity_Harbor_EventScript_21E30F
+	case 3, LilycoveCity_Harbor_EventScript_21E43C
+	case 4, LilycoveCity_Harbor_EventScript_21E33F
+	case 5, LilycoveCity_Harbor_EventScript_21E40C
+	case 6, LilycoveCity_Harbor_EventScript_21E4B6
+	case 127, LilycoveCity_Harbor_EventScript_21E4B6
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6
+	msgbox LilycoveCity_Harbor_Text_2A6A82, 4
+	closemessage
+	applymovement 4, LilycoveCity_Harbor_Movement_2725A6
+	waitmovement 0
+	delay 30
+	removeobject 4
+	delay 30
+	applymovement 1, LilycoveCity_Harbor_Movement_2725AA
+	waitmovement 0
+	showobjectat 1, MAP_LILYCOVE_CITY_HARBOR
+	delay 30
+	msgbox LilycoveCity_Harbor_Text_21E842, 4
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE
+	applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6
+	waitmovement 0
+	delay 30
+	hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
+	delay 60
+	addobject 4
+	delay 30
+	applymovement 4, LilycoveCity_Harbor_Movement_27259E
+	waitmovement 0
+	return
+
+LilycoveCity_Harbor_EventScript_21E514:: @ 821E514
+	applymovement 4, LilycoveCity_Harbor_Movement_2725A6
+	waitmovement 0
+	delay 30
+	removeobject 4
+	compare VAR_FACING, 2
+	call_if 1, LilycoveCity_Harbor_EventScript_21E61B
+	compare VAR_FACING, 4
+	call_if 1, LilycoveCity_Harbor_EventScript_21E610
+	delay 30
+	hideobjectat 255, MAP_PETALBURG_CITY
+	setvar VAR_0x8004, 2
+	call LilycoveCity_Harbor_EventScript_2721E2
+	return
+
+LilycoveCity_Harbor_EventScript_21E54D:: @ 821E54D
+	msgbox LilycoveCity_Harbor_Text_21E6F1, 4
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E557:: @ 821E557
+	msgbox LilycoveCity_Harbor_Text_21E758, 4
+	message LilycoveCity_Harbor_Text_21E7ED
+	waitmessage
+	goto LilycoveCity_Harbor_EventScript_21E09F
+	end
+
+LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B
+	msgbox LilycoveCity_Harbor_Text_21E792, 4
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E575:: @ 821E575
+	msgbox LilycoveCity_Harbor_Text_21E864, 5
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_Harbor_EventScript_21E5C0
+	setvar VAR_PORTHOLE, 5
+	call LilycoveCity_Harbor_EventScript_21E5CC
+	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D
+	msgbox LilycoveCity_Harbor_Text_21E880, 5
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_Harbor_EventScript_21E5C0
+	call LilycoveCity_Harbor_EventScript_21E5CC
+	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0
+	message LilycoveCity_Harbor_Text_21E8CC
+	waitmessage
+	goto LilycoveCity_Harbor_EventScript_21E09F
+	end
+
+LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC
+	msgbox LilycoveCity_Harbor_Text_21E89D, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6
+	waitmovement 0
+	delay 30
+	hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
+	compare VAR_FACING, 2
+	call_if 1, LilycoveCity_Harbor_EventScript_21E61B
+	compare VAR_FACING, 4
+	call_if 1, LilycoveCity_Harbor_EventScript_21E610
+	delay 30
+	hideobjectat 255, MAP_PETALBURG_CITY
+	setvar VAR_0x8004, 2
+	call LilycoveCity_Harbor_EventScript_2721E2
+	return
+
+LilycoveCity_Harbor_EventScript_21E610:: @ 821E610
+	applymovement 255, LilycoveCity_Harbor_Movement_21E630
+	waitmovement 0
+	return
+
+LilycoveCity_Harbor_EventScript_21E61B:: @ 821E61B
+	applymovement 255, LilycoveCity_Harbor_Movement_21E633
+	waitmovement 0
+	return
+
+LilycoveCity_Harbor_EventScript_21E626:: @ 821E626
+	msgbox LilycoveCity_Harbor_Text_21E842, 4
+	release
+	end
+
+LilycoveCity_Harbor_Movement_21E630: @ 821E630
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+LilycoveCity_Harbor_Movement_21E633: @ 821E633
+	walk_up
+	step_end
+
+LilycoveCity_Harbor_Movement_21E635: @ 821E635
+	walk_up
+	step_end
+
+LilycoveCity_Harbor_EventScript_21E637:: @ 821E637
+	lock
+	faceplayer
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq LilycoveCity_Harbor_EventScript_21E64C
+	msgbox LilycoveCity_Harbor_Text_21E8EE, 4
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E64C:: @ 821E64C
+	msgbox LilycoveCity_Harbor_Text_21E976, 4
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E656:: @ 821E656
+	applymovement 4, LilycoveCity_Harbor_Movement_21E66C
+	waitmovement 0
+	return
+
+LilycoveCity_Harbor_EventScript_21E661:: @ 821E661
+	applymovement 4, LilycoveCity_Harbor_Movement_21E671
+	waitmovement 0
+	return
+
+LilycoveCity_Harbor_Movement_21E66C: @ 821E66C
+	walk_in_place_fastest_right
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
+	step_end
+
+LilycoveCity_Harbor_Movement_21E671: @ 821E671
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
+	step_end
+
+LilycoveCity_Harbor_EventScript_21E675:: @ 821E675
+	applymovement 5, LilycoveCity_Harbor_Movement_2725A4
+	waitmovement 0
+	return
+
+LilycoveCity_Harbor_EventScript_21E680:: @ 821E680
+	applymovement 5, LilycoveCity_Harbor_Movement_2725AA
+	waitmovement 0
+	return
+
+LilycoveCity_Harbor_EventScript_21E68B:: @ 821E68B
+	applymovement 5, LilycoveCity_Harbor_Movement_2725AA
+	waitmovement 0
+	return
+
+LilycoveCity_Harbor_EventScript_21E696:: @ 821E696
+	applymovement 5, LilycoveCity_Harbor_Movement_2725A4
+	waitmovement 0
+	return
+
+LilycoveCity_Harbor_EventScript_21E6A1:: @ 821E6A1
+	applymovement 5, LilycoveCity_Harbor_Movement_21E6D3
+	applymovement 255, LilycoveCity_Harbor_Movement_21E6D7
+	applymovement 4, LilycoveCity_Harbor_Movement_21E6DC
+	waitmovement 0
+	return
+
+LilycoveCity_Harbor_EventScript_21E6BA:: @ 821E6BA
+	applymovement 5, LilycoveCity_Harbor_Movement_21E6D3
+	applymovement 255, LilycoveCity_Harbor_Movement_21E6E4
+	applymovement 4, LilycoveCity_Harbor_Movement_21E6EA
+	waitmovement 0
+	return
+
+LilycoveCity_Harbor_Movement_21E6D3: @ 821E6D3
+	walk_in_place_fastest_up
+	delay_8
+	set_invisible
+	step_end
+
+LilycoveCity_Harbor_Movement_21E6D7: @ 821E6D7
+	delay_16
+	walk_up
+	delay_16
+	set_invisible
+	step_end
+
+LilycoveCity_Harbor_Movement_21E6DC: @ 821E6DC
+	delay_16
+	delay_16
+	delay_16
+	walk_right
+	walk_in_place_fastest_up
+	delay_16
+	set_invisible
+	step_end
+
+LilycoveCity_Harbor_Movement_21E6E4: @ 821E6E4
+	delay_16
+	walk_right
+	walk_in_place_fastest_up
+	delay_16
+	set_invisible
+	step_end
+
+LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA
+	delay_16
+	delay_16
+	delay_16
+	walk_up
+	delay_16
+	set_invisible
+	step_end
+
+LilycoveCity_Harbor_Text_21E6F1: @ 821E6F1
+	.string "I beg your pardon?\n"
+	.string "You’re looking for a ship?\p"
+	.string "I’m sorry, the ferry service isn’t\n"
+	.string "available at present…$"
+
+LilycoveCity_Harbor_Text_21E758: @ 821E758
+	.string "Hello, are you here for the ferry?\n"
+	.string "May I see your TICKET?$"
+
+
+LilycoveCity_Harbor_Text_21E792: @ 821E792
+	.string "{PLAYER} doesn’t have the TICKET…\p"
+	.string "I’m terribly sorry.\p"
+	.string "You must have a TICKET to board\n"
+	.string "the ferry.$"
+
+LilycoveCity_Harbor_Text_21E7ED: @ 821E7ED
+	.string "{PLAYER} flashed the TICKET.\p"
+	.string "Perfect! That’s all you need!\p"
+	.string "And where would you like to go?$"
+
+LilycoveCity_Harbor_Text_21E842: @ 821E842
+	.string "Please sail with us another time!$"
+
+LilycoveCity_Harbor_Text_21E864: @ 821E864
+	.string "SLATEPORT CITY it is, then!$"
+
+LilycoveCity_Harbor_Text_21E880: @ 821E880
+	.string "BATTLE FRONTIER it is, then!$"
+
+LilycoveCity_Harbor_Text_21E89D: @ 821E89D
+	.string "Please board the ferry and wait for\n"
+	.string "departure.$"
+
+LilycoveCity_Harbor_Text_21E8CC: @ 821E8CC
+	.string "Then, where would you like to go?$"
+
+LilycoveCity_Harbor_Text_21E8EE: @ 821E8EE
+	.string "Until they finish making the ferry,\n"
+	.string "we sailors have nothing to do…\p"
+	.string "I wish they’d get a move on, the folks\n"
+	.string "at the SHIPYARD in SLATEPORT.$"
+
+LilycoveCity_Harbor_Text_21E976: @ 821E976
+	.string "The ferry S.S. TIDAL is finally in\n"
+	.string "operation.\p"
+	.string "The folks at the SHIPYARD in SLATEPORT\n"
+	.string "must’ve worked extra hard.\p"
+	.string "Well, it’s my turn to get busy now!$"
+
diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc
new file mode 100644
index 000000000..d268037ba
--- /dev/null
+++ b/data/maps/LilycoveCity_House1/events.inc
@@ -0,0 +1,11 @@
+LilycoveCity_House1_EventObjects: @ 8531EF4
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0
+	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0
+
+LilycoveCity_House1_MapWarps: @ 8531F24
+	warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY
+	warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY
+
+LilycoveCity_House1_MapEvents:: @ 8531F34
+	map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc
index c298fe5f1..3d884a5d2 100644
--- a/data/maps/LilycoveCity_House1/header.inc
+++ b/data/maps/LilycoveCity_House1/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_House1: @ 8483788
-	.4byte LilycoveCity_House1_MapAttributes
+	.4byte House1_Layout
 	.4byte LilycoveCity_House1_MapEvents
 	.4byte LilycoveCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/scripts.inc
index 59418e667..59418e667 100644
--- a/data/scripts/maps/LilycoveCity_House1.inc
+++ b/data/maps/LilycoveCity_House1/scripts.inc
diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc
new file mode 100644
index 000000000..7e5276102
--- /dev/null
+++ b/data/maps/LilycoveCity_House2/events.inc
@@ -0,0 +1,10 @@
+LilycoveCity_House2_EventObjects: @ 8531F48
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0
+
+LilycoveCity_House2_MapWarps: @ 8531F60
+	warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY
+	warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY
+
+LilycoveCity_House2_MapEvents:: @ 8531F70
+	map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc
index b2276441c..3d184d345 100644
--- a/data/maps/LilycoveCity_House2/header.inc
+++ b/data/maps/LilycoveCity_House2/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_House2: @ 84837A4
-	.4byte LilycoveCity_House2_MapAttributes
+	.4byte LilycoveCity_House2_Layout
 	.4byte LilycoveCity_House2_MapEvents
 	.4byte LilycoveCity_House2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/scripts.inc
index 486df9be0..486df9be0 100644
--- a/data/scripts/maps/LilycoveCity_House2.inc
+++ b/data/maps/LilycoveCity_House2/scripts.inc
diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc
new file mode 100644
index 000000000..4f582bdef
--- /dev/null
+++ b/data/maps/LilycoveCity_House3/events.inc
@@ -0,0 +1,15 @@
+LilycoveCity_House3_EventObjects: @ 8531F84
+	object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, 7, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0
+
+LilycoveCity_House3_MapWarps: @ 8532014
+	warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY
+	warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY
+
+LilycoveCity_House3_MapEvents:: @ 8532024
+	map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc
index 2f3c3dc74..1a818490e 100644
--- a/data/maps/LilycoveCity_House3/header.inc
+++ b/data/maps/LilycoveCity_House3/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_House3: @ 84837C0
-	.4byte LilycoveCity_House3_MapAttributes
+	.4byte House2_Layout
 	.4byte LilycoveCity_House3_MapEvents
 	.4byte LilycoveCity_House3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/scripts.inc
index 38210196e..38210196e 100644
--- a/data/scripts/maps/LilycoveCity_House3.inc
+++ b/data/maps/LilycoveCity_House3/scripts.inc
diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc
new file mode 100644
index 000000000..e85c296d3
--- /dev/null
+++ b/data/maps/LilycoveCity_House4/events.inc
@@ -0,0 +1,11 @@
+LilycoveCity_House4_EventObjects: @ 8532038
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0
+
+LilycoveCity_House4_MapWarps: @ 8532068
+	warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY
+	warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY
+
+LilycoveCity_House4_MapEvents:: @ 8532078
+	map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc
index 6a2acb155..9632ffa39 100644
--- a/data/maps/LilycoveCity_House4/header.inc
+++ b/data/maps/LilycoveCity_House4/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_House4: @ 84837DC
-	.4byte LilycoveCity_House4_MapAttributes
+	.4byte House1_Layout
 	.4byte LilycoveCity_House4_MapEvents
 	.4byte LilycoveCity_House4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/scripts.inc
index 8bfdb2d48..8bfdb2d48 100644
--- a/data/scripts/maps/LilycoveCity_House4.inc
+++ b/data/maps/LilycoveCity_House4/scripts.inc
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
new file mode 100644
index 000000000..47b39c6ee
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
@@ -0,0 +1,38 @@
+LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775
+	object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0
+	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776
+	object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779
+	object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, 2, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780
+	object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778
+
+LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C
+	warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY
+	warp_def 10, 13, 0, 13, MAP_LILYCOVE_CITY
+	warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F
+
+LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354
+	bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD
+	bg_event 2, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD
+	bg_event 5, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1
+	bg_event 6, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1
+	bg_event 9, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4
+	bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6
+	bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6
+	bg_event 15, 12, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA
+	bg_event 11, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4
+	bg_event 6, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8
+	bg_event 17, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
+	bg_event 19, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF
+	bg_event 20, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF
+	bg_event 18, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
+	bg_event 18, 11, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3
+	bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
+
+LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 8531414
+	map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents
+
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
index 8b534ed9a..3721b4432 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_LilycoveMuseum_1F: @ 8483670
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes
+	.4byte LilycoveCity_LilycoveMuseum_1F_Layout
 	.4byte LilycoveCity_LilycoveMuseum_1F_MapEvents
 	.4byte LilycoveCity_LilycoveMuseum_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
new file mode 100644
index 000000000..c2f3be7d6
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
@@ -0,0 +1,296 @@
+LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 8218CB8
+	.byte 0
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218E4B, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2
+	lockall
+	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_27259E
+	message LilycoveCity_LilycoveMuseum_1F_Text_218EBC
+	waitmessage
+	multichoice 20, 8, 16, 1
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F5C, 2
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, 5
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218D14:: @ 8218D14
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218FF8, 3
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219035, 3
+	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_218D99
+	waitmovement 0
+	removeobject 2
+	switch VAR_FACING
+	case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A
+	case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F
+	case 4, LilycoveCity_LilycoveMuseum_1F_EventScript_218D84
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A
+	lockall
+	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218DA1
+	waitmovement 0
+	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
+	waitstate
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F:: @ 8218D6F
+	lockall
+	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9B
+	waitmovement 0
+	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
+	waitstate
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84
+	lockall
+	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9E
+	waitmovement 0
+	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
+	waitstate
+	end
+
+LilycoveCity_LilycoveMuseum_1F_Movement_218D99: @ 8218D99
+	walk_up
+	step_end
+
+LilycoveCity_LilycoveMuseum_1F_Movement_218D9B: @ 8218D9B
+	walk_left
+	walk_up
+	step_end
+
+LilycoveCity_LilycoveMuseum_1F_Movement_218D9E: @ 8218D9E
+	walk_right
+	walk_up
+	step_end
+
+LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1
+	walk_up
+	walk_up
+	step_end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4:: @ 8218DA4
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219080, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD:: @ 8218DAD
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190BF, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6:: @ 8218DB6
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190F9, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF:: @ 8218DBF
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219142, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8:: @ 8218DC8
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2191A2, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1:: @ 8218DD1
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21920D, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA:: @ 8218DDA
+LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA:: @ 8218DDA
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219260, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3:: @ 8218DE3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2192AA, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC:: @ 8218DEC
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219311, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5:: @ 8218DF5
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2193B4, 2
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE:: @ 8218DFE
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21941A, 2
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218E07:: @ 8218E07
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194BA, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218E10:: @ 8218E10
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194E1, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218E19:: @ 8218E19
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219515, 2
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218E22:: @ 8218E22
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21959B, 2
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B
+	lock
+	faceplayer
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, 4
+	closemessage
+	applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_218E42:: @ 8218E42
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21967A, 2
+	end
+
+LilycoveCity_LilycoveMuseum_1F_Text_218E4B: @ 8218E4B
+	.string "Welcome to LILYCOVE MUSEUM.\p"
+	.string "Please take the time to enjoy our\n"
+	.string "collection of fantastic artwork\l"
+	.string "featuring POKéMON.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_218EBC: @ 8218EBC
+	.string "I’m the CURATOR of this MUSEUM of\n"
+	.string "fine arts.\p"
+	.string "It’s heartening to see someone so\n"
+	.string "young as you in our MUSEUM.\p"
+	.string "Have you viewed our collection of\n"
+	.string "paintings already?$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_218F5C: @ 8218F5C
+	.string "Ah, then let me not disturb you.\n"
+	.string "Please, do take your time.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_218F98: @ 8218F98
+	.string "Oh? I do believe that you seem to\n"
+	.string "be a POKéMON TRAINER.\p"
+	.string "Have you an interest in paintings,\n"
+	.string "too?$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_218FF8: @ 8218FF8
+	.string "I see…\p"
+	.string "I’m honored that you would visit\n"
+	.string "us in spite of that.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_219035: @ 8219035
+	.string "Ah, excellent!\n"
+	.string "You do like paintings!\p"
+	.string "Then, may I ask you to come with me?$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_219080: @ 8219080
+	.string "It’s a very old painting.\n"
+	.string "The paint is peeling here and there.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_2190BF: @ 82190BF
+	.string "It’s an odd landscape with bizarre\n"
+	.string "and fantastic scenery.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_2190F9: @ 82190F9
+	.string "It’s a painting of a beautiful, smiling\n"
+	.string "woman with a POKéMON on her lap.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_219142: @ 8219142
+	.string "It’s a painting of a legendary POKéMON\n"
+	.string "from long ago.\p"
+	.string "The artist painted this from\n"
+	.string "imagination.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_2191A2: @ 82191A2
+	.string "It’s a painting of GRASS POKéMON\n"
+	.string "swaying in a breeze.\p"
+	.string "They appear to be enjoying the wind’s\n"
+	.string "gentle caress.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_21920D: @ 821920D
+	.string "It’s a delicious-looking painting\n"
+	.string "of BERRIES.\p"
+	.string "This painting could make you hungry!$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_219260: @ 8219260
+	.string "It’s a replica of a famous sculpture.\p"
+	.string "It depicts an ancient BIRD POKéMON.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_2192AA: @ 82192AA
+	.string "It’s a big POKé BALL carved from\n"
+	.string "a black stone.\p"
+	.string "It was apparently used in festivals\n"
+	.string "in the olden days.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_219311: @ 8219311
+	.string "It’s a huge stone tablet inscribed\n"
+	.string "with POKéMON and dense text in the\l"
+	.string "small characters of an ancient,\l"
+	.string "unreadable language.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_21938C: @ 821938C
+	.string "Hmmm…\n"
+	.string "What works of great magnificence…$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_2193B4: @ 82193B4
+	.string "Battling with POKéMON is fun,\n"
+	.string "I’ll grant you that.\p"
+	.string "But one mustn’t forget our love for\n"
+	.string "the fine arts.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_21941A: @ 821941A
+	.string "This ART MUSEUM… Well, you could\n"
+	.string "see many fantastic paintings.\p"
+	.string "And the CURATOR is a wonderful person.\p"
+	.string "Among artists like myself, this MUSEUM\n"
+	.string "is an inspiration.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_2194BA: @ 82194BA
+	.string "This lady is pretty!\n"
+	.string "She’s like Mommy!$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_2194E1: @ 82194E1
+	.string "This POKéMON is adorable!\n"
+	.string "Just like our little boy!$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_219515: @ 8219515
+	.string "I’d heard that this ART MUSEUM got\n"
+	.string "in some new paintings.\p"
+	.string "So, naturally I hurried over.\p"
+	.string "Are the new paintings up on\n"
+	.string "the second floor?$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_21959B: @ 821959B
+	.string "Lately, the CURATOR has been\n"
+	.string "unusually cheerful.\p"
+	.string "I bet something good happened for him.\n"
+	.string "Definitely.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_2195FF: @ 82195FF
+	.string "I aim to see many great paintings\n"
+	.string "here and learn from them.\p"
+	.string "I have this dream of one day having\n"
+	.string "my artwork exhibited here.$"
+
+LilycoveCity_LilycoveMuseum_1F_Text_21967A: @ 821967A
+	.string "The ART MUSEUM has become a favorite\n"
+	.string "tourist destination.\p"
+	.string "It’s great for LILYCOVE…\n"
+	.string "No, great for the HOENN region!\p"
+	.string "This is what I’ve heard--a lone TRAINER\n"
+	.string "procured all the paintings upstairs.$"
+
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
new file mode 100644
index 000000000..ba1e74e65
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
@@ -0,0 +1,26 @@
+LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780
+	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780
+
+LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488
+	warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
+
+LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490
+	bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B
+	bg_event 15, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B
+	bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E
+	bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E
+	bg_event 10, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219951
+	bg_event 11, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219951
+	bg_event 19, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219964
+	bg_event 18, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219964
+	bg_event 6, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219977
+	bg_event 7, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219977
+	bg_event 11, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA
+	bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA
+
+LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8531520
+	map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents
+
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
index 0cbbfb2e5..c5adc0fb1 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_LilycoveMuseum_2F: @ 848368C
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes
+	.4byte LilycoveCity_LilycoveMuseum_2F_Layout
 	.4byte LilycoveCity_LilycoveMuseum_2F_MapEvents
 	.4byte LilycoveCity_LilycoveMuseum_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index 6b4f0f3da..6b4f0f3da 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
new file mode 100644
index 000000000..784b388ae
--- /dev/null
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
@@ -0,0 +1,10 @@
+LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0
+
+LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0
+	warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY
+	warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY
+
+LilycoveCity_MoveDeletersHouse_MapEvents:: @ 8531EE0
+	map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
index 5ef550b69..19e61cf16 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_MoveDeletersHouse: @ 848376C
-	.4byte LilycoveCity_MoveDeletersHouse_MapAttributes
+	.4byte House2_Layout
 	.4byte LilycoveCity_MoveDeletersHouse_MapEvents
 	.4byte LilycoveCity_MoveDeletersHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
index 19471d2e1..19471d2e1 100644
--- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..dce57df3d
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,15 @@
+LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0
+	object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 1, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0
+	object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993
+
+LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44
+	warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY
+	warp_def 6, 8, 3, 2, MAP_LILYCOVE_CITY
+	warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F
+
+LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8531C5C
+	map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
index 81f460c86..782efd3d0 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_PokemonCenter_1F: @ 84836E0
-	.4byte LilycoveCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte LilycoveCity_PokemonCenter_1F_MapEvents
 	.4byte LilycoveCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
index b6ca09906..b6ca09906 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..ec8e4cf6e
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702
+
+LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0
+	warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8531CE8
+	map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
index d145bab55..7db9bcb62 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_PokemonCenter_2F: @ 84836FC
-	.4byte LilycoveCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte LilycoveCity_PokemonCenter_2F_MapEvents
 	.4byte LilycoveCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
index f4a25f137..f4a25f137 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
new file mode 100644
index 000000000..228e56e4d
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
@@ -0,0 +1,18 @@
+LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790
+	object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789
+	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, 8, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730
+
+LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8
+	warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY
+	warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY
+
+LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8531E08
+	map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
index 8d2f17dc6..0e23469c1 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_PokemonTrainerFanClub: @ 8483734
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes
+	.4byte LilycoveCity_PokemonTrainerFanClub_Layout
 	.4byte LilycoveCity_PokemonTrainerFanClub_MapEvents
 	.4byte LilycoveCity_PokemonTrainerFanClub_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index 74146fc7e..74146fc7e 100644
--- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
diff --git a/data/maps/LilycoveCity_UnusedMart/events.inc b/data/maps/LilycoveCity_UnusedMart/events.inc
new file mode 100644
index 000000000..0481a1c0b
--- /dev/null
+++ b/data/maps/LilycoveCity_UnusedMart/events.inc
@@ -0,0 +1,7 @@
+LilycoveCity_UnusedMart_MapWarps: @ 8531CFC
+	warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY
+	warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY
+
+LilycoveCity_UnusedMart_MapEvents:: @ 8531D0C
+	map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc
index 29e3bd57c..bf648b5da 100644
--- a/data/maps/LilycoveCity_UnusedMart/header.inc
+++ b/data/maps/LilycoveCity_UnusedMart/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_UnusedMart: @ 8483718
-	.4byte LilycoveCity_UnusedMart_MapAttributes
+	.4byte Mart_Layout
 	.4byte LilycoveCity_UnusedMart_MapEvents
 	.4byte LilycoveCity_UnusedMart_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/scripts.inc
index fa0405f68..fa0405f68 100644
--- a/data/scripts/maps/LilycoveCity_UnusedMart.inc
+++ b/data/maps/LilycoveCity_UnusedMart/scripts.inc
diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc
new file mode 100644
index 000000000..c1bdfe3fb
--- /dev/null
+++ b/data/maps/LinkContestRoom1/events.inc
@@ -0,0 +1,18 @@
+LinkContestRoom1_EventObjects: @ 8539EFC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_TRADER, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0
+	object_event 7, 246, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0
+	object_event 8, 247, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0
+	object_event 9, 248, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0
+	object_event 10, 249, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0
+	object_event 11, 250, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0
+	object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86
+	object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0
+	object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0
+
+LinkContestRoom1_MapEvents:: @ 853A064
diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc
index f5d7b9b78..dcd7be859 100644
--- a/data/maps/LinkContestRoom1/header.inc
+++ b/data/maps/LinkContestRoom1/header.inc
@@ -1,5 +1,5 @@
 LinkContestRoom1: @ 8484DA0
-	.4byte LinkContestRoom1_MapAttributes
+	.4byte LinkContestRoom1_Layout
 	.4byte LinkContestRoom1_MapEvents
 	.4byte LinkContestRoom1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/scripts.inc
index 5276adcd8..5276adcd8 100644
--- a/data/scripts/maps/LinkContestRoom1.inc
+++ b/data/maps/LinkContestRoom1/scripts.inc
diff --git a/data/maps/events/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/events.inc
index 89cb251d5..89cb251d5 100644
--- a/data/maps/events/LinkContestRoom2.inc
+++ b/data/maps/LinkContestRoom2/events.inc
diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc
index b083a3a93..2afb7ae00 100644
--- a/data/maps/LinkContestRoom2/header.inc
+++ b/data/maps/LinkContestRoom2/header.inc
@@ -1,5 +1,5 @@
 LinkContestRoom2: @ 8484E64
-	.4byte LinkContestRoom2_MapAttributes
+	.4byte LinkContestRoom2_Layout
 	.4byte LinkContestRoom2_MapEvents
 	.4byte LinkContestRoom2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/scripts.inc
index ff85310f7..ff85310f7 100644
--- a/data/scripts/maps/LinkContestRoom2.inc
+++ b/data/maps/LinkContestRoom2/scripts.inc
diff --git a/data/maps/events/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/events.inc
index 1e1b194c6..1e1b194c6 100644
--- a/data/maps/events/LinkContestRoom3.inc
+++ b/data/maps/LinkContestRoom3/events.inc
diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc
index ec0e6ee7b..97f0cdcae 100644
--- a/data/maps/LinkContestRoom3/header.inc
+++ b/data/maps/LinkContestRoom3/header.inc
@@ -1,5 +1,5 @@
 LinkContestRoom3: @ 8484E80
-	.4byte LinkContestRoom3_MapAttributes
+	.4byte LinkContestRoom3_Layout
 	.4byte LinkContestRoom3_MapEvents
 	.4byte LinkContestRoom3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/scripts.inc
index c3a5c95fb..c3a5c95fb 100644
--- a/data/scripts/maps/LinkContestRoom3.inc
+++ b/data/maps/LinkContestRoom3/scripts.inc
diff --git a/data/maps/events/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/events.inc
index 56e608f20..56e608f20 100644
--- a/data/maps/events/LinkContestRoom4.inc
+++ b/data/maps/LinkContestRoom4/events.inc
diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc
index 4a172b61f..9c0dfdc65 100644
--- a/data/maps/LinkContestRoom4/header.inc
+++ b/data/maps/LinkContestRoom4/header.inc
@@ -1,5 +1,5 @@
 LinkContestRoom4: @ 8484E9C
-	.4byte LinkContestRoom4_MapAttributes
+	.4byte LinkContestRoom4_Layout
 	.4byte LinkContestRoom4_MapEvents
 	.4byte LinkContestRoom4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/scripts.inc
index 9a544e6f3..9a544e6f3 100644
--- a/data/scripts/maps/LinkContestRoom4.inc
+++ b/data/maps/LinkContestRoom4/scripts.inc
diff --git a/data/maps/events/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/events.inc
index 90644518e..90644518e 100644
--- a/data/maps/events/LinkContestRoom5.inc
+++ b/data/maps/LinkContestRoom5/events.inc
diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc
index a26034ac6..42c2f3fdb 100644
--- a/data/maps/LinkContestRoom5/header.inc
+++ b/data/maps/LinkContestRoom5/header.inc
@@ -1,5 +1,5 @@
 LinkContestRoom5: @ 8484EB8
-	.4byte LinkContestRoom5_MapAttributes
+	.4byte LinkContestRoom5_Layout
 	.4byte LinkContestRoom5_MapEvents
 	.4byte LinkContestRoom5_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/scripts.inc
index f7ea72996..f7ea72996 100644
--- a/data/scripts/maps/LinkContestRoom5.inc
+++ b/data/maps/LinkContestRoom5/scripts.inc
diff --git a/data/maps/events/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/events.inc
index 802987a1d..802987a1d 100644
--- a/data/maps/events/LinkContestRoom6.inc
+++ b/data/maps/LinkContestRoom6/events.inc
diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc
index 436f89047..f1487f334 100644
--- a/data/maps/LinkContestRoom6/header.inc
+++ b/data/maps/LinkContestRoom6/header.inc
@@ -1,5 +1,5 @@
 LinkContestRoom6: @ 8484ED4
-	.4byte LinkContestRoom6_MapAttributes
+	.4byte LinkContestRoom6_Layout
 	.4byte LinkContestRoom6_MapEvents
 	.4byte LinkContestRoom6_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/scripts.inc
index bea65ea48..bea65ea48 100644
--- a/data/scripts/maps/LinkContestRoom6.inc
+++ b/data/maps/LinkContestRoom6/scripts.inc
diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc
index 3f8f421f5..0fed8d8e1 100644
--- a/data/maps/LittlerootTown/connections.inc
+++ b/data/maps/LittlerootTown/connections.inc
@@ -1,5 +1,5 @@
 LittlerootTown_MapConnectionsList: @ 8486600
-	connection up, 0, ROUTE_101, 0
+	connection up, 0, MAP_ROUTE101
 
 LittlerootTown_MapConnections: @ 848660C
 	.4byte 0x1
diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc
new file mode 100644
index 000000000..23b8cc3e5
--- /dev/null
+++ b/data/maps/LittlerootTown/events.inc
@@ -0,0 +1,35 @@
+LittlerootTown_EventObjects: @ 85276A8
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 16, 10, 3, 2, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, 868
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0
+	object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752
+	object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, 761
+	object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, 762
+	object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, 7, 1, 1, 0, 0, 0x0, 794
+	object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, 7, 1, 1, 0, 0, 0x0, 795
+
+LittlerootTown_MapWarps: @ 8527768
+	warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F
+	warp_def 5, 8, 0, 1, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
+	warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB
+
+LittlerootTown_MapCoordEvents: @ 8527780
+	coord_event 10, 1, 3, 0, VAR_0x4050, 0, 0, LittlerootTown_EventScript_1E8091
+	coord_event 11, 1, 3, 0, VAR_0x4050, 0, 0, LittlerootTown_EventScript_1E80EF
+	coord_event 11, 1, 3, 0, VAR_0x4050, 1, 0, LittlerootTown_EventScript_1E811F
+	coord_event 8, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81F9
+	coord_event 9, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E8205
+	coord_event 10, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81E1
+	coord_event 11, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81ED
+	coord_event 10, 2, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81BB
+	coord_event 11, 2, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81CE
+
+LittlerootTown_MapBGEvents: @ 8527810
+	bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_1E8151
+	bg_event 6, 17, 0, 0, 0, LittlerootTown_EventScript_1E815A
+	bg_event 7, 8, 3, 0, 0, LittlerootTown_EventScript_1E8163
+	bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_1E818F
+
+LittlerootTown_MapEvents:: @ 8527840
+	map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents
+
diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc
index 240429a6d..04010b50c 100644
--- a/data/maps/LittlerootTown/header.inc
+++ b/data/maps/LittlerootTown/header.inc
@@ -1,5 +1,5 @@
 LittlerootTown: @ 84825B4
-	.4byte LittlerootTown_MapAttributes
+	.4byte LittlerootTown_Layout
 	.4byte LittlerootTown_MapEvents
 	.4byte LittlerootTown_MapScripts
 	.4byte LittlerootTown_MapConnections
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc
new file mode 100644
index 000000000..eb78368af
--- /dev/null
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -0,0 +1,1040 @@
+LittlerootTown_MapScripts:: @ 81E7DCB
+	map_script 3, LittlerootTown_MapScript1_1E7DDB
+	map_script 2, LittlerootTown_MapScript2_1E7EC1
+	map_script 4, LittlerootTown_MapScript2_1E7FE2
+	.byte 0
+
+LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB
+	setflag FLAG_VISITED_LITTLEROOT_TOWN
+	call LittlerootTown_EventScript_271ED7
+	compare VAR_0x4092, 2
+	call_if 1, LittlerootTown_EventScript_1E7E67
+	checkflag FLAG_0x052
+	call_if 0, LittlerootTown_EventScript_1E7E6F
+	compare VAR_0x4050, 3
+	call_if 1, LittlerootTown_EventScript_1E7E92
+	compare VAR_0x4082, 4
+	call_if 1, LittlerootTown_EventScript_1E7E5C
+	compare VAR_0x408C, 4
+	call_if 1, LittlerootTown_EventScript_1E7E5C
+	compare VAR_0x40C7, 1
+	call_if 1, LittlerootTown_EventScript_1E7E53
+	compare VAR_0x408D, 3
+	call_if 1, LittlerootTown_EventScript_1E7E4F
+	compare VAR_0x40D3, 1
+	call_if 1, LittlerootTown_EventScript_1E7E4B
+	compare VAR_0x40D3, 2
+	call_if 1, LittlerootTown_EventScript_1E7E45
+	end
+
+LittlerootTown_EventScript_1E7E45:: @ 81E7E45
+	setvar VAR_0x40D3, 3
+	return
+
+LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B
+	setflag FLAG_SPECIAL_FLAG_0x4000
+	return
+
+LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
+	setflag FLAG_0x12D
+	return
+
+LittlerootTown_EventScript_1E7E53:: @ 81E7E53
+	setvar VAR_0x40C7, 2
+	setflag FLAG_0x3D3
+	return
+
+LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C
+	setvar VAR_0x4082, 5
+	setvar VAR_0x408C, 5
+	return
+
+LittlerootTown_EventScript_1E7E67:: @ 81E7E67
+	setobjectxyperm 4, 14, 8
+	return
+
+LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F
+	compare VAR_0x4050, 0
+	goto_eq LittlerootTown_EventScript_1E7E86
+	setobjectxyperm 1, 10, 1
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_EventScript_1E7E86:: @ 81E7E86
+	setobjectxyperm 1, 7, 2
+	setobjectmovementtype 1, 8
+	return
+
+LittlerootTown_EventScript_1E7E92:: @ 81E7E92
+	clearflag FLAG_0x2F0
+	setobjectmovementtype 4, 8
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_EventScript_1E7EB1
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_EventScript_1E7EB9
+	return
+
+LittlerootTown_EventScript_1E7EB1:: @ 81E7EB1
+	setobjectxyperm 4, 5, 9
+	return
+
+LittlerootTown_EventScript_1E7EB9:: @ 81E7EB9
+	setobjectxyperm 4, 14, 9
+	return
+
+LittlerootTown_MapScript2_1E7EC1: @ 81E7EC1
+	map_script_2 VAR_0x4092, 1, LittlerootTown_EventScript_1E7EDB
+	map_script_2 VAR_0x4092, 2, LittlerootTown_EventScript_1E7EF9
+	map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FB1
+	.2byte 0
+
+LittlerootTown_EventScript_1E7EDB:: @ 81E7EDB
+	lockall
+	setvar VAR_0x8004, 5
+	setvar VAR_0x8005, 8
+	call LittlerootTown_EventScript_1E7F17
+	setflag FLAG_0x2F9
+	warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8
+	waitstate
+	releaseall
+	end
+
+LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9
+	lockall
+	setvar VAR_0x8004, 14
+	setvar VAR_0x8005, 8
+	call LittlerootTown_EventScript_1E7F17
+	setflag FLAG_0x2FA
+	warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8
+	waitstate
+	releaseall
+	end
+
+LittlerootTown_EventScript_1E7F17:: @ 81E7F17
+	delay 15
+	playse SE_DANSA
+	applymovement 255, LittlerootTown_Movement_1E7FAC
+	waitmovement 0
+	opendoor VAR_0x8004, VAR_0x8005
+	waitdooranim
+	addobject 4
+	applymovement 4, LittlerootTown_Movement_1E7F98
+	waitmovement 0
+	closedoor VAR_0x8004, VAR_0x8005
+	waitdooranim
+	delay 10
+	applymovement 4, LittlerootTown_Movement_1E7F9A
+	waitmovement 0
+	msgbox LittlerootTown_Text_1E86BC, 4
+	closemessage
+	applymovement 4, LittlerootTown_Movement_1E7F9D
+	applymovement 255, LittlerootTown_Movement_1E7FA4
+	waitmovement 0
+	opendoor VAR_0x8004, VAR_0x8005
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_1E7FA1
+	applymovement 255, LittlerootTown_Movement_1E7FA9
+	waitmovement 0
+	setflag FLAG_0x2F0
+	setvar VAR_0x4092, 3
+	hideobjectat 255, MAP_PETALBURG_CITY
+	closedoor VAR_0x8004, VAR_0x8005
+	waitdooranim
+	clearflag FLAG_0x364
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	return
+
+LittlerootTown_Movement_1E7F98: @ 81E7F98
+	walk_down
+	step_end
+
+LittlerootTown_Movement_1E7F9A: @ 81E7F9A
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+LittlerootTown_Movement_1E7F9D: @ 81E7F9D
+	delay_16
+	delay_8
+	walk_up
+	step_end
+
+LittlerootTown_Movement_1E7FA1: @ 81E7FA1
+	walk_up
+	set_invisible
+	step_end
+
+LittlerootTown_Movement_1E7FA4: @ 81E7FA4
+	delay_16
+	delay_8
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_Movement_1E7FA9: @ 81E7FA9
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_Movement_1E7FAC: @ 81E7FAC
+	jump_right
+	delay_16
+	delay_16
+	delay_16
+	step_end
+
+LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
+	lockall
+	playse SE_PIN
+	applymovement 8, LittlerootTown_Movement_272598
+	waitmovement 0
+	delay 80
+	msgbox LittlerootTown_Text_1E8DA2, 4
+	closemessage
+	clearflag FLAG_0x31A
+	clearflag FLAG_0x31B
+	delay 20
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
+	waitstate
+	releaseall
+	end
+
+LittlerootTown_MapScript2_1E7FE2: @ 81E7FE2
+	map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FEC
+	.2byte 0
+
+LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC
+	addobject 8
+	addobject 7
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_EventScript_1E8004
+	goto LittlerootTown_EventScript_1E8013
+	end
+
+LittlerootTown_EventScript_1E8004:: @ 81E8004
+	setobjectxy 7, 6, 10
+	setobjectxy 8, 5, 10
+	end
+
+LittlerootTown_EventScript_1E8013:: @ 81E8013
+	setobjectxy 7, 13, 10
+	setobjectxy 8, 14, 10
+	end
+
+LittlerootTown_EventScript_1E8022:: @ 81E8022
+	msgbox LittlerootTown_Text_1E8ACF, 2
+	end
+
+LittlerootTown_EventScript_1E802B:: @ 81E802B
+	msgbox LittlerootTown_Text_1E8B25, 2
+	end
+
+LittlerootTown_EventScript_1E8034:: @ 81E8034
+	lock
+	faceplayer
+	checkflag FLAG_0x074
+	goto_eq LittlerootTown_EventScript_1E8087
+	checkflag FLAG_0x052
+	goto_eq LittlerootTown_EventScript_1E807A
+	compare VAR_0x4050, 0
+	goto_if 5, LittlerootTown_EventScript_1E805D
+	msgbox LittlerootTown_Text_1E8BB8, 4
+	release
+	end
+
+LittlerootTown_EventScript_1E805D:: @ 81E805D
+	special GetPlayerBigGuyGirlString
+	msgbox LittlerootTown_Text_1E8C3A, 4
+	closemessage
+	applymovement 1, LittlerootTown_Movement_2725A2
+	waitmovement 0
+	setvar VAR_0x4050, 2
+	release
+	end
+
+LittlerootTown_EventScript_1E807A:: @ 81E807A
+	special GetPlayerBigGuyGirlString
+	msgbox LittlerootTown_Text_1E8CE3, 4
+	release
+	end
+
+LittlerootTown_EventScript_1E8087:: @ 81E8087
+	msgbox LittlerootTown_Text_1E8D07, 4
+	release
+	end
+
+LittlerootTown_EventScript_1E8091:: @ 81E8091
+	lockall
+	applymovement 1, LittlerootTown_Movement_1E80D1
+	waitmovement 0
+	call LittlerootTown_EventScript_1E80AD
+	applymovement 1, LittlerootTown_Movement_1E80E1
+	waitmovement 0
+	releaseall
+	end
+
+LittlerootTown_EventScript_1E80AD:: @ 81E80AD
+	msgbox LittlerootTown_Text_1E8BB8, 4
+	closemessage
+	applymovement 1, LittlerootTown_Movement_1E80DF
+	applymovement 255, LittlerootTown_Movement_1E80EB
+	waitmovement 0
+	msgbox LittlerootTown_Text_1E8C07, 4
+	closemessage
+	return
+
+LittlerootTown_Movement_1E80D1: @ 81E80D1
+	face_right
+	delay_8
+	disable_jump_landing_ground_effect
+	jump_in_place_right
+	delay_8
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_left
+	face_down
+	step_end
+
+LittlerootTown_Movement_1E80DF: @ 81E80DF
+	walk_down
+	step_end
+
+LittlerootTown_Movement_1E80E1: @ 81E80E1
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_in_place_fastest_down
+	step_end
+
+LittlerootTown_Movement_1E80EB: @ 81E80EB
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
+	step_end
+
+LittlerootTown_EventScript_1E80EF:: @ 81E80EF
+	lockall
+	applymovement 1, LittlerootTown_Movement_1E810B
+	waitmovement 0
+	call LittlerootTown_EventScript_1E80AD
+	applymovement 1, LittlerootTown_Movement_1E8118
+	waitmovement 0
+	releaseall
+	end
+
+LittlerootTown_Movement_1E810B: @ 81E810B
+	face_right
+	delay_8
+	disable_jump_landing_ground_effect
+	jump_in_place_right
+	delay_8
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	face_down
+	step_end
+
+LittlerootTown_Movement_1E8118: @ 81E8118
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	step_end
+
+LittlerootTown_EventScript_1E811F:: @ 81E811F
+	lockall
+	applymovement 1, LittlerootTown_Movement_2725A8
+	waitmovement 0
+	applymovement 255, LittlerootTown_Movement_2725A4
+	waitmovement 0
+	special GetPlayerBigGuyGirlString
+	msgbox LittlerootTown_Text_1E8C3A, 4
+	closemessage
+	applymovement 1, LittlerootTown_Movement_2725A2
+	waitmovement 0
+	setvar VAR_0x4050, 2
+	releaseall
+	end
+
+LittlerootTown_EventScript_1E8151:: @ 81E8151
+	msgbox LittlerootTown_Text_1E8D32, 3
+	end
+
+LittlerootTown_EventScript_1E815A:: @ 81E815A
+	msgbox LittlerootTown_Text_1E8D69, 3
+	end
+
+LittlerootTown_EventScript_1E8163:: @ 81E8163
+	lockall
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_EventScript_1E817D
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_EventScript_1E8186
+	releaseall
+	end
+
+LittlerootTown_EventScript_1E817D:: @ 81E817D
+	msgbox LittlerootTown_Text_1E8D83, 4
+	return
+
+LittlerootTown_EventScript_1E8186:: @ 81E8186
+	msgbox LittlerootTown_Text_1E8D8E, 4
+	return
+
+LittlerootTown_EventScript_1E818F:: @ 81E818F
+	lockall
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_EventScript_1E81A9
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_EventScript_1E81B2
+	releaseall
+	end
+
+LittlerootTown_EventScript_1E81A9:: @ 81E81A9
+	msgbox LittlerootTown_Text_1E8D8E, 4
+	return
+
+LittlerootTown_EventScript_1E81B2:: @ 81E81B2
+	msgbox LittlerootTown_Text_1E8D83, 4
+	return
+
+LittlerootTown_EventScript_1E81BB:: @ 81E81BB
+	lockall
+	setvar VAR_0x8008, 0
+	setobjectxy 4, 10, 9
+	goto LittlerootTown_EventScript_1E8211
+	end
+
+LittlerootTown_EventScript_1E81CE:: @ 81E81CE
+	lockall
+	setvar VAR_0x8008, 1
+	setobjectxy 4, 11, 9
+	goto LittlerootTown_EventScript_1E8211
+	end
+
+LittlerootTown_EventScript_1E81E1:: @ 81E81E1
+	lockall
+	setvar VAR_0x8008, 2
+	goto LittlerootTown_EventScript_1E8211
+	end
+
+LittlerootTown_EventScript_1E81ED:: @ 81E81ED
+	lockall
+	setvar VAR_0x8008, 3
+	goto LittlerootTown_EventScript_1E8211
+	end
+
+LittlerootTown_EventScript_1E81F9:: @ 81E81F9
+	lockall
+	setvar VAR_0x8008, 4
+	goto LittlerootTown_EventScript_1E8211
+	end
+
+LittlerootTown_EventScript_1E8205:: @ 81E8205
+	lockall
+	setvar VAR_0x8008, 5
+	goto LittlerootTown_EventScript_1E8211
+	end
+
+LittlerootTown_EventScript_1E8211:: @ 81E8211
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_EventScript_1E8297
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_EventScript_1E82A2
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_EventScript_1E8281
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_EventScript_1E828C
+	msgbox LittlerootTown_Text_1E87E1, 4
+	closemessage
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_EventScript_1E82AD
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_EventScript_1E82F0
+	call LittlerootTown_EventScript_1E8693
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_EventScript_1E8405
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_EventScript_1E8448
+	goto LittlerootTown_EventScript_1E8686
+	end
+
+LittlerootTown_EventScript_1E8281:: @ 81E8281
+	setvar VAR_0x8009, 5
+	setvar VAR_0x800A, 8
+	return
+
+LittlerootTown_EventScript_1E828C:: @ 81E828C
+	setvar VAR_0x8009, 14
+	setvar VAR_0x800A, 8
+	return
+
+LittlerootTown_EventScript_1E8297:: @ 81E8297
+	applymovement 4, LittlerootTown_Movement_2725A8
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_1E82A2:: @ 81E82A2
+	applymovement 4, LittlerootTown_Movement_2725A4
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_1E82AD:: @ 81E82AD
+	compare VAR_0x8008, 0
+	call_if 1, LittlerootTown_EventScript_1E8333
+	compare VAR_0x8008, 1
+	call_if 1, LittlerootTown_EventScript_1E8348
+	compare VAR_0x8008, 2
+	call_if 1, LittlerootTown_EventScript_1E835D
+	compare VAR_0x8008, 3
+	call_if 1, LittlerootTown_EventScript_1E8372
+	compare VAR_0x8008, 4
+	call_if 1, LittlerootTown_EventScript_1E8387
+	compare VAR_0x8008, 5
+	call_if 1, LittlerootTown_EventScript_1E839C
+	return
+
+LittlerootTown_EventScript_1E82F0:: @ 81E82F0
+	compare VAR_0x8008, 0
+	call_if 1, LittlerootTown_EventScript_1E8333
+	compare VAR_0x8008, 1
+	call_if 1, LittlerootTown_EventScript_1E8348
+	compare VAR_0x8008, 2
+	call_if 1, LittlerootTown_EventScript_1E83B1
+	compare VAR_0x8008, 3
+	call_if 1, LittlerootTown_EventScript_1E83C6
+	compare VAR_0x8008, 4
+	call_if 1, LittlerootTown_EventScript_1E83DB
+	compare VAR_0x8008, 5
+	call_if 1, LittlerootTown_EventScript_1E83F0
+	return
+
+LittlerootTown_EventScript_1E8333:: @ 81E8333
+	applymovement 255, LittlerootTown_Movement_2725AA
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_1E85D1
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_1E8348:: @ 81E8348
+	applymovement 255, LittlerootTown_Movement_2725AA
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_1E85D8
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_1E835D:: @ 81E835D
+	applymovement 255, LittlerootTown_Movement_2725A4
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_1E85DF
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_1E8372:: @ 81E8372
+	applymovement 255, LittlerootTown_Movement_2725A4
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_1E85E4
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_1E8387:: @ 81E8387
+	applymovement 255, LittlerootTown_Movement_2725A4
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_1E85EA
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_1E839C:: @ 81E839C
+	applymovement 255, LittlerootTown_Movement_2725A4
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_1E85ED
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_1E83B1:: @ 81E83B1
+	applymovement 255, LittlerootTown_Movement_2725A8
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_1E85F1
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_1E83C6:: @ 81E83C6
+	applymovement 255, LittlerootTown_Movement_2725A8
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_1E85F5
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_1E83DB:: @ 81E83DB
+	applymovement 255, LittlerootTown_Movement_2725A8
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_1E85F8
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_1E83F0:: @ 81E83F0
+	applymovement 255, LittlerootTown_Movement_2725A8
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_1E85FE
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_1E8405:: @ 81E8405
+	compare VAR_0x8008, 0
+	call_if 1, LittlerootTown_EventScript_1E848B
+	compare VAR_0x8008, 1
+	call_if 1, LittlerootTown_EventScript_1E8496
+	compare VAR_0x8008, 2
+	call_if 1, LittlerootTown_EventScript_1E84A1
+	compare VAR_0x8008, 3
+	call_if 1, LittlerootTown_EventScript_1E84C7
+	compare VAR_0x8008, 4
+	call_if 1, LittlerootTown_EventScript_1E84ED
+	compare VAR_0x8008, 5
+	call_if 1, LittlerootTown_EventScript_1E8513
+	return
+
+LittlerootTown_EventScript_1E8448:: @ 81E8448
+	compare VAR_0x8008, 0
+	call_if 1, LittlerootTown_EventScript_1E848B
+	compare VAR_0x8008, 1
+	call_if 1, LittlerootTown_EventScript_1E8496
+	compare VAR_0x8008, 2
+	call_if 1, LittlerootTown_EventScript_1E8539
+	compare VAR_0x8008, 3
+	call_if 1, LittlerootTown_EventScript_1E855F
+	compare VAR_0x8008, 4
+	call_if 1, LittlerootTown_EventScript_1E8585
+	compare VAR_0x8008, 5
+	call_if 1, LittlerootTown_EventScript_1E85AB
+	return
+
+LittlerootTown_EventScript_1E848B:: @ 81E848B
+	applymovement 4, LittlerootTown_Movement_1E8603
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_1E8496:: @ 81E8496
+	applymovement 4, LittlerootTown_Movement_1E8609
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_1E84A1:: @ 81E84A1
+	applymovement 4, LittlerootTown_Movement_1E860F
+	waitmovement 0
+	opendoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_1E863B
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_1E84C7:: @ 81E84C7
+	applymovement 4, LittlerootTown_Movement_1E8615
+	waitmovement 0
+	opendoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_1E863B
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_1E84ED:: @ 81E84ED
+	applymovement 4, LittlerootTown_Movement_1E861C
+	waitmovement 0
+	opendoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_1E863B
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_1E8513:: @ 81E8513
+	applymovement 4, LittlerootTown_Movement_1E8620
+	waitmovement 0
+	opendoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_1E863B
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_1E8539:: @ 81E8539
+	applymovement 4, LittlerootTown_Movement_1E8625
+	waitmovement 0
+	opendoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_1E863B
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_1E855F:: @ 81E855F
+	applymovement 4, LittlerootTown_Movement_1E862A
+	waitmovement 0
+	opendoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_1E863B
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_1E8585:: @ 81E8585
+	applymovement 4, LittlerootTown_Movement_1E862E
+	waitmovement 0
+	opendoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_1E863B
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_1E85AB:: @ 81E85AB
+	applymovement 4, LittlerootTown_Movement_1E8635
+	waitmovement 0
+	opendoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_1E863B
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	return
+
+LittlerootTown_Movement_1E85D1: @ 81E85D1
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_Movement_1E85D8: @ 81E85D8
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_Movement_1E85DF: @ 81E85DF
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+LittlerootTown_Movement_1E85E4: @ 81E85E4
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+LittlerootTown_Movement_1E85EA: @ 81E85EA
+	walk_right
+	walk_right
+	step_end
+
+LittlerootTown_Movement_1E85ED: @ 81E85ED
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+LittlerootTown_Movement_1E85F1: @ 81E85F1
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+LittlerootTown_Movement_1E85F5: @ 81E85F5
+	walk_left
+	walk_left
+	step_end
+
+LittlerootTown_Movement_1E85F8: @ 81E85F8
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+LittlerootTown_Movement_1E85FE: @ 81E85FE
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+LittlerootTown_Movement_1E8603: @ 81E8603
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+LittlerootTown_Movement_1E8609: @ 81E8609
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+LittlerootTown_Movement_1E860F: @ 81E860F
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_Movement_1E8615: @ 81E8615
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_Movement_1E861C: @ 81E861C
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_Movement_1E8620: @ 81E8620
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_Movement_1E8625: @ 81E8625
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_Movement_1E862A: @ 81E862A
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_Movement_1E862E: @ 81E862E
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_Movement_1E8635: @ 81E8635
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_Movement_1E863B: @ 81E863B
+	walk_up
+	step_end
+
+LittlerootTown_EventScript_1E863D:: @ 81E863D
+	lock
+	faceplayer
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_EventScript_1E8281
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_EventScript_1E828C
+	call LittlerootTown_EventScript_1E8693
+	applymovement 4, LittlerootTown_Movement_2725A6
+	waitmovement 0
+	opendoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_1E863B
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_0x8009, VAR_0x800A
+	waitdooranim
+	goto LittlerootTown_EventScript_1E8686
+	end
+
+LittlerootTown_EventScript_1E8686:: @ 81E8686
+	removeobject 4
+	setflag FLAG_SYS_B_DASH
+	setvar VAR_0x4050, 4
+	release
+	end
+
+LittlerootTown_EventScript_1E8693:: @ 81E8693
+	msgbox LittlerootTown_Text_1E87F0, 4
+	playfanfare MUS_FANFA4
+	message LittlerootTown_Text_1E8925
+	waitfanfare
+	setflag FLAG_0x112
+	msgbox LittlerootTown_Text_1E894F, 4
+	msgbox LittlerootTown_Text_1E8A03, 4
+	closemessage
+	delay 30
+	return
+
+LittlerootTown_Text_1E86BC: @ 81E86BC
+	.string "MOM: {PLAYER}, we’re here, honey!\p"
+	.string "It must be tiring riding with our things\n"
+	.string "in the moving truck.\p"
+	.string "Well, this is LITTLEROOT TOWN.\p"
+	.string "How do you like it?\n"
+	.string "This is our new home!\p"
+	.string "It has a quaint feel, but it seems to be\n"
+	.string "an easy place to live, don’t you think?\p"
+	.string "And, you get your own room, {PLAYER}!\n"
+	.string "Let’s go inside.$"
+
+LittlerootTown_Text_1E87E1: @ 81E87E1
+	.string "MOM: Wait, {PLAYER}!$"
+
+LittlerootTown_Text_1E87F0: @ 81E87F0
+	.string "MOM: {PLAYER}! {PLAYER}! Did you\n"
+	.string "introduce yourself to PROF. BIRCH?\p"
+	.string "Oh! What an adorable POKéMON!\n"
+	.string "You got it from PROF. BIRCH. How nice!\p"
+	.string "You’re your father’s child, all right.\n"
+	.string "You look good together with POKéMON!\p"
+	.string "Here, honey! If you’re going out on an\n"
+	.string "adventure, wear these RUNNING SHOES.\p"
+	.string "They’ll put a zip in your step!$"
+
+LittlerootTown_Text_1E8925: @ 81E8925
+	.string "{PLAYER} switched shoes with the\n"
+	.string "RUNNING SHOES.$"
+
+LittlerootTown_Text_1E894F: @ 81E894F
+	.string "MOM: {PLAYER}, those shoes came with\n"
+	.string "instructions.\p"
+	.string "“Press the B Button while wearing these\n"
+	.string "RUNNING SHOES to run extra-fast!\p"
+	.string "“Slip on these RUNNING SHOES and race\n"
+	.string "in the great outdoors!”$"
+
+LittlerootTown_Text_1E8A03: @ 81E8A03
+	.string "… … … … … … … …\n"
+	.string "… … … … … … … …\p"
+	.string "To think that you have your very own\n"
+	.string "POKéMON now…\l"
+	.string "Your father will be overjoyed.\p"
+	.string "…But please be careful.\n"
+	.string "If anything happens, you can come home.\p"
+	.string "Go on, go get them, honey!$"
+
+LittlerootTown_Text_1E8ACF: @ 81E8ACF
+	.string "If you use a PC, you can store items\n"
+	.string "and POKéMON.\p"
+	.string "The power of science is staggering!$"
+
+LittlerootTown_Text_1E8B25: @ 81E8B25
+	.string "PROF. BIRCH spends days in his LAB\n"
+	.string "studying, then he’ll suddenly go out in\l"
+	.string "the wild to do more research…\p"
+	.string "When does PROF. BIRCH spend time\n"
+	.string "at home?$"
+
+LittlerootTown_Text_1E8BB8: @ 81E8BB8
+	.string "Um, um, um!\p"
+	.string "If you go outside and go in the grass,\n"
+	.string "wild POKéMON will jump out!$"
+
+LittlerootTown_Text_1E8C07: @ 81E8C07
+	.string "It’s dangerous if you don’t have\n"
+	.string "your own POKéMON.$"
+
+LittlerootTown_Text_1E8C3A: @ 81E8C3A
+	.string "Um, hi!\p"
+	.string "There are scary POKéMON outside!\n"
+	.string "I can hear their cries!\p"
+	.string "I want to go see what’s going on,\n"
+	.string "but I don’t have any POKéMON…\p"
+	.string "Can you go see what’s happening\n"
+	.string "for me?$"
+
+LittlerootTown_Text_1E8CE3: @ 81E8CE3
+	.string "You saved PROF. BIRCH!\n"
+	.string "I’m so glad!$"
+
+LittlerootTown_Text_1E8D07: @ 81E8D07
+	.string "Are you going to catch POKéMON?\n"
+	.string "Good luck!$"
+
+LittlerootTown_Text_1E8D32: @ 81E8D32
+	.string "LITTLEROOT TOWN\n"
+	.string "“A town that can’t be shaded any hue.”$"
+
+LittlerootTown_Text_1E8D69: @ 81E8D69
+	.string "PROF. BIRCH’S POKéMON LAB$"
+
+LittlerootTown_Text_1E8D83: @ 81E8D83
+	.string "{PLAYER}’s HOUSE$"
+
+LittlerootTown_Text_1E8D8E: @ 81E8D8E
+	.string "PROF. BIRCH’S HOUSE$"
+
+LittlerootTown_Text_1E8DA2: @ 81E8DA2
+	.string "PROF. BIRCH: Well, well, {PLAYER}{KUN}!\n"
+	.string "That was good work out there!\p"
+	.string "I knew there was something special\n"
+	.string "about you when I first saw you,\l"
+	.string "but I never expected this.\p"
+	.string "Oh, yes. Do you still have the POKéDEX\n"
+	.string "I gave you?\p"
+	.string "I have something to show you.\n"
+	.string "Let’s go to my LAB.$"
+
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
new file mode 100644
index 000000000..cd08fbad8
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
@@ -0,0 +1,23 @@
+LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C
+	object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758
+	object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755
+	object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784
+	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 9, 1, 1, 0, 0, 0x0, 734
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 5, 3, 5, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735
+	object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, 7, 1, 1, 0, 0, 0x0, 745
+
+LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134
+	warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN
+	warp_def 8, 8, 0, 1, MAP_LITTLEROOT_TOWN
+	warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
+
+LittlerootTown_BrendansHouse_1F_MapCoordEvents: @ 852D14C
+	coord_event 8, 8, 0, 0, VAR_0x4092, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3
+	coord_event 7, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78BE
+	coord_event 8, 4, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78CA
+	coord_event 9, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6
+
+LittlerootTown_BrendansHouse_1F_MapEvents:: @ 852D18C
+	map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0
+
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
index 781e37506..d5a87bae9 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
@@ -1,5 +1,5 @@
 LittlerootTown_BrendansHouse_1F: @ 8482AF4
-	.4byte LittlerootTown_BrendansHouse_1F_MapAttributes
+	.4byte LittlerootTown_BrendansHouse_1F_Layout
 	.4byte LittlerootTown_BrendansHouse_1F_MapEvents
 	.4byte LittlerootTown_BrendansHouse_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
new file mode 100644
index 000000000..4c904b001
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
@@ -0,0 +1,451 @@
+LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755
+	map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765
+	map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4
+	map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA
+	.byte 0
+
+LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765
+	compare VAR_0x4092, 6
+	call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_1F777A
+	checkflag FLAG_0x112
+	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F778D
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A
+	setmetatile 5, 4, 624, 1
+	setmetatile 5, 2, 616, 1
+	return
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A
+	return
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A
+	setmetatile 3, 7, 659, 1
+	return
+
+LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4
+	compare VAR_0x4092, 3
+	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77DE
+	compare VAR_0x4092, 5
+	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77C6
+	compare VAR_0x4092, 6
+	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77D2
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6
+	setobjectxyperm 1, 8, 4
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F77D2:: @ 81F77D2
+	setobjectxyperm 1, 4, 5
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE
+	setobjectxyperm 1, 9, 8
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA
+	map_script_2 VAR_0x4092, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C
+	map_script_2 VAR_0x4092, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814
+	map_script_2 VAR_0x4092, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D
+	map_script_2 VAR_0x4082, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E
+	map_script_2 VAR_0x4082, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2
+	.2byte 0
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814
+	lockall
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, 4
+	closemessage
+	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F783A
+	applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A
+	waitmovement 0
+	warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1
+	waitstate
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_1F_Movement_1F783A: @ 81F783A
+	walk_up
+	step_end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F783C:: @ 81F783C
+	lockall
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 0
+	goto LittlerootTown_BrendansHouse_1F_EventScript_292704
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F784D:: @ 81F784D
+	lockall
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8005, 1
+	goto LittlerootTown_BrendansHouse_1F_EventScript_29286D
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
+	lockall
+	playse SE_PIN
+	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_272598
+	waitmovement 0
+	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_27259A
+	waitmovement 0
+	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C
+	waitmovement 0
+	special GetRivalSonDaughterString
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, 4
+	setflag FLAG_0x057
+	setvar VAR_0x4082, 2
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_1F_Movement_1F789C: @ 81F789C
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3
+	lockall
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 0
+	applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+	waitmovement 0
+	goto LittlerootTown_BrendansHouse_1F_EventScript_292765
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F78BE:: @ 81F78BE
+	lockall
+	setvar VAR_0x8008, 0
+	goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F78CA:: @ 81F78CA
+	lockall
+	setvar VAR_0x8008, 1
+	goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F78D6:: @ 81F78D6
+	lockall
+	setvar VAR_0x8008, 2
+	goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
+	playse SE_KAIDAN
+	delay 10
+	addobject 7
+	delay 30
+	playse SE_PIN
+	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_272598
+	waitmovement 0
+	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A
+	waitmovement 0
+	compare VAR_0x8008, 1
+	call_if 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7981
+	playbgm MUS_BOY_SUP, 1
+	compare VAR_0x8008, 0
+	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F798C
+	compare VAR_0x8008, 1
+	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F7997
+	compare VAR_0x8008, 2
+	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79A2
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, 4
+	closemessage
+	compare VAR_0x8008, 0
+	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79C1
+	compare VAR_0x8008, 1
+	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79D3
+	compare VAR_0x8008, 2
+	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79E5
+	playse SE_KAIDAN
+	removeobject 7
+	setflag FLAG_0x2E9
+	setflag FLAG_0x331
+	clearflag FLAG_0x2F8
+	delay 30
+	setvar VAR_0x408D, 3
+	setvar VAR_0x4050, 1
+	savebgm MUS_DUMMY
+	fadedefaultbgm
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981
+	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725AA
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F798C:: @ 81F798C
+	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79AD
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F7997:: @ 81F7997
+	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79B5
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F79A2:: @ 81F79A2
+	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79B9
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_1F_Movement_1F79AD: @ 81F79AD
+	walk_in_place_fastest_left
+	walk_left
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_BrendansHouse_1F_Movement_1F79B5: @ 81F79B5
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9
+	walk_in_place_fastest_right
+	walk_right
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F79C1:: @ 81F79C1
+	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F79F7
+	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A06
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F79D3:: @ 81F79D3
+	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F79FB
+	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A0C
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F79E5:: @ 81F79E5
+	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F7A02
+	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A16
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_1F_Movement_1F79F7: @ 81F79F7
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
+	step_end
+
+LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_BrendansHouse_1F_Movement_1F7A02: @ 81F7A02
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
+	step_end
+
+LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06
+	walk_in_place_fastest_right
+	walk_right
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C
+	walk_in_place_fastest_right
+	walk_right
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	walk_left
+	walk_in_place_fastest_up
+	walk_up
+	step_end
+
+LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16
+	walk_in_place_fastest_left
+	walk_left
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_BrendansHouse_1F_Text_1F7A1C: @ 81F7A1C
+	.string "MOM: See, {PLAYER}?\n"
+	.string "Isn’t it nice in here, too?$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7A46: @ 81F7A46
+	.string "The mover’s POKéMON do all the work\n"
+	.string "of moving us in and cleaning up after.\l"
+	.string "This is so convenient!\p"
+	.string "{PLAYER}, your room is upstairs.\n"
+	.string "Go check it out, dear!\p"
+	.string "DAD bought you a new clock to mark\n"
+	.string "our move here.\l"
+	.string "Don’t forget to set it!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7B24: @ 81F7B24
+	.string "MOM: Well, {PLAYER}?\p"
+	.string "Aren’t you interested in seeing your\n"
+	.string "very own room?$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7B67: @ 81F7B67
+LittlerootTown_MaysHouse_1F_Text_1F7B67: @ 81F7B67
+	.string "MOM: {PLAYER}.\p"
+	.string "Go set the clock in your room, honey.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7B96: @ 81F7B96
+	.string "MOM: Oh! {PLAYER}, {PLAYER}!\n"
+	.string "Quick! Come quickly!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7BBC: @ 81F7BBC
+LittlerootTown_MaysHouse_1F_Text_1F7BBC: @ 81F7BBC
+	.string "MOM: Look! It’s PETALBURG GYM!\n"
+	.string "Maybe DAD will be on!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7BF1: @ 81F7BF1
+LittlerootTown_MaysHouse_1F_Text_1F7BF1: @ 81F7BF1
+	.string "MOM: Oh… It’s over.\p"
+	.string "I think DAD was on, but we missed him.\n"
+	.string "Too bad.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7C35: @ 81F7C35
+LittlerootTown_MaysHouse_1F_Text_1F7C35: @ 81F7C35
+	.string "Oh, yes.\n"
+	.string "One of DAD’s friends lives in town.\p"
+	.string "PROF. BIRCH is his name.\p"
+	.string "He lives right next door, so you should\n"
+	.string "go over and introduce yourself.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7CC3: @ 81F7CC3
+	.string "MOM: See you, honey!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7CD8: @ 81F7CD8
+	.string "MOM: Did you introduce yourself to\n"
+	.string "PROF. BIRCH?$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7D08: @ 81F7D08
+	.string "MOM: How are you doing, {PLAYER}?\n"
+	.string "You look a little tired.\p"
+	.string "I think you should rest a bit.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7D5C: @ 81F7D5C
+	.string "MOM: Take care, honey!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7D73: @ 81F7D73
+	.string "MOM: Oh? Did DAD give you that BADGE?\p"
+	.string "Then here’s something from your MOM!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7DBE: @ 81F7DBE
+	.string "Don’t push yourself too hard, dear.\n"
+	.string "You can always come home.\p"
+	.string "Go for it, honey!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7E0E: @ 81F7E0E
+	.string "MOM: What is that, honey? A POKéNAV?\n"
+	.string "Someone from DEVON gave it to you?\p"
+	.string "Well, honey, how about registering\n"
+	.string "your mom?\p"
+	.string "… … …$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7E89: @ 81F7E89
+	.string "Registered MOM\n"
+	.string "in the POKéNAV.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7EA8: @ 81F7EA8
+	.string "Fugiiiiih!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7EB3: @ 81F7EB3
+	.string "Huggoh, uggo uggo…$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7EC6: @ 81F7EC6
+	.string "INTERVIEWER: …We brought you this\n"
+	.string "report from in front of PETALBURG GYM.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7F0F: @ 81F7F0F
+	.string "There is a movie on TV.\p"
+	.string "Two men are dancing on a big piano\n"
+	.string "keyboard.\p"
+	.string "Better get going!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66
+	.string "It’s the instruction booklet for the\n"
+	.string "RUNNING SHOES.\p"
+	.string "“Press the B Button to run while\n"
+	.string "wearing your RUNNING SHOES.\p"
+	.string "“Lace up your RUNNING SHOES and hit\n"
+	.string "the road running!”$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F800E: @ 81F800E
+	.string "DAD: Hm?\p"
+	.string "Hey, it’s {PLAYER}!\p"
+	.string "It’s been a while since I saw you,\n"
+	.string "but you look…stronger, somehow.\p"
+	.string "That’s the impression I get.\n"
+	.string "But your old man hasn’t given up yet!\p"
+	.string "Oh, yes, I have something for you.\n"
+	.string "This came to you from someone named\l"
+	.string "MR. BRINEY.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F80FE: @ 81F80FE
+	.string "DAD: Hm, a TICKET for a ferry?\p"
+	.string "If I recall, there are ferry ports in\n"
+	.string "SLATEPORT and LILYCOVE.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F815B: @ 81F815B
+	.string "I’d better get back to PETALBURG GYM.\p"
+	.string "MOM, thanks for looking after the house\n"
+	.string "while I’m away.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F81B9: @ 81F81B9
+	.string "MOM: That DAD of yours…\p"
+	.string "He comes home for the first time in a\n"
+	.string "while, but all he talks about is POKéMON.\p"
+	.string "He should relax and stay a little longer.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F824B: @ 81F824B
+	.string "MOM: Is that a breaking news story?$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F826F: @ 81F826F
+	.string "We bring you this emergency\n"
+	.string "news flash!\p"
+	.string "In various HOENN locales, there have\n"
+	.string "been reports of a BZZT…colored\l"
+	.string "POKéMON in flight.\p"
+	.string "The identity of this POKéMON is\n"
+	.string "currently unknown.\p"
+	.string "We now return you to the regular\n"
+	.string "movie program.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F8351: @ 81F8351
+	.string "MOM: {PLAYER}, did you catch that?\p"
+	.string "What color did the announcer say\n"
+	.string "that POKéMON was?$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F83A1: @ 81F83A1
+	.string "MOM: Well, isn’t that something!\n"
+	.string "There are still unknown POKéMON.$"
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
new file mode 100644
index 000000000..a6649c9b6
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
@@ -0,0 +1,30 @@
+LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0
+	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, 185
+	object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, 757
+	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, 1, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817
+	object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, 1, 1, 1, 0, 0, 0x0, 815
+
+LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320
+	warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
+
+LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328
+	bg_event 0, 1, 0, 1, 0, gUnknown_081F860D
+	bg_event 1, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8656
+	bg_event 5, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_292781
+	bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F865F
+
+LittlerootTown_BrendansHouse_2F_MapEvents:: @ 852D358
+	map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents
+
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
index 12047b040..0153a3f27 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
@@ -1,5 +1,5 @@
 LittlerootTown_BrendansHouse_2F: @ 8482B10
-	.4byte LittlerootTown_BrendansHouse_2F_MapAttributes
+	.4byte LittlerootTown_BrendansHouse_2F_Layout
 	.4byte LittlerootTown_BrendansHouse_2F_MapEvents
 	.4byte LittlerootTown_BrendansHouse_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
index 429c933fc..429c933fc 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
new file mode 100644
index 000000000..6822c20e8
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
@@ -0,0 +1,23 @@
+LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C
+	object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759
+	object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754
+	object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785
+	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 10, 1, 1, 0, 0, 0x0, 734
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 5, 3, 5, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736
+	object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, 7, 1, 1, 0, 0, 0x0, 746
+
+LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414
+	warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN
+	warp_def 2, 8, 0, 0, MAP_LITTLEROOT_TOWN
+	warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F
+
+LittlerootTown_MaysHouse_1F_MapCoordEvents: @ 852D42C
+	coord_event 2, 8, 0, 0, VAR_0x4092, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C
+	coord_event 1, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A67
+	coord_event 2, 4, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A73
+	coord_event 3, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F
+
+LittlerootTown_MaysHouse_1F_MapEvents:: @ 852D46C
+	map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0
+
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
index 624be65cb..1e72c91b5 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
@@ -1,5 +1,5 @@
 LittlerootTown_MaysHouse_1F: @ 8482B2C
-	.4byte LittlerootTown_MaysHouse_1F_MapAttributes
+	.4byte LittlerootTown_MaysHouse_1F_Layout
 	.4byte LittlerootTown_MaysHouse_1F_MapEvents
 	.4byte LittlerootTown_MaysHouse_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
new file mode 100644
index 000000000..99d47f938
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
@@ -0,0 +1,423 @@
+LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5
+	map_script 1, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5
+	map_script 3, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4
+	map_script 2, LittlerootTown_MaysHouse_1F_MapScript2_1F893A
+	.byte 0
+
+LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5
+	compare VAR_0x4092, 6
+	call_if 0, LittlerootTown_MaysHouse_1F_EventScript_1F88CA
+	checkflag FLAG_0x112
+	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F88DD
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA
+	setmetatile 5, 4, 624, 1
+	setmetatile 5, 2, 616, 1
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD
+	checkplayergender
+	compare VAR_RESULT, 1
+	goto_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA
+	setmetatile 6, 7, 659, 1
+	return
+
+LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4
+	compare VAR_0x4092, 3
+	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F892E
+	compare VAR_0x4092, 5
+	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8916
+	compare VAR_0x4092, 6
+	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8922
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916
+	setobjectxyperm 1, 2, 4
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8922:: @ 81F8922
+	setobjectxyperm 1, 6, 5
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E
+	setobjectxyperm 1, 1, 8
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A
+	map_script_2 VAR_0x4092, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C
+	map_script_2 VAR_0x4092, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964
+	map_script_2 VAR_0x4092, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D
+	map_script_2 VAR_0x408C, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE
+	map_script_2 VAR_0x4082, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2
+	.2byte 0
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964
+	lockall
+	msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, 4
+	closemessage
+	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F898A
+	applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A
+	waitmovement 0
+	warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1
+	waitstate
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_1F_Movement_1F898A: @ 81F898A
+	walk_up
+	step_end
+
+LittlerootTown_MaysHouse_1F_EventScript_1F898C:: @ 81F898C
+	lockall
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	goto LittlerootTown_MaysHouse_1F_EventScript_292704
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_1F899D:: @ 81F899D
+	lockall
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	goto LittlerootTown_MaysHouse_1F_EventScript_2928DC
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE
+	lockall
+	playse SE_PIN
+	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_272598
+	waitmovement 0
+	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_27259A
+	waitmovement 0
+	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8
+	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC
+	waitmovement 0
+	special GetRivalSonDaughterString
+	msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, 4
+	setflag FLAG_0x057
+	setvar VAR_0x408C, 2
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_1F_Movement_1F89EC: @ 81F89EC
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3
+LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3
+	lock
+	faceplayer
+	checkflag FLAG_0x082
+	goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A33
+	checkflag FLAG_SYS_POKEMON_GET
+	goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A29
+	compare VAR_0x408D, 3
+	goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F
+	special GetRivalSonDaughterString
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, 4
+	release
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F:: @ 81F8A1F
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D37, 4
+	release
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F8A29:: @ 81F8A29
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D93, 4
+	release
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F8A33:: @ 81F8A33
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8E01, 4
+	release
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D:: @ 81F8A3D
+LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D
+	lock
+	faceplayer
+	special GetPlayerBigGuyGirlString
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, 4
+	release
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C
+	lockall
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	applymovement VAR_0x8004, LittlerootTown_MaysHouse_1F_Movement_2725A8
+	waitmovement 0
+	goto LittlerootTown_MaysHouse_1F_EventScript_292765
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8A67:: @ 81F8A67
+	lockall
+	setvar VAR_0x8008, 0
+	goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8A73:: @ 81F8A73
+	lockall
+	setvar VAR_0x8008, 1
+	goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8A7F:: @ 81F8A7F
+	lockall
+	setvar VAR_0x8008, 2
+	goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
+	playse SE_KAIDAN
+	delay 10
+	addobject 7
+	delay 30
+	playse SE_PIN
+	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_272598
+	waitmovement 0
+	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A
+	waitmovement 0
+	compare VAR_0x8008, 1
+	call_if 5, LittlerootTown_MaysHouse_1F_EventScript_1F8B2A
+	playbgm MUS_GIRL_SUP, 1
+	compare VAR_0x8008, 0
+	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B35
+	compare VAR_0x8008, 1
+	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B40
+	compare VAR_0x8008, 2
+	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B4B
+	msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, 4
+	closemessage
+	compare VAR_0x8008, 0
+	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B6A
+	compare VAR_0x8008, 1
+	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B7C
+	compare VAR_0x8008, 2
+	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B8E
+	playse SE_KAIDAN
+	removeobject 7
+	setflag FLAG_0x2EA
+	setflag FLAG_0x332
+	clearflag FLAG_0x2D2
+	delay 30
+	setvar VAR_0x408D, 3
+	setvar VAR_0x4050, 1
+	savebgm MUS_DUMMY
+	fadedefaultbgm
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A
+	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725AA
+	waitmovement 0
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8B35:: @ 81F8B35
+	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B56
+	waitmovement 0
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8B40:: @ 81F8B40
+	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B5E
+	waitmovement 0
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8B4B:: @ 81F8B4B
+	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B62
+	waitmovement 0
+	return
+
+LittlerootTown_MaysHouse_1F_Movement_1F8B56: @ 81F8B56
+	walk_in_place_fastest_left
+	walk_left
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_MaysHouse_1F_Movement_1F8B5E: @ 81F8B5E
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62
+	walk_in_place_fastest_right
+	walk_right
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8B6A:: @ 81F8B6A
+	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BA0
+	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BAF
+	waitmovement 0
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8B7C:: @ 81F8B7C
+	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BA4
+	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BB5
+	waitmovement 0
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_1F8B8E:: @ 81F8B8E
+	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BAB
+	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BBF
+	waitmovement 0
+	return
+
+LittlerootTown_MaysHouse_1F_Movement_1F8BA0: @ 81F8BA0
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
+	step_end
+
+LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_MaysHouse_1F_Movement_1F8BAB: @ 81F8BAB
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
+	step_end
+
+LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF
+	walk_in_place_fastest_right
+	walk_right
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5
+	walk_in_place_fastest_right
+	walk_right
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	walk_left
+	walk_in_place_fastest_up
+	walk_up
+	step_end
+
+LittlerootTown_MaysHouse_1F_Movement_1F8BBF: @ 81F8BBF
+	walk_in_place_fastest_left
+	walk_left
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_BrendansHouse_1F_Text_1F8BC5: @ 81F8BC5
+LittlerootTown_MaysHouse_1F_Text_1F8BC5: @ 81F8BC5
+	.string "Oh, hello. And you are?\p"
+	.string "… … … … … … … … …\n"
+	.string "… … … … … … … … …\p"
+	.string "Oh, you’re {PLAYER}{KUN}, our new next-door\n"
+	.string "neighbor! Hi!\p"
+	.string "We have a {STR_VAR_1} about the same\n"
+	.string "age as you.\p"
+	.string "Our {STR_VAR_1} was excited about making\n"
+	.string "a new friend.\p"
+	.string "Our {STR_VAR_1} is upstairs, I think.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F8CA5: @ 81F8CA5
+	.string "Like child, like father.\p"
+	.string "My husband is as wild about POKéMON\n"
+	.string "as our child.\p"
+	.string "If he’s not at his LAB, he’s likely\n"
+	.string "scrabbling about in grassy places.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F8D37: @ 81F8D37
+	.string "That {RIVAL}!\p"
+	.string "I guess our child is too busy with\n"
+	.string "POKéMON to notice that you came\l"
+	.string "to visit, {PLAYER}{KUN}.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F8D93: @ 81F8D93
+	.string "Oh, {RIVAL} went out to ROUTE 103\n"
+	.string "just a little while ago.\p"
+	.string "Like father, like child.\n"
+	.string "{RIVAL} can’t stay quietly at home.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F8E01: @ 81F8E01
+	.string "I think it’s wonderful for people to\n"
+	.string "travel with POKéMON.\p"
+	.string "But you should go home every so often\n"
+	.string "to let your mother know you’re okay.\p"
+	.string "She might not say it, but I’m sure she\n"
+	.string "worries about you, {PLAYER}{KUN}.$"
+
+LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6
+	.string "Huh?\n"
+	.string "Who… Who are you?\p"
+	.string "… … … … … … … …\n"
+	.string "… … … … … … … …\p"
+	.string "Oh, you’re {PLAYER}{KUN}.\n"
+	.string "So your move was today.\p"
+	.string "Um… I’m MAY.\n"
+	.string "Glad to meet you!\p"
+	.string "I…\n"
+	.string "I have this dream of becoming friends\l"
+	.string "with POKéMON all over the world.\p"
+	.string "I… I heard about you, {PLAYER}{KUN}, from\n"
+	.string "my dad, PROF. BIRCH.\p"
+	.string "I was hoping that you would be nice,\n"
+	.string "{PLAYER}{KUN}, and that we could be friends.\p"
+	.string "Oh, this is silly, isn’t it?\n"
+	.string "I… I’ve just met you, {PLAYER}{KUN}.\p"
+	.string "Eheheh…\p"
+	.string "Oh, no! I forgot!\p"
+	.string "I was supposed to go help Dad catch\n"
+	.string "some wild POKéMON!\p"
+	.string "{PLAYER}{KUN}, I’ll catch you later!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F90B4: @ 81F90B4
+	.string "Hey!\n"
+	.string "You…\p"
+	.string "Who are you?\p"
+	.string "Oh, you’re {PLAYER}, aren’t you?\n"
+	.string "Moved in next door, right?\p"
+	.string "I didn’t know that you’re a girl.\p"
+	.string "Dad, PROF. BIRCH, said that our new\n"
+	.string "next-door neighbor is a GYM LEADER’s\l"
+	.string "kid, so I assumed you’d be a guy.\p"
+	.string "My name’s BRENDAN.\n"
+	.string "So, hi, neighbor!\p"
+	.string "Huh? Hey, {PLAYER}, don’t you have\n"
+	.string "a POKéMON?\p"
+	.string "Do you want me to go catch you one?\p"
+	.string "Aw, darn, I forgot…\p"
+	.string "I’m supposed to go help my dad catch\n"
+	.string "some wild POKéMON.\p"
+	.string "Some other time, okay?$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F9262: @ 81F9262
+	.string "Hi, neighbor!\p"
+	.string "Do you already have your\n"
+	.string "own POKéMON?$"
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
new file mode 100644
index 000000000..a5f1dd43c
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
@@ -0,0 +1,30 @@
+LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480
+	object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, 185
+	object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, 757
+	object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, 8, 1, 1, 0, 0, 0x0, 849
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, 1, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818
+
+LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600
+	warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F
+
+LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608
+	bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F865F
+	bg_event 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F8656
+	bg_event 3, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_29278D
+	bg_event 8, 1, 0, 0, 0, gUnknown_081F9553
+
+LittlerootTown_MaysHouse_2F_MapEvents:: @ 852D638
+	map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents
+
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
index a22e64716..20e9e3f5a 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
@@ -1,5 +1,5 @@
 LittlerootTown_MaysHouse_2F: @ 8482B48
-	.4byte LittlerootTown_MaysHouse_2F_MapAttributes
+	.4byte LittlerootTown_MaysHouse_2F_Layout
 	.4byte LittlerootTown_MaysHouse_2F_MapEvents
 	.4byte LittlerootTown_MaysHouse_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
index 5501f5ad5..5501f5ad5 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
new file mode 100644
index 000000000..a4596ce5c
--- /dev/null
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
@@ -0,0 +1,32 @@
+LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, 2, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0
+	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721
+	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838
+
+LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC
+	warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN
+	warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN
+
+LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC
+	bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3
+	bg_event 11, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3
+	bg_event 7, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD
+	bg_event 8, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD
+	bg_event 1, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+	bg_event 0, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+	bg_event 1, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+	bg_event 2, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+	bg_event 3, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+	bg_event 4, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+	bg_event 3, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+	bg_event 1, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+	bg_event 1, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+	bg_event 11, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+	bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+
+LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 852D7A0
+	map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents
+
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
index c58220612..8cd5eaf79 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
@@ -1,5 +1,5 @@
 LittlerootTown_ProfessorBirchsLab: @ 8482B64
-	.4byte LittlerootTown_ProfessorBirchsLab_MapAttributes
+	.4byte LittlerootTown_ProfessorBirchsLab_Layout
 	.4byte LittlerootTown_ProfessorBirchsLab_MapEvents
 	.4byte LittlerootTown_ProfessorBirchsLab_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 75b83b6a1..75b83b6a1 100644
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc
new file mode 100644
index 000000000..1274e2373
--- /dev/null
+++ b/data/maps/MagmaHideout_1F/events.inc
@@ -0,0 +1,17 @@
+MagmaHideout_1F_EventObjects: @ 85371CC
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, 10, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, 857
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, 1, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, 9, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19
+
+MagmaHideout_1F_MapWarps: @ 853725C
+	warp_def 10, 34, 3, 4, MAP_JAGGED_PASS
+	warp_def 25, 34, 3, 1, MAP_MAGMA_HIDEOUT_2F_1R
+	warp_def 31, 3, 0, 1, MAP_MAGMA_HIDEOUT_2F_2R
+	warp_def 20, 22, 0, 0, MAP_MAGMA_HIDEOUT_2F_3R
+
+MagmaHideout_1F_MapEvents:: @ 853727C
+	map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc
index eab20d0d0..6158ed3cb 100644
--- a/data/maps/MagmaHideout_1F/header.inc
+++ b/data/maps/MagmaHideout_1F/header.inc
@@ -1,5 +1,5 @@
 MagmaHideout_1F: @ 8484828
-	.4byte MagmaHideout_1F_MapAttributes
+	.4byte MagmaHideout_1F_Layout
 	.4byte MagmaHideout_1F_MapEvents
 	.4byte MagmaHideout_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/scripts.inc
index 0e133a890..0e133a890 100644
--- a/data/scripts/maps/MagmaHideout_1F.inc
+++ b/data/maps/MagmaHideout_1F/scripts.inc
diff --git a/data/maps/MagmaHideout_2F_1R/events.inc b/data/maps/MagmaHideout_2F_1R/events.inc
new file mode 100644
index 000000000..32f835efc
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_1R/events.inc
@@ -0,0 +1,14 @@
+MagmaHideout_2F_1R_EventObjects: @ 8537290
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, 51, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, 46, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, 10, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, 7, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857
+
+MagmaHideout_2F_1R_MapWarps: @ 85372F0
+	warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R
+	warp_def 8, 2, 0, 1, MAP_MAGMA_HIDEOUT_1F
+	warp_def 17, 33, 3, 2, MAP_MAGMA_HIDEOUT_3F_1R
+
+MagmaHideout_2F_1R_MapEvents:: @ 8537308
+	map_events MagmaHideout_2F_1R_EventObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc
index ff19befab..1a685fe55 100644
--- a/data/maps/MagmaHideout_2F_1R/header.inc
+++ b/data/maps/MagmaHideout_2F_1R/header.inc
@@ -1,5 +1,5 @@
 MagmaHideout_2F_1R: @ 8484844
-	.4byte MagmaHideout_2F_1R_MapAttributes
+	.4byte MagmaHideout_2F_1R_Layout
 	.4byte MagmaHideout_2F_1R_MapEvents
 	.4byte MagmaHideout_2F_1R_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MagmaHideout_2F_1R.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc
index 33252bb57..33252bb57 100644
--- a/data/scripts/maps/MagmaHideout_2F_1R.inc
+++ b/data/maps/MagmaHideout_2F_1R/scripts.inc
diff --git a/data/maps/MagmaHideout_2F_2R/events.inc b/data/maps/MagmaHideout_2F_2R/events.inc
new file mode 100644
index 000000000..5567bf9cf
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_2R/events.inc
@@ -0,0 +1,15 @@
+MagmaHideout_2F_2R_EventObjects: @ 853731C
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, 9, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, 10, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, 1, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, 8, 1, 1, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, 10, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, 1, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165
+
+MagmaHideout_2F_2R_MapWarps: @ 85373AC
+	warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R
+	warp_def 36, 4, 0, 2, MAP_MAGMA_HIDEOUT_1F
+
+MagmaHideout_2F_2R_MapEvents:: @ 85373BC
+	map_events MagmaHideout_2F_2R_EventObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc
index 8fe07f9ca..410522097 100644
--- a/data/maps/MagmaHideout_2F_2R/header.inc
+++ b/data/maps/MagmaHideout_2F_2R/header.inc
@@ -1,5 +1,5 @@
 MagmaHideout_2F_2R: @ 8484860
-	.4byte MagmaHideout_2F_2R_MapAttributes
+	.4byte MagmaHideout_2F_2R_Layout
 	.4byte MagmaHideout_2F_2R_MapEvents
 	.4byte MagmaHideout_2F_2R_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MagmaHideout_2F_2R.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc
index 8b1e51f16..8b1e51f16 100644
--- a/data/scripts/maps/MagmaHideout_2F_2R.inc
+++ b/data/maps/MagmaHideout_2F_2R/scripts.inc
diff --git a/data/maps/MagmaHideout_2F_3R/events.inc b/data/maps/MagmaHideout_2F_3R/events.inc
new file mode 100644
index 000000000..ca379a0c7
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_3R/events.inc
@@ -0,0 +1,7 @@
+MagmaHideout_2F_3R_MapWarps: @ 85375B0
+	warp_def 16, 1, 0, 3, MAP_MAGMA_HIDEOUT_1F
+	warp_def 16, 13, 0, 0, MAP_MAGMA_HIDEOUT_3F_3R
+
+MagmaHideout_2F_3R_MapEvents:: @ 85375C0
+	map_events 0x0, MagmaHideout_2F_3R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc
index 45ea7c94b..407408bf3 100644
--- a/data/maps/MagmaHideout_2F_3R/header.inc
+++ b/data/maps/MagmaHideout_2F_3R/header.inc
@@ -1,5 +1,5 @@
 MagmaHideout_2F_3R: @ 84848EC
-	.4byte MagmaHideout_2F_3R_MapAttributes
+	.4byte MagmaHideout_2F_3R_Layout
 	.4byte MagmaHideout_2F_3R_MapEvents
 	.4byte MagmaHideout_2F_3R_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MagmaHideout_2F_3R.inc b/data/maps/MagmaHideout_2F_3R/scripts.inc
index cbcb3fd52..cbcb3fd52 100644
--- a/data/scripts/maps/MagmaHideout_2F_3R.inc
+++ b/data/maps/MagmaHideout_2F_3R/scripts.inc
diff --git a/data/maps/MagmaHideout_3F_1R/events.inc b/data/maps/MagmaHideout_3F_1R/events.inc
new file mode 100644
index 000000000..b2f157f57
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_1R/events.inc
@@ -0,0 +1,13 @@
+MagmaHideout_3F_1R_EventObjects: @ 85373D0
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, 10, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, 9, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, 1, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166
+
+MagmaHideout_3F_1R_MapWarps: @ 8537418
+	warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F
+	warp_def 21, 9, 0, 0, MAP_MAGMA_HIDEOUT_3F_2R
+	warp_def 23, 3, 0, 2, MAP_MAGMA_HIDEOUT_2F_1R
+
+MagmaHideout_3F_1R_MapEvents:: @ 8537430
+	map_events MagmaHideout_3F_1R_EventObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc
index 70ce39e74..228b197eb 100644
--- a/data/maps/MagmaHideout_3F_1R/header.inc
+++ b/data/maps/MagmaHideout_3F_1R/header.inc
@@ -1,5 +1,5 @@
 MagmaHideout_3F_1R: @ 848487C
-	.4byte MagmaHideout_3F_1R_MapAttributes
+	.4byte MagmaHideout_3F_1R_Layout
 	.4byte MagmaHideout_3F_1R_MapEvents
 	.4byte MagmaHideout_3F_1R_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MagmaHideout_3F_1R.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc
index 068e71492..068e71492 100644
--- a/data/scripts/maps/MagmaHideout_3F_1R.inc
+++ b/data/maps/MagmaHideout_3F_1R/scripts.inc
diff --git a/data/maps/MagmaHideout_3F_2R/events.inc b/data/maps/MagmaHideout_3F_2R/events.inc
new file mode 100644
index 000000000..27ea129c3
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_2R/events.inc
@@ -0,0 +1,10 @@
+MagmaHideout_3F_2R_EventObjects: @ 8537444
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, 17, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, 1, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167
+
+MagmaHideout_3F_2R_MapWarps: @ 8537474
+	warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R
+
+MagmaHideout_3F_2R_MapEvents:: @ 853747C
+	map_events MagmaHideout_3F_2R_EventObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc
index 74266da9c..d070dd32a 100644
--- a/data/maps/MagmaHideout_3F_2R/header.inc
+++ b/data/maps/MagmaHideout_3F_2R/header.inc
@@ -1,5 +1,5 @@
 MagmaHideout_3F_2R: @ 8484898
-	.4byte MagmaHideout_3F_2R_MapAttributes
+	.4byte MagmaHideout_3F_2R_Layout
 	.4byte MagmaHideout_3F_2R_MapEvents
 	.4byte MagmaHideout_3F_2R_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MagmaHideout_3F_2R.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc
index 15d0c26ea..15d0c26ea 100644
--- a/data/scripts/maps/MagmaHideout_3F_2R.inc
+++ b/data/maps/MagmaHideout_3F_2R/scripts.inc
diff --git a/data/maps/MagmaHideout_3F_3R/events.inc b/data/maps/MagmaHideout_3F_3R/events.inc
new file mode 100644
index 000000000..3f96b5652
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_3R/events.inc
@@ -0,0 +1,10 @@
+MagmaHideout_3F_3R_EventObjects: @ 8537574
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, 1, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059
+
+MagmaHideout_3F_3R_MapWarps: @ 853758C
+	warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R
+	warp_def 16, 21, 0, 1, MAP_MAGMA_HIDEOUT_4F
+
+MagmaHideout_3F_3R_MapEvents:: @ 853759C
+	map_events MagmaHideout_3F_3R_EventObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc
index 5c1cdc9de..24ed48ff5 100644
--- a/data/maps/MagmaHideout_3F_3R/header.inc
+++ b/data/maps/MagmaHideout_3F_3R/header.inc
@@ -1,5 +1,5 @@
 MagmaHideout_3F_3R: @ 84848D0
-	.4byte MagmaHideout_3F_3R_MapAttributes
+	.4byte MagmaHideout_3F_3R_Layout
 	.4byte MagmaHideout_3F_3R_MapEvents
 	.4byte MagmaHideout_3F_3R_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MagmaHideout_3F_3R.inc b/data/maps/MagmaHideout_3F_3R/scripts.inc
index e85cff9a3..e85cff9a3 100644
--- a/data/scripts/maps/MagmaHideout_3F_3R.inc
+++ b/data/maps/MagmaHideout_3F_3R/scripts.inc
diff --git a/data/maps/MagmaHideout_4F/events.inc b/data/maps/MagmaHideout_4F/events.inc
new file mode 100644
index 000000000..1865c3b84
--- /dev/null
+++ b/data/maps/MagmaHideout_4F/events.inc
@@ -0,0 +1,17 @@
+MagmaHideout_4F_EventObjects: @ 8537490
+	object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, 8, 1, 1, 0, 0, 0x0, 853
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, 10, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, 9, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, 10, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, 8, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857
+	object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, 7, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, 857
+	object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, 8, 1, 1, 0, 0, 0x0, 850
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, 1, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168
+
+MagmaHideout_4F_MapWarps: @ 8537550
+	warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R
+	warp_def 20, 21, 0, 1, MAP_MAGMA_HIDEOUT_3F_3R
+
+MagmaHideout_4F_MapEvents:: @ 8537560
+	map_events MagmaHideout_4F_EventObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc
index 441643653..45b5a40e6 100644
--- a/data/maps/MagmaHideout_4F/header.inc
+++ b/data/maps/MagmaHideout_4F/header.inc
@@ -1,5 +1,5 @@
 MagmaHideout_4F: @ 84848B4
-	.4byte MagmaHideout_4F_MapAttributes
+	.4byte MagmaHideout_4F_Layout
 	.4byte MagmaHideout_4F_MapEvents
 	.4byte MagmaHideout_4F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MagmaHideout_4F.inc b/data/maps/MagmaHideout_4F/scripts.inc
index 0cc0fea56..0cc0fea56 100644
--- a/data/scripts/maps/MagmaHideout_4F.inc
+++ b/data/maps/MagmaHideout_4F/scripts.inc
diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc
new file mode 100644
index 000000000..14903539b
--- /dev/null
+++ b/data/maps/MarineCave_End/events.inc
@@ -0,0 +1,12 @@
+MarineCave_End_EventObjects: @ 85377E8
+	object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, 8, 1, 1, 0, 0, 0x0, 782
+
+MarineCave_End_MapWarps: @ 8537800
+	warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE
+
+MarineCave_End_MapCoordEvents: @ 8537808
+	coord_event 9, 26, 3, 0, VAR_TEMP_1, 1, 0, MarineCave_End_EventScript_23B01B
+
+MarineCave_End_MapEvents:: @ 8537818
+	map_events MarineCave_End_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0
+
diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc
index 2eda73be9..8e3cf5a5f 100644
--- a/data/maps/MarineCave_End/header.inc
+++ b/data/maps/MarineCave_End/header.inc
@@ -1,5 +1,5 @@
 MarineCave_End: @ 8484A04
-	.4byte MarineCave_End_MapAttributes
+	.4byte MarineCave_End_Layout
 	.4byte MarineCave_End_MapEvents
 	.4byte MarineCave_End_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MarineCave_End.inc b/data/maps/MarineCave_End/scripts.inc
index 9c821e14f..9c821e14f 100644
--- a/data/scripts/maps/MarineCave_End.inc
+++ b/data/maps/MarineCave_End/scripts.inc
diff --git a/data/maps/MarineCave_Entrance/events.inc b/data/maps/MarineCave_Entrance/events.inc
new file mode 100644
index 000000000..4db3e1ddc
--- /dev/null
+++ b/data/maps/MarineCave_Entrance/events.inc
@@ -0,0 +1,6 @@
+MarineCave_Entrance_MapWarps: @ 85377CC
+	warp_def 14, 1, 3, 0, MAP_MARINE_CAVE_END
+
+MarineCave_Entrance_MapEvents:: @ 85377D4
+	map_events 0x0, MarineCave_Entrance_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc
index a1e97eb95..17212c4f6 100644
--- a/data/maps/MarineCave_Entrance/header.inc
+++ b/data/maps/MarineCave_Entrance/header.inc
@@ -1,5 +1,5 @@
 MarineCave_Entrance: @ 84849E8
-	.4byte MarineCave_Entrance_MapAttributes
+	.4byte MarineCave_Entrance_Layout
 	.4byte MarineCave_Entrance_MapEvents
 	.4byte MarineCave_Entrance_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MarineCave_Entrance/scripts.inc b/data/maps/MarineCave_Entrance/scripts.inc
new file mode 100644
index 000000000..24b288050
--- /dev/null
+++ b/data/maps/MarineCave_Entrance/scripts.inc
@@ -0,0 +1,8 @@
+MarineCave_Entrance_MapScripts:: @ 823AFD0
+	map_script 5, MarineCave_Entrance_MapScript1_23AFD6
+	.byte 0
+
+MarineCave_Entrance_MapScript1_23AFD6: @ 823AFD6
+	setdivewarp MAP_UNDERWATER_MARINE_CAVE, 255, 9, 6
+	end
+
diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc
index 172a7bc05..ee1f4e72a 100644
--- a/data/maps/MauvilleCity/connections.inc
+++ b/data/maps/MauvilleCity/connections.inc
@@ -1,8 +1,8 @@
 MauvilleCity_MapConnectionsList: @ 8486720
-	connection up, 0, ROUTE_111, 0
-	connection down, 0, ROUTE_110, 0
-	connection left, 0, ROUTE_117, 0
-	connection right, 0, ROUTE_118, 0
+	connection up, 0, MAP_ROUTE111
+	connection down, 0, MAP_ROUTE110
+	connection left, 0, MAP_ROUTE117
+	connection right, 0, MAP_ROUTE118
 
 MauvilleCity_MapConnections: @ 8486750
 	.4byte 0x4
diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc
new file mode 100644
index 000000000..c8318005c
--- /dev/null
+++ b/data/maps/MauvilleCity/events.inc
@@ -0,0 +1,35 @@
+MauvilleCity_EventObjects: @ 852662C
+	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, 5, 1, 1, 0, 0, MauvilleCity_EventScript_1DF3B3, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0
+	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0
+	object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804
+	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805
+	object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, 1, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, 1116
+	object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0
+	object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765
+
+MauvilleCity_MapWarps: @ 8526734
+	warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM
+	warp_def 22, 5, 0, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F
+	warp_def 35, 5, 0, 0, MAP_MAUVILLE_CITY_BIKE_SHOP
+	warp_def 23, 14, 0, 0, MAP_MAUVILLE_CITY_MART
+	warp_def 32, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE1
+	warp_def 8, 13, 0, 0, MAP_MAUVILLE_CITY_GAME_CORNER
+	warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2
+
+MauvilleCity_MapBGEvents: @ 852676C
+	bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_271E73
+	bg_event 11, 6, 3, 0, 0, MauvilleCity_EventScript_1DF3E0
+	bg_event 24, 14, 0, 1, 0, MauvilleCity_EventScript_271E6A
+	bg_event 25, 14, 0, 1, 0, MauvilleCity_EventScript_271E6A
+	bg_event 24, 5, 0, 1, 0, MauvilleCity_EventScript_271E73
+	bg_event 19, 7, 0, 0, 0, MauvilleCity_EventScript_1DF3D7
+	bg_event 33, 6, 0, 0, 0, MauvilleCity_EventScript_1DF3E9
+	bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_1DF3F2
+
+MauvilleCity_MapEvents:: @ 85267CC
+	map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents
+
diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc
index f8dada766..6e83a33bd 100644
--- a/data/maps/MauvilleCity/header.inc
+++ b/data/maps/MauvilleCity/header.inc
@@ -1,5 +1,5 @@
 MauvilleCity: @ 84824F0
-	.4byte MauvilleCity_MapAttributes
+	.4byte MauvilleCity_Layout
 	.4byte MauvilleCity_MapEvents
 	.4byte MauvilleCity_MapScripts
 	.4byte MauvilleCity_MapConnections
diff --git a/data/scripts/maps/MauvilleCity.inc b/data/maps/MauvilleCity/scripts.inc
index abb527d7f..abb527d7f 100644
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/maps/MauvilleCity/scripts.inc
diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc
new file mode 100644
index 000000000..b4c0d19df
--- /dev/null
+++ b/data/maps/MauvilleCity_BikeShop/events.inc
@@ -0,0 +1,15 @@
+MauvilleCity_BikeShop_EventObjects: @ 852FE80
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, 2, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0
+
+MauvilleCity_BikeShop_MapWarps: @ 852FEB0
+	warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY
+	warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY
+
+MauvilleCity_BikeShop_MapBGEvents: @ 852FEC0
+	bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED3A
+	bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EDAE
+
+MauvilleCity_BikeShop_MapEvents:: @ 852FED8
+	map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents
+
diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc
index 723d61151..8b7ecd54d 100644
--- a/data/maps/MauvilleCity_BikeShop/header.inc
+++ b/data/maps/MauvilleCity_BikeShop/header.inc
@@ -1,5 +1,5 @@
 MauvilleCity_BikeShop: @ 8483280
-	.4byte MauvilleCity_BikeShop_MapAttributes
+	.4byte MauvilleCity_BikeShop_Layout
 	.4byte MauvilleCity_BikeShop_MapEvents
 	.4byte MauvilleCity_BikeShop_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc
index 0231e5bde..0231e5bde 100644
--- a/data/scripts/maps/MauvilleCity_BikeShop.inc
+++ b/data/maps/MauvilleCity_BikeShop/scripts.inc
diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc
new file mode 100644
index 000000000..a956f16d8
--- /dev/null
+++ b/data/maps/MauvilleCity_GameCorner/events.inc
@@ -0,0 +1,47 @@
+MauvilleCity_GameCorner_EventObjects: @ 852FF28
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0
+	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0
+	object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0
+	object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, 8, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0
+	object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, 10, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0
+	object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0
+	object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0
+
+MauvilleCity_GameCorner_MapWarps: @ 8530048
+	warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY
+	warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY
+
+MauvilleCity_GameCorner_MapBGEvents: @ 8530058
+	bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2102D6
+	bg_event 2, 8, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2102F6
+	bg_event 2, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_210316
+	bg_event 3, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210336
+	bg_event 3, 8, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210356
+	bg_event 3, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210376
+	bg_event 7, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_210396
+	bg_event 7, 7, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2103B6
+	bg_event 7, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2103D6
+	bg_event 8, 6, 0, 4, 0, MauvilleCity_GameCorner_EventScript_2103F6
+	bg_event 8, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210416
+	bg_event 8, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210436
+	bg_event 14, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
+	bg_event 15, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
+	bg_event 14, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
+	bg_event 15, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
+	bg_event 14, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
+	bg_event 15, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
+	bg_event 18, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
+	bg_event 19, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
+	bg_event 18, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
+	bg_event 19, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
+	bg_event 18, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
+	bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
+
+MauvilleCity_GameCorner_MapEvents:: @ 8530178
+	map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents
+
diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc
index 9ef8ce976..11a71f8c6 100644
--- a/data/maps/MauvilleCity_GameCorner/header.inc
+++ b/data/maps/MauvilleCity_GameCorner/header.inc
@@ -1,5 +1,5 @@
 MauvilleCity_GameCorner: @ 84832B8
-	.4byte MauvilleCity_GameCorner_MapAttributes
+	.4byte MauvilleCity_GameCorner_Layout
 	.4byte MauvilleCity_GameCorner_MapEvents
 	.4byte MauvilleCity_GameCorner_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc
index 400a24c24..400a24c24 100644
--- a/data/scripts/maps/MauvilleCity_GameCorner.inc
+++ b/data/maps/MauvilleCity_GameCorner/scripts.inc
diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc
new file mode 100644
index 000000000..08c8db444
--- /dev/null
+++ b/data/maps/MauvilleCity_Gym/events.inc
@@ -0,0 +1,26 @@
+MauvilleCity_Gym_EventObjects: @ 852FD5C
+	object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 8, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, 7, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 13, 0, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0
+	object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, 7, 1, 1, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0
+
+MauvilleCity_Gym_MapWarps: @ 852FE04
+	warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY
+	warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY
+
+MauvilleCity_Gym_MapCoordEvents: @ 852FE14
+	coord_event 4, 12, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E01E
+	coord_event 3, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E043
+	coord_event 0, 15, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20DFF9
+	coord_event 8, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E068
+
+MauvilleCity_Gym_MapBGEvents: @ 852FE54
+	bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_20E14B
+	bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_20E15B
+
+MauvilleCity_Gym_MapEvents:: @ 852FE6C
+	map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents
+
diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc
index 343a2f01a..aa6430475 100644
--- a/data/maps/MauvilleCity_Gym/header.inc
+++ b/data/maps/MauvilleCity_Gym/header.inc
@@ -1,5 +1,5 @@
 MauvilleCity_Gym: @ 8483264
-	.4byte MauvilleCity_Gym_MapAttributes
+	.4byte MauvilleCity_Gym_Layout
 	.4byte MauvilleCity_Gym_MapEvents
 	.4byte MauvilleCity_Gym_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/scripts.inc
index 049833db0..049833db0 100644
--- a/data/scripts/maps/MauvilleCity_Gym.inc
+++ b/data/maps/MauvilleCity_Gym/scripts.inc
diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc
new file mode 100644
index 000000000..2590e33b9
--- /dev/null
+++ b/data/maps/MauvilleCity_House1/events.inc
@@ -0,0 +1,10 @@
+MauvilleCity_House1_EventObjects: @ 852FEEC
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0
+
+MauvilleCity_House1_MapWarps: @ 852FF04
+	warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY
+	warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY
+
+MauvilleCity_House1_MapEvents:: @ 852FF14
+	map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc
index 1cf42f8cf..db4371175 100644
--- a/data/maps/MauvilleCity_House1/header.inc
+++ b/data/maps/MauvilleCity_House1/header.inc
@@ -1,5 +1,5 @@
 MauvilleCity_House1: @ 848329C
-	.4byte MauvilleCity_House1_MapAttributes
+	.4byte House2_Layout
 	.4byte MauvilleCity_House1_MapEvents
 	.4byte MauvilleCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/scripts.inc
index b36e116db..b36e116db 100644
--- a/data/scripts/maps/MauvilleCity_House1.inc
+++ b/data/maps/MauvilleCity_House1/scripts.inc
diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc
new file mode 100644
index 000000000..f8e04f5ea
--- /dev/null
+++ b/data/maps/MauvilleCity_House2/events.inc
@@ -0,0 +1,10 @@
+MauvilleCity_House2_EventObjects: @ 853018C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0
+
+MauvilleCity_House2_MapWarps: @ 85301A4
+	warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY
+	warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY
+
+MauvilleCity_House2_MapEvents:: @ 85301B4
+	map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc
index c1d2da264..4acd48c6d 100644
--- a/data/maps/MauvilleCity_House2/header.inc
+++ b/data/maps/MauvilleCity_House2/header.inc
@@ -1,5 +1,5 @@
 MauvilleCity_House2: @ 84832D4
-	.4byte MauvilleCity_House2_MapAttributes
+	.4byte House1_Layout
 	.4byte MauvilleCity_House2_MapEvents
 	.4byte MauvilleCity_House2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/scripts.inc
index 7a1a1cad1..7a1a1cad1 100644
--- a/data/scripts/maps/MauvilleCity_House2.inc
+++ b/data/maps/MauvilleCity_House2/scripts.inc
diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc
new file mode 100644
index 000000000..f67840783
--- /dev/null
+++ b/data/maps/MauvilleCity_Mart/events.inc
@@ -0,0 +1,12 @@
+MauvilleCity_Mart_EventObjects: @ 8530310
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0
+
+MauvilleCity_Mart_MapWarps: @ 8530358
+	warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY
+	warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY
+
+MauvilleCity_Mart_MapEvents:: @ 8530368
+	map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc
index c8f5dfb88..3130c2d35 100644
--- a/data/maps/MauvilleCity_Mart/header.inc
+++ b/data/maps/MauvilleCity_Mart/header.inc
@@ -1,5 +1,5 @@
 MauvilleCity_Mart: @ 8483328
-	.4byte MauvilleCity_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte MauvilleCity_Mart_MapEvents
 	.4byte MauvilleCity_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/scripts.inc
index 56ee9497f..56ee9497f 100644
--- a/data/scripts/maps/MauvilleCity_Mart.inc
+++ b/data/maps/MauvilleCity_Mart/scripts.inc
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..adab7d3e4
--- /dev/null
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,15 @@
+MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, 3, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0
+	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, 1, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0
+
+MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240
+	warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY
+	warp_def 6, 8, 3, 1, MAP_MAUVILLE_CITY
+	warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F
+
+MauvilleCity_PokemonCenter_1F_MapEvents:: @ 8530258
+	map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
index 39a942e6f..5bb682b98 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 MauvilleCity_PokemonCenter_1F: @ 84832F0
-	.4byte MauvilleCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte MauvilleCity_PokemonCenter_1F_MapEvents
 	.4byte MauvilleCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
index fb76a5fc7..fb76a5fc7 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..c3a0c4990
--- /dev/null
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,15 @@
+MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, 7, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0
+
+MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4
+	warp_def 1, 6, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+MauvilleCity_PokemonCenter_2F_MapEvents:: @ 85302FC
+	map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
index c09589b5a..d29063e86 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 MauvilleCity_PokemonCenter_2F: @ 848330C
-	.4byte MauvilleCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte MauvilleCity_PokemonCenter_2F_MapEvents
 	.4byte MauvilleCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
index c430b4440..c430b4440 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc
new file mode 100644
index 000000000..977559950
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_1R/events.inc
@@ -0,0 +1,29 @@
+MeteorFalls_1F_1R_EventObjects: @ 8533F74
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, 939
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, 939
+	object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938
+	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, 938
+	object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942
+
+MeteorFalls_1F_1R_MapWarps: @ 8534064
+	warp_def 27, 18, 4, 0, MAP_ROUTE114
+	warp_def 6, 39, 3, 0, MAP_ROUTE115
+	warp_def 10, 3, 3, 0, MAP_METEOR_FALLS_1F_2R
+	warp_def 5, 4, 3, 4, MAP_METEOR_FALLS_B1F_1R
+	warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R
+	warp_def 4, 2, 0, 0, MAP_METEOR_FALLS_STEVENS_CAVE
+
+MeteorFalls_1F_1R_MapCoordEvents: @ 8534094
+	coord_event 14, 18, 4, 0, VAR_0x40BF, 0, 0, MeteorFalls_1F_1R_EventScript_22BD5F
+
+MeteorFalls_1F_1R_MapBGEvents: @ 85340A4
+	bg_event 9, 58, 0, 0, 0, 0x0
+
+MeteorFalls_1F_1R_MapEvents:: @ 85340B0
+	map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents
+
diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc
index 6ec850978..1b1371370 100644
--- a/data/maps/MeteorFalls_1F_1R/header.inc
+++ b/data/maps/MeteorFalls_1F_1R/header.inc
@@ -1,5 +1,5 @@
 MeteorFalls_1F_1R: @ 8483EC0
-	.4byte MeteorFalls_1F_1R_MapAttributes
+	.4byte MeteorFalls_1F_1R_Layout
 	.4byte MeteorFalls_1F_1R_MapEvents
 	.4byte MeteorFalls_1F_1R_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc
index b786dc961..b786dc961 100644
--- a/data/scripts/maps/MeteorFalls_1F_1R.inc
+++ b/data/maps/MeteorFalls_1F_1R/scripts.inc
diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc
new file mode 100644
index 000000000..0436851c5
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_2R/events.inc
@@ -0,0 +1,17 @@
+MeteorFalls_1F_2R_EventObjects: @ 85340C4
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, 8, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, 8, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0
+
+MeteorFalls_1F_2R_MapWarps: @ 853410C
+	warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R
+	warp_def 4, 14, 3, 0, MAP_METEOR_FALLS_B1F_1R
+	warp_def 7, 20, 3, 1, MAP_METEOR_FALLS_B1F_1R
+	warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R
+
+MeteorFalls_1F_2R_MapBGEvents: @ 853412C
+	bg_event 9, 58, 0, 0, 0, 0x0
+
+MeteorFalls_1F_2R_MapEvents:: @ 8534138
+	map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents
+
diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc
index 946b15c66..a96c5648e 100644
--- a/data/maps/MeteorFalls_1F_2R/header.inc
+++ b/data/maps/MeteorFalls_1F_2R/header.inc
@@ -1,5 +1,5 @@
 MeteorFalls_1F_2R: @ 8483EDC
-	.4byte MeteorFalls_1F_2R_MapAttributes
+	.4byte MeteorFalls_1F_2R_Layout
 	.4byte MeteorFalls_1F_2R_MapEvents
 	.4byte MeteorFalls_1F_2R_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc
index 4f4ab7c6b..4f4ab7c6b 100644
--- a/data/scripts/maps/MeteorFalls_1F_2R.inc
+++ b/data/maps/MeteorFalls_1F_2R/scripts.inc
diff --git a/data/maps/MeteorFalls_B1F_1R/events.inc b/data/maps/MeteorFalls_B1F_1R/events.inc
new file mode 100644
index 000000000..039f316d9
--- /dev/null
+++ b/data/maps/MeteorFalls_B1F_1R/events.inc
@@ -0,0 +1,11 @@
+MeteorFalls_B1F_1R_MapWarps: @ 853414C
+	warp_def 5, 6, 4, 1, MAP_METEOR_FALLS_1F_2R
+	warp_def 7, 11, 5, 2, MAP_METEOR_FALLS_1F_2R
+	warp_def 18, 15, 4, 3, MAP_METEOR_FALLS_1F_2R
+	warp_def 17, 3, 3, 0, MAP_METEOR_FALLS_B1F_2R
+	warp_def 3, 23, 5, 3, MAP_METEOR_FALLS_1F_1R
+	warp_def 20, 36, 3, 4, MAP_METEOR_FALLS_1F_1R
+
+MeteorFalls_B1F_1R_MapEvents:: @ 853417C
+	map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc
index a138eeb06..11402d3d5 100644
--- a/data/maps/MeteorFalls_B1F_1R/header.inc
+++ b/data/maps/MeteorFalls_B1F_1R/header.inc
@@ -1,5 +1,5 @@
 MeteorFalls_B1F_1R: @ 8483EF8
-	.4byte MeteorFalls_B1F_1R_MapAttributes
+	.4byte MeteorFalls_B1F_1R_Layout
 	.4byte MeteorFalls_B1F_1R_MapEvents
 	.4byte MeteorFalls_B1F_1R_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/scripts.inc
index 551e68180..551e68180 100644
--- a/data/scripts/maps/MeteorFalls_B1F_1R.inc
+++ b/data/maps/MeteorFalls_B1F_1R/scripts.inc
diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc
new file mode 100644
index 000000000..8e2c9e1c4
--- /dev/null
+++ b/data/maps/MeteorFalls_B1F_2R/events.inc
@@ -0,0 +1,9 @@
+MeteorFalls_B1F_2R_EventObjects: @ 8534190
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080
+
+MeteorFalls_B1F_2R_MapWarps: @ 85341A8
+	warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R
+
+MeteorFalls_B1F_2R_MapEvents:: @ 85341B0
+	map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc
index 2d3f50932..81c6276d2 100644
--- a/data/maps/MeteorFalls_B1F_2R/header.inc
+++ b/data/maps/MeteorFalls_B1F_2R/header.inc
@@ -1,5 +1,5 @@
 MeteorFalls_B1F_2R: @ 8483F14
-	.4byte MeteorFalls_B1F_2R_MapAttributes
+	.4byte MeteorFalls_B1F_2R_Layout
 	.4byte MeteorFalls_B1F_2R_MapEvents
 	.4byte MeteorFalls_B1F_2R_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/scripts.inc
index 775b5787c..775b5787c 100644
--- a/data/scripts/maps/MeteorFalls_B1F_2R.inc
+++ b/data/maps/MeteorFalls_B1F_2R/scripts.inc
diff --git a/data/maps/MeteorFalls_StevensCave/events.inc b/data/maps/MeteorFalls_StevensCave/events.inc
new file mode 100644
index 000000000..ff920f86d
--- /dev/null
+++ b/data/maps/MeteorFalls_StevensCave/events.inc
@@ -0,0 +1,9 @@
+MeteorFalls_StevensCave_EventObjects: @ 85378B0
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, 7, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0
+
+MeteorFalls_StevensCave_MapWarps: @ 85378C8
+	warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R
+
+MeteorFalls_StevensCave_MapEvents:: @ 85378D0
+	map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc
index d5415ea46..22b3aaeb6 100644
--- a/data/maps/MeteorFalls_StevensCave/header.inc
+++ b/data/maps/MeteorFalls_StevensCave/header.inc
@@ -1,5 +1,5 @@
 MeteorFalls_StevensCave: @ 8484A74
-	.4byte MeteorFalls_StevensCave_MapAttributes
+	.4byte MeteorFalls_StevensCave_Layout
 	.4byte MeteorFalls_StevensCave_MapEvents
 	.4byte MeteorFalls_StevensCave_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MeteorFalls_StevensCave.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc
index 5226ddb4a..5226ddb4a 100644
--- a/data/scripts/maps/MeteorFalls_StevensCave.inc
+++ b/data/maps/MeteorFalls_StevensCave/scripts.inc
diff --git a/data/maps/MirageTower_1F/events.inc b/data/maps/MirageTower_1F/events.inc
new file mode 100644
index 000000000..f35ce6d2a
--- /dev/null
+++ b/data/maps/MirageTower_1F/events.inc
@@ -0,0 +1,7 @@
+MirageTower_1F_MapWarps: @ 85375D4
+	warp_def 10, 14, 3, 3, MAP_ROUTE111
+	warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_2F
+
+MirageTower_1F_MapEvents:: @ 85375E4
+	map_events 0x0, MirageTower_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc
index 27611506e..cd0717add 100644
--- a/data/maps/MirageTower_1F/header.inc
+++ b/data/maps/MirageTower_1F/header.inc
@@ -1,5 +1,5 @@
 MirageTower_1F: @ 8484908
-	.4byte MirageTower_1F_MapAttributes
+	.4byte MirageTower_1F_Layout
 	.4byte MirageTower_1F_MapEvents
 	.4byte MirageTower_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MirageTower_1F.inc b/data/maps/MirageTower_1F/scripts.inc
index d7d9619b5..d7d9619b5 100644
--- a/data/scripts/maps/MirageTower_1F.inc
+++ b/data/maps/MirageTower_1F/scripts.inc
diff --git a/data/maps/MirageTower_2F/events.inc b/data/maps/MirageTower_2F/events.inc
new file mode 100644
index 000000000..fdbafbe06
--- /dev/null
+++ b/data/maps/MirageTower_2F/events.inc
@@ -0,0 +1,7 @@
+MirageTower_2F_MapWarps: @ 85375F8
+	warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_3F
+	warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_1F
+
+MirageTower_2F_MapEvents:: @ 8537608
+	map_events 0x0, MirageTower_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc
index f512754e7..e449c3a37 100644
--- a/data/maps/MirageTower_2F/header.inc
+++ b/data/maps/MirageTower_2F/header.inc
@@ -1,5 +1,5 @@
 MirageTower_2F: @ 8484924
-	.4byte MirageTower_2F_MapAttributes
+	.4byte MirageTower_2F_Layout
 	.4byte MirageTower_2F_MapEvents
 	.4byte MirageTower_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MirageTower_2F/scripts.inc b/data/maps/MirageTower_2F/scripts.inc
new file mode 100644
index 000000000..79f3cce2a
--- /dev/null
+++ b/data/maps/MirageTower_2F/scripts.inc
@@ -0,0 +1,11 @@
+MirageTower_2F_MapScripts:: @ 823AD11
+	map_script 2, MirageTower_2F_MapScript2_2A8327
+	map_script 3, MirageTower_2F_MapScript1_2A8331
+	map_script 5, MirageTower_2F_MapScript1_23AD21
+	.byte 0
+
+MirageTower_2F_MapScript1_23AD21: @ 823AD21
+	setstepcallback 7
+	setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0
+	end
+
diff --git a/data/maps/MirageTower_3F/events.inc b/data/maps/MirageTower_3F/events.inc
new file mode 100644
index 000000000..e12b4873d
--- /dev/null
+++ b/data/maps/MirageTower_3F/events.inc
@@ -0,0 +1,11 @@
+MirageTower_3F_EventObjects: @ 853761C
+	object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, 1, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 17
+	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, 1, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 18
+
+MirageTower_3F_MapWarps: @ 853764C
+	warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F
+	warp_def 2, 4, 0, 0, MAP_MIRAGE_TOWER_4F
+
+MirageTower_3F_MapEvents:: @ 853765C
+	map_events MirageTower_3F_EventObjects, MirageTower_3F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc
index bdd93292e..def0a15c9 100644
--- a/data/maps/MirageTower_3F/header.inc
+++ b/data/maps/MirageTower_3F/header.inc
@@ -1,5 +1,5 @@
 MirageTower_3F: @ 8484940
-	.4byte MirageTower_3F_MapAttributes
+	.4byte MirageTower_3F_Layout
 	.4byte MirageTower_3F_MapEvents
 	.4byte MirageTower_3F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MirageTower_3F/scripts.inc b/data/maps/MirageTower_3F/scripts.inc
new file mode 100644
index 000000000..1ec82de55
--- /dev/null
+++ b/data/maps/MirageTower_3F/scripts.inc
@@ -0,0 +1,11 @@
+MirageTower_3F_MapScripts:: @ 823AD2C
+	map_script 2, MirageTower_3F_MapScript2_2A8327
+	map_script 3, MirageTower_3F_MapScript1_2A8331
+	map_script 5, MirageTower_3F_MapScript1_23AD3C
+	.byte 0
+
+MirageTower_3F_MapScript1_23AD3C: @ 823AD3C
+	setstepcallback 7
+	setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0
+	end
+
diff --git a/data/maps/MirageTower_4F/events.inc b/data/maps/MirageTower_4F/events.inc
new file mode 100644
index 000000000..7b215a83a
--- /dev/null
+++ b/data/maps/MirageTower_4F/events.inc
@@ -0,0 +1,11 @@
+MirageTower_4F_EventObjects: @ 8537670
+	object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, 8, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, 963
+	object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, 8, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, 964
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, 1, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, 17
+
+MirageTower_4F_MapWarps: @ 85376B8
+	warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F
+
+MirageTower_4F_MapEvents:: @ 85376C0
+	map_events MirageTower_4F_EventObjects, MirageTower_4F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc
index ff38fd9ca..7c1351ea6 100644
--- a/data/maps/MirageTower_4F/header.inc
+++ b/data/maps/MirageTower_4F/header.inc
@@ -1,5 +1,5 @@
 MirageTower_4F: @ 848495C
-	.4byte MirageTower_4F_MapAttributes
+	.4byte MirageTower_4F_Layout
 	.4byte MirageTower_4F_MapEvents
 	.4byte MirageTower_4F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc
new file mode 100644
index 000000000..1e079c5d7
--- /dev/null
+++ b/data/maps/MirageTower_4F/scripts.inc
@@ -0,0 +1,79 @@
+MirageTower_4F_MapScripts:: @ 823AD47
+	.byte 0
+
+MirageTower_4F_EventScript_23AD48:: @ 823AD48
+	lock
+	faceplayer
+	msgbox MirageTower_4F_Text_23ADF9, 5
+	compare VAR_RESULT, 0
+	goto_eq MirageTower_4F_EventScript_23AD7F
+	giveitem_std ITEM_ROOT_FOSSIL
+	closemessage
+	setflag FLAG_0x3C3
+	setflag FLAG_0x3C4
+	removeobject 1
+	delay 30
+	setflag FLAG_0x14F
+	goto MirageTower_4F_EventScript_23ADCA
+	end
+
+MirageTower_4F_EventScript_23AD7F:: @ 823AD7F
+	msgbox MirageTower_4F_Text_23AE79, 4
+	release
+	end
+
+MirageTower_4F_EventScript_23AD89:: @ 823AD89
+	lock
+	faceplayer
+	msgbox MirageTower_4F_Text_23AE98, 5
+	compare VAR_RESULT, 0
+	goto_eq MirageTower_4F_EventScript_23ADC0
+	giveitem_std ITEM_CLAW_FOSSIL
+	closemessage
+	setflag FLAG_0x3C4
+	setflag FLAG_0x3C3
+	removeobject 2
+	delay 30
+	setflag FLAG_0x150
+	goto MirageTower_4F_EventScript_23ADCA
+	end
+
+MirageTower_4F_EventScript_23ADC0:: @ 823ADC0
+	msgbox MirageTower_4F_Text_23AF18, 4
+	release
+	end
+
+MirageTower_4F_EventScript_23ADCA:: @ 823ADCA
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 32
+	setvar VAR_0x8007, 2
+	special sub_8139560
+	waitstate
+	special sub_81BE994
+	waitstate
+	setvar VAR_0x40CB, 1
+	clearflag FLAG_LANDMARK_MIRAGE_TOWER
+	warp MAP_ROUTE111, 255, 19, 59
+	waitstate
+	release
+	end
+
+MirageTower_4F_Text_23ADF9: @ 823ADF9
+	.string "You found the ROOT FOSSIL.\p"
+	.string "If this FOSSIL is taken, the ground\n"
+	.string "around it will likely crumble away…\p"
+	.string "Take the ROOT FOSSIL anyway?$"
+
+MirageTower_4F_Text_23AE79: @ 823AE79
+	.string "{PLAYER} left the ROOT FOSSIL alone.$"
+
+MirageTower_4F_Text_23AE98: @ 823AE98
+	.string "You found the CLAW FOSSIL.\p"
+	.string "If this FOSSIL is taken, the ground\n"
+	.string "around it will likely crumble away…\p"
+	.string "Take the CLAW FOSSIL anyway?$"
+
+MirageTower_4F_Text_23AF18: @ 823AF18
+	.string "{PLAYER} left the CLAW FOSSIL alone.$"
+
diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc
index 04a3f0c4b..a1845c04c 100644
--- a/data/maps/MossdeepCity/connections.inc
+++ b/data/maps/MossdeepCity/connections.inc
@@ -1,7 +1,7 @@
 MossdeepCity_MapConnectionsList: @ 84867C4
-	connection up, 0, ROUTE_125, 0
-	connection down, 0, ROUTE_127, 0
-	connection left, -40, ROUTE_124, 0
+	connection up, 0, MAP_ROUTE125
+	connection down, 0, MAP_ROUTE127
+	connection left, -40, MAP_ROUTE124
 
 MossdeepCity_MapConnections: @ 84867E8
 	.4byte 0x3
diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc
new file mode 100644
index 000000000..d288400b5
--- /dev/null
+++ b/data/maps/MossdeepCity/events.inc
@@ -0,0 +1,56 @@
+MossdeepCity_EventObjects: @ 8527018
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, 3, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043
+	object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, 10, 1, 1, 0, 0, MossdeepCity_EventScript_1E4B0B, 0
+	object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4C26, 0
+	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, 8, 1, 1, 0, 0, 0x0, 823
+	object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, 7, 1, 1, 0, 0, 0x0, 823
+	object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, 8, 1, 1, 0, 0, 0x0, 823
+	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, 7, 1, 1, 0, 0, 0x0, 823
+	object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, 9, 1, 1, 0, 0, 0x0, 823
+	object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, 64, 3, 3, 0, 0, MossdeepCity_EventScript_2C81EE, 0
+	object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788
+	object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, 64, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0
+
+MossdeepCity_MapWarps: @ 85271B0
+	warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1
+	warp_def 38, 9, 0, 0, MAP_MOSSDEEP_CITY_GYM
+	warp_def 28, 16, 0, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F
+	warp_def 67, 25, 0, 0, MAP_MOSSDEEP_CITY_HOUSE2
+	warp_def 37, 18, 0, 0, MAP_MOSSDEEP_CITY_MART
+	warp_def 49, 6, 0, 0, MAP_MOSSDEEP_CITY_HOUSE3
+	warp_def 19, 10, 0, 0, MAP_MOSSDEEP_CITY_STEVENS_HOUSE
+	warp_def 18, 16, 0, 1, MAP_MOSSDEEP_CITY_HOUSE4
+	warp_def 64, 15, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F
+	warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F
+
+MossdeepCity_MapCoordEvents: @ 8527200
+	coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38
+	coord_event 26, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38
+	coord_event 32, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38
+	coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38
+	coord_event 42, 21, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
+	coord_event 41, 22, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
+	coord_event 41, 23, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
+	coord_event 41, 24, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
+	coord_event 40, 25, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
+	coord_event 40, 26, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
+
+MossdeepCity_MapBGEvents: @ 85272A0
+	bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_1E4B26
+	bg_event 34, 9, 0, 0, 0, MossdeepCity_EventScript_1E4B1D
+	bg_event 29, 16, 0, 1, 0, MossdeepCity_EventScript_271E73
+	bg_event 38, 18, 0, 1, 0, MossdeepCity_EventScript_271E6A
+	bg_event 66, 16, 0, 0, 0, MossdeepCity_EventScript_1E4B2F
+	bg_event 30, 16, 0, 1, 0, MossdeepCity_EventScript_271E73
+	bg_event 39, 18, 0, 1, 0, MossdeepCity_EventScript_271E6A
+	bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_1E4B14
+
+MossdeepCity_MapEvents:: @ 8527300
+	map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents
+
diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc
index c21d4f7f9..fc5af866a 100644
--- a/data/maps/MossdeepCity/header.inc
+++ b/data/maps/MossdeepCity/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity: @ 8482560
-	.4byte MossdeepCity_MapAttributes
+	.4byte MossdeepCity_Layout
 	.4byte MossdeepCity_MapEvents
 	.4byte MossdeepCity_MapScripts
 	.4byte MossdeepCity_MapConnections
diff --git a/data/scripts/maps/MossdeepCity.inc b/data/maps/MossdeepCity/scripts.inc
index 8cce8efeb..8cce8efeb 100644
--- a/data/scripts/maps/MossdeepCity.inc
+++ b/data/maps/MossdeepCity/scripts.inc
diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc
new file mode 100644
index 000000000..42face3c4
--- /dev/null
+++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc
@@ -0,0 +1,17 @@
+MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0
+
+MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70
+	warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY
+	warp_def 6, 9, 0, 9, MAP_MOSSDEEP_CITY
+	warp_def 2, 0, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F
+
+MossdeepCity_GameCorner_1F_MapBGEvents: @ 8532F88
+	bg_event 3, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B5D
+	bg_event 0, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E9D
+	bg_event 1, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E96
+
+MossdeepCity_GameCorner_1F_MapEvents:: @ 8532FAC
+	map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents
+
diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc
index 7e2adace8..9b886677e 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_GameCorner_1F: @ 84839F0
-	.4byte MossdeepCity_GameCorner_1F_MapAttributes
+	.4byte MossdeepCity_GameCorner_1F_Layout
 	.4byte MossdeepCity_GameCorner_1F_MapEvents
 	.4byte MossdeepCity_GameCorner_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
index ff5c14206..ff5c14206 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc
new file mode 100644
index 000000000..7146d30b8
--- /dev/null
+++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc
@@ -0,0 +1,9 @@
+MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0
+
+MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8
+	warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F
+
+MossdeepCity_GameCorner_B1F_MapEvents:: @ 8532FE0
+	map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
index 6b4a75713..623b5f970 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_GameCorner_B1F: @ 8483A0C
-	.4byte MossdeepCity_GameCorner_B1F_MapAttributes
+	.4byte MossdeepCity_GameCorner_B1F_Layout
 	.4byte MossdeepCity_GameCorner_B1F_MapEvents
 	.4byte MossdeepCity_GameCorner_B1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc
index 695be3c6e..695be3c6e 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc
diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc
new file mode 100644
index 000000000..e383463af
--- /dev/null
+++ b/data/maps/MossdeepCity_Gym/events.inc
@@ -0,0 +1,72 @@
+MossdeepCity_Gym_EventObjects: @ 85324EC
+	object_event 1, EVENT_OBJ_GFX_TATE, 0, 23, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0
+	object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0
+	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 4, 29, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0
+	object_event 5, EVENT_OBJ_GFX_LASS, 0, 4, 23, 0, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0
+	object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 9, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 6, 3, 0, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 5, 33, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0
+	object_event 9, EVENT_OBJ_GFX_LIZA, 0, 24, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0
+	object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 2, 30, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 1, 29, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 30, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 29, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 21, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 7, 9, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 10, 8, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 8, 3, 7, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0
+	object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 7, 5, 3, 10, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0
+	object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 6, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 5, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 5, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 34, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 33, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 34, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 22, 25, 3, 7, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0
+	object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 26, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 27, EVENT_OBJ_GFX_LASS, 0, 25, 25, 0, 9, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0
+	object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 22, 23, 3, 8, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0
+	object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 23, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 22, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 22, 22, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 25, 22, 3, 7, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0
+	object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 22, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 23, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, 1, 1, 1, 0, 0, 0x0, 0
+
+MossdeepCity_Gym_MapWarps: @ 853284C
+	warp_def 6, 35, 3, 1, MAP_MOSSDEEP_CITY
+	warp_def 7, 35, 3, 1, MAP_MOSSDEEP_CITY
+	warp_def 3, 28, 0, 3, MAP_MOSSDEEP_CITY_GYM
+	warp_def 1, 23, 3, 2, MAP_MOSSDEEP_CITY_GYM
+	warp_def 7, 18, 0, 5, MAP_MOSSDEEP_CITY_GYM
+	warp_def 8, 12, 0, 4, MAP_MOSSDEEP_CITY_GYM
+	warp_def 9, 18, 0, 7, MAP_MOSSDEEP_CITY_GYM
+	warp_def 23, 20, 0, 6, MAP_MOSSDEEP_CITY_GYM
+	warp_def 1, 33, 3, 9, MAP_MOSSDEEP_CITY_GYM
+	warp_def 20, 24, 0, 8, MAP_MOSSDEEP_CITY_GYM
+	warp_def 11, 3, 0, 11, MAP_MOSSDEEP_CITY_GYM
+	warp_def 11, 35, 3, 10, MAP_MOSSDEEP_CITY_GYM
+	warp_def 13, 32, 0, 13, MAP_MOSSDEEP_CITY_GYM
+	warp_def 21, 10, 0, 12, MAP_MOSSDEEP_CITY_GYM
+
+MossdeepCity_Gym_MapCoordEvents: @ 85328BC
+	coord_event 2, 21, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C67
+	coord_event 8, 10, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C7D
+	coord_event 6, 7, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C7D
+	coord_event 15, 34, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C93
+	coord_event 23, 24, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CA9
+	coord_event 23, 21, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CA9
+	coord_event 8, 6, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CBF
+	coord_event 21, 6, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220AF1
+	coord_event 3, 30, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C67
+
+MossdeepCity_Gym_MapBGEvents: @ 853294C
+	bg_event 4, 34, 0, 1, 0, MossdeepCity_Gym_EventScript_220C33
+	bg_event 8, 34, 0, 1, 0, MossdeepCity_Gym_EventScript_220C43
+
+MossdeepCity_Gym_MapEvents:: @ 8532964
+	map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents
+
diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc
index 1bb806541..321271f78 100644
--- a/data/maps/MossdeepCity_Gym/header.inc
+++ b/data/maps/MossdeepCity_Gym/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_Gym: @ 84838BC
-	.4byte MossdeepCity_Gym_MapAttributes
+	.4byte MossdeepCity_Gym_Layout
 	.4byte MossdeepCity_Gym_MapEvents
 	.4byte MossdeepCity_Gym_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc
new file mode 100644
index 000000000..f38fd606d
--- /dev/null
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
@@ -0,0 +1,658 @@
+MossdeepCity_Gym_MapScripts:: @ 8220800
+	map_script 1, MossdeepCity_Gym_MapScript1_220806
+	.byte 0
+
+MossdeepCity_Gym_MapScript1_220806: @ 8220806
+	checkflag FLAG_0x064
+	goto_eq MossdeepCity_Gym_EventScript_22083D
+	goto MossdeepCity_Gym_EventScript_220815
+	end
+
+MossdeepCity_Gym_EventScript_220815:: @ 8220815
+	checkflag FLAG_0x065
+	goto_eq MossdeepCity_Gym_EventScript_220855
+	goto MossdeepCity_Gym_EventScript_220824
+	end
+
+MossdeepCity_Gym_EventScript_220824:: @ 8220824
+	checkflag FLAG_0x066
+	goto_eq MossdeepCity_Gym_EventScript_22086D
+	goto MossdeepCity_Gym_EventScript_220833
+	end
+
+MossdeepCity_Gym_EventScript_220833:: @ 8220833
+	checkflag FLAG_0x067
+	goto_eq MossdeepCity_Gym_EventScript_220885
+	end
+
+MossdeepCity_Gym_EventScript_22083D:: @ 822083D
+	setmetatile 5, 5, 516, 0
+	setmetatile 2, 7, 569, 1
+	goto MossdeepCity_Gym_EventScript_220815
+	end
+
+MossdeepCity_Gym_EventScript_220855:: @ 8220855
+	setmetatile 8, 14, 516, 0
+	setmetatile 8, 10, 569, 1
+	goto MossdeepCity_Gym_EventScript_220824
+	end
+
+MossdeepCity_Gym_EventScript_22086D:: @ 822086D
+	setmetatile 15, 17, 524, 0
+	setmetatile 17, 15, 569, 1
+	goto MossdeepCity_Gym_EventScript_220833
+	end
+
+MossdeepCity_Gym_EventScript_220885:: @ 8220885
+	setmetatile 1, 23, 525, 0
+	setmetatile 5, 24, 569, 1
+	end
+
+MossdeepCity_Gym_EventScript_220898:: @ 8220898
+	trainerbattle 8, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq MossdeepCity_Gym_EventScript_22097E
+	checkflag FLAG_0x0AB
+	goto_if 0, MossdeepCity_Gym_EventScript_220937
+	msgbox MossdeepCity_Gym_Text_221B1D, 4
+	release
+	end
+
+MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
+	message MossdeepCity_Gym_Text_22196A
+	waitmessage
+	call MossdeepCity_Gym_EventScript_27207E
+	msgbox MossdeepCity_Gym_Text_221999, 4
+	setflag FLAG_0x4F6
+	setflag FLAG_BADGE07_GET
+	setflag FLAG_0x39C
+	clearflag FLAG_0x365
+	clearflag FLAG_0x393
+	setvar VAR_0x8008, 7
+	call MossdeepCity_Gym_EventScript_271F43
+	clearflag FLAG_0x389
+	clearflag FLAG_0x337
+	clearflag FLAG_0x2F4
+	clearflag FLAG_0x35E
+	clearflag FLAG_0x35F
+	setvar VAR_0x405D, 1
+	setflag FLAG_0x2F1
+	setvar VAR_0x409F, 1
+	call MossdeepCity_Gym_EventScript_22095B
+	closemessage
+	delay 30
+	playfanfare MUS_ME_TORE_EYE
+	msgbox MossdeepCity_Gym_Text_221AEA, 4
+	waitfanfare
+	closemessage
+	delay 30
+	setflag FLAG_0x1D8
+	release
+	end
+
+MossdeepCity_Gym_EventScript_220937:: @ 8220937
+	giveitem_std ITEM_TM04
+	compare VAR_RESULT, 0
+	goto_eq MossdeepCity_Gym_EventScript_272054
+	msgbox MossdeepCity_Gym_Text_221A40, 4
+	setflag FLAG_0x0AB
+	release
+	end
+
+MossdeepCity_Gym_EventScript_22095B:: @ 822095B
+	giveitem_std ITEM_TM04
+	compare VAR_RESULT, 0
+	goto_eq MossdeepCity_Gym_EventScript_27205E
+	msgbox MossdeepCity_Gym_Text_221A40, 4
+	setflag FLAG_0x0AB
+	return
+
+MossdeepCity_Gym_EventScript_22097E:: @ 822097E
+	trainerbattle 7, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8
+	msgbox MossdeepCity_Gym_Text_221E45, 6
+	end
+
+MossdeepCity_Gym_EventScript_220999:: @ 8220999
+	lockall
+	checkflag FLAG_0x064
+	goto_eq MossdeepCity_Gym_EventScript_2209D0
+	setflag FLAG_0x064
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 5, 5, 516, 0
+	setmetatile 2, 7, 569, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_2209C8:: @ 82209C8
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	releaseall
+	end
+
+MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0
+	clearflag FLAG_0x064
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 5, 5, 524, 0
+	setmetatile 2, 7, 568, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5
+	lockall
+	checkflag FLAG_0x065
+	goto_eq MossdeepCity_Gym_EventScript_220A24
+	setflag FLAG_0x065
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 8, 14, 516, 0
+	setmetatile 8, 10, 569, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_220A24:: @ 8220A24
+	clearflag FLAG_0x065
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 8, 14, 517, 0
+	setmetatile 8, 10, 568, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_220A49:: @ 8220A49
+	lockall
+	checkflag FLAG_0x066
+	goto_eq MossdeepCity_Gym_EventScript_220A78
+	setflag FLAG_0x066
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 15, 17, 524, 0
+	setmetatile 17, 15, 569, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_220A78:: @ 8220A78
+	clearflag FLAG_0x066
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 15, 17, 516, 0
+	setmetatile 17, 15, 568, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D
+	lockall
+	checkflag FLAG_0x067
+	goto_eq MossdeepCity_Gym_EventScript_220ACC
+	setflag FLAG_0x067
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 1, 23, 525, 0
+	setmetatile 5, 24, 569, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC
+	clearflag FLAG_0x067
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 1, 23, 516, 0
+	setmetatile 5, 24, 568, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1
+	lockall
+	warp7 MAP_MOSSDEEP_CITY_GYM, 255, 7, 30
+	waitstate
+	releaseall
+	end
+
+MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD
+	trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC
+	msgbox MossdeepCity_Gym_Text_220ED3, 6
+	end
+
+MossdeepCity_Gym_EventScript_220B14:: @ 8220B14
+	trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A
+	msgbox MossdeepCity_Gym_Text_220F3A, 6
+	end
+
+MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B
+	trainerbattle 0, TRAINER_BLAKE, 0, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024
+	msgbox MossdeepCity_Gym_Text_221055, 6
+	end
+
+MossdeepCity_Gym_EventScript_220B42:: @ 8220B42
+	trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152
+	msgbox MossdeepCity_Gym_Text_22116A, 6
+	end
+
+MossdeepCity_Gym_EventScript_220B59:: @ 8220B59
+	trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230
+	msgbox MossdeepCity_Gym_Text_22123D, 6
+	end
+
+MossdeepCity_Gym_EventScript_220B70:: @ 8220B70
+	trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309
+	msgbox MossdeepCity_Gym_Text_22132E, 6
+	end
+
+MossdeepCity_Gym_EventScript_220B87:: @ 8220B87
+	trainerbattle 0, TRAINER_SYLVIA, 0, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4
+	msgbox MossdeepCity_Gym_Text_221412, 6
+	end
+
+MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E
+	trainerbattle 0, TRAINER_NATE, 0, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7
+	msgbox MossdeepCity_Gym_Text_2214D3, 6
+	end
+
+MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5
+	trainerbattle 0, TRAINER_MACEY, 0, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658
+	msgbox MossdeepCity_Gym_Text_221680, 6
+	end
+
+MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC
+	trainerbattle 0, TRAINER_CLIFFORD, 0, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8
+	msgbox MossdeepCity_Gym_Text_2215E2, 6
+	end
+
+MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3
+	trainerbattle 0, TRAINER_NICHOLAS, 0, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D
+	msgbox MossdeepCity_Gym_Text_22173A, 6
+	end
+
+MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA
+	trainerbattle 0, TRAINER_KATHLEEN, 0, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B
+	msgbox MossdeepCity_Gym_Text_221545, 6
+	end
+
+MossdeepCity_Gym_EventScript_220C11:: @ 8220C11
+	lock
+	faceplayer
+	checkflag FLAG_0x4F6
+	goto_eq MossdeepCity_Gym_EventScript_220C26
+	msgbox MossdeepCity_Gym_Text_220CD5, 4
+	release
+	end
+
+MossdeepCity_Gym_EventScript_220C26:: @ 8220C26
+	msgbox MossdeepCity_Gym_Text_220E2A, 4
+	release
+	end
+
+MossdeepCity_Gym_Movement_220C30: @ 8220C30
+	delay_16
+	delay_16
+	step_end
+
+MossdeepCity_Gym_EventScript_220C33:: @ 8220C33
+	lockall
+	checkflag FLAG_BADGE07_GET
+	goto_eq MossdeepCity_Gym_EventScript_220C53
+	goto MossdeepCity_Gym_EventScript_220C5D
+	end
+
+MossdeepCity_Gym_EventScript_220C43:: @ 8220C43
+	lockall
+	checkflag FLAG_BADGE07_GET
+	goto_eq MossdeepCity_Gym_EventScript_220C53
+	goto MossdeepCity_Gym_EventScript_220C5D
+	end
+
+MossdeepCity_Gym_EventScript_220C53:: @ 8220C53
+	msgbox MossdeepCity_Gym_Text_221CCA, 4
+	releaseall
+	end
+
+MossdeepCity_Gym_EventScript_220C5D:: @ 8220C5D
+	msgbox MossdeepCity_Gym_Text_221CB0, 4
+	releaseall
+	end
+
+MossdeepCity_Gym_EventScript_220C67:: @ 8220C67
+	playse SE_MU_PACHI
+	waitse
+	playse SE_TU_SAA
+	mossdeepgym3 0
+	mossdeepgym1 0
+	waitmovement 0
+	mossdeepgym2
+	waitmovement 0
+	mossdeepgym4
+	end
+
+MossdeepCity_Gym_EventScript_220C7D:: @ 8220C7D
+	playse SE_MU_PACHI
+	waitse
+	playse SE_TU_SAA
+	mossdeepgym3 0
+	mossdeepgym1 1
+	waitmovement 0
+	mossdeepgym2
+	waitmovement 0
+	mossdeepgym4
+	end
+
+MossdeepCity_Gym_EventScript_220C93:: @ 8220C93
+	playse SE_MU_PACHI
+	waitse
+	playse SE_TU_SAA
+	mossdeepgym3 0
+	mossdeepgym1 2
+	waitmovement 0
+	mossdeepgym2
+	waitmovement 0
+	mossdeepgym4
+	end
+
+MossdeepCity_Gym_EventScript_220CA9:: @ 8220CA9
+	playse SE_MU_PACHI
+	waitse
+	playse SE_TU_SAA
+	mossdeepgym3 0
+	mossdeepgym1 3
+	waitmovement 0
+	mossdeepgym2
+	waitmovement 0
+	mossdeepgym4
+	end
+
+MossdeepCity_Gym_EventScript_220CBF:: @ 8220CBF
+	playse SE_MU_PACHI
+	waitse
+	playse SE_TU_SAA
+	mossdeepgym3 0
+	mossdeepgym1 4
+	waitmovement 0
+	mossdeepgym2
+	waitmovement 0
+	mossdeepgym4
+	end
+
+MossdeepCity_Gym_Text_220CD5: @ 8220CD5
+	.string "Yo, how’s it going, CHAMPION-bound\n"
+	.string "{PLAYER}?\p"
+	.string "The GYM LEADERS here use\n"
+	.string "PSYCHIC-type POKéMON.\p"
+	.string "If you go up against them with\n"
+	.string "FIGHTING- or POISON-type POKéMON,\l"
+	.string "they’ll inflict horrible damage!\p"
+	.string "Plus, they’ll come at you with\n"
+	.string "outstanding combination attacks.\p"
+	.string "If you want to win, you’ll need to show\n"
+	.string "them how tight you are with your\l"
+	.string "POKéMON. Go for it!$"
+
+MossdeepCity_Gym_Text_220E2A: @ 8220E2A
+	.string "Wow, you’re astounding!\n"
+	.string "You’re one great TRAINER!$"
+
+MossdeepCity_Gym_Text_220E5C: @ 8220E5C
+	.string "Battles hinge on the strength of your\n"
+	.string "spirit! The weak-spirited will never win!$"
+
+MossdeepCity_Gym_Text_220EAC: @ 8220EAC
+	.string "I lost!\n"
+	.string "I must temper my spirit again!$"
+
+MossdeepCity_Gym_Text_220ED3: @ 8220ED3
+	.string "The indecisive lose.\n"
+	.string "That’s my warning to you.$"
+
+MossdeepCity_Gym_Text_220F02: @ 8220F02
+	.string "Let me see your talent!$"
+
+MossdeepCity_Gym_Text_220F1A: @ 8220F1A
+	.string "You possess spectacular talent!$"
+
+MossdeepCity_Gym_Text_220F3A: @ 8220F3A
+	.string "If there are prodigies in the world,\n"
+	.string "then our GYM LEADERS are them!\p"
+	.string "However, you may be even more talented\n"
+	.string "than them…$"
+
+MossdeepCity_Gym_Text_220FB0: @ 8220FB0
+	.string "Fufufufu… Watch me levitate a POKé\n"
+	.string "BALL telekinetically!\p"
+	.string "Wrooooooooaaaar!\n"
+	.string "… … … … … … …\p"
+	.string "Sometimes, I’m out of sync…$"
+
+MossdeepCity_Gym_Text_221024: @ 8221024
+	.string "My POKéMON battling skills are out\n"
+	.string "of sync, too!$"
+
+MossdeepCity_Gym_Text_221055: @ 8221055
+	.string "A POKé BALL was too heavy to lift\n"
+	.string "psychically. But this dust bunny…\p"
+	.string "Whoooooooooooooooh!\n"
+	.string "… … … … … …\p"
+	.string "No, I’m not cheating!\n"
+	.string "I didn’t blow on it! Honestly!$"
+
+MossdeepCity_Gym_Text_2210EE: @ 82210EE
+	.string "When you lose to me, don’t be too hard\n"
+	.string "on yourself.\p"
+	.string "It’s not that you’re weak--I’m just\n"
+	.string "too strong!$"
+
+MossdeepCity_Gym_Text_221152: @ 8221152
+	.string "You’re just too strong!$"
+
+MossdeepCity_Gym_Text_22116A: @ 822116A
+	.string "I’m not going to get down on myself for\n"
+	.string "losing. I just need to train harder.\p"
+	.string "Positive thinking--that’s my strong\n"
+	.string "point!$"
+
+MossdeepCity_Gym_Text_2211E2: @ 82211E2
+	.string "I see it…\n"
+	.string "I see your future…\p"
+	.string "If you can beat me, I will tell you\n"
+	.string "your future!$"
+
+MossdeepCity_Gym_Text_221230: @ 8221230
+	.string "I surrender!$"
+
+MossdeepCity_Gym_Text_22123D: @ 822123D
+	.string "You will wage a terrifically intense\n"
+	.string "battle with our GYM LEADERS…\p"
+	.string "The result…\n"
+	.string "You won’t hear it from me!$"
+
+MossdeepCity_Gym_Text_2212A6: @ 82212A6
+	.string "The roads you have traveled…\n"
+	.string "What you have experienced…\p"
+	.string "Come at me with everything you’ve\n"
+	.string "learned!$"
+
+MossdeepCity_Gym_Text_221309: @ 8221309
+	.string "You’ve traveled a path of greatness!$"
+
+MossdeepCity_Gym_Text_22132E: @ 822132E
+	.string "A bright future awaits those who have\n"
+	.string "worked diligently.\p"
+	.string "For those who lazed idly, there is\n"
+	.string "only despair at the end.\p"
+	.string "What goes around comes around…$"
+
+MossdeepCity_Gym_Text_2213C2: @ 82213C2
+	.string "Even at the risk of life, I will win\n"
+	.string "this battle!$"
+
+MossdeepCity_Gym_Text_2213F4: @ 82213F4
+	.string "What you do…\n"
+	.string "It horrifies me…$"
+
+MossdeepCity_Gym_Text_221412: @ 8221412
+	.string "How dare you beat me…\p"
+	.string "It won’t be my fault if something\n"
+	.string "horrible befalls you…$"
+
+MossdeepCity_Gym_Text_221460: @ 8221460
+	.string "Hohoho.\p"
+	.string "You need me to show you how tenacious\n"
+	.string "the PSYCHIC type can be.$"
+
+MossdeepCity_Gym_Text_2214A7: @ 82214A7
+	.string "Oh! My, my!\n"
+	.string "Your battle style is fantastic!$"
+
+MossdeepCity_Gym_Text_2214D3: @ 82214D3
+	.string "I… I don’t let defeat rattle m-me,\n"
+	.string "however b-badly.$"
+
+MossdeepCity_Gym_Text_221507: @ 8221507
+	.string "Let me show you a perfectly awful,\n"
+	.string "horrifying time!$"
+
+MossdeepCity_Gym_Text_22153B: @ 822153B
+	.string "N-nooooo!$"
+
+MossdeepCity_Gym_Text_221545: @ 8221545
+	.string "Your vitality is contagious!\n"
+	.string "Get away from me quickly!$"
+
+MossdeepCity_Gym_Text_22157C: @ 822157C
+	.string "I may be past my prime, but I suggest\n"
+	.string "you not patronize me.$"
+
+MossdeepCity_Gym_Text_2215B8: @ 82215B8
+	.string "Ah, you overflow with the power\n"
+	.string "of youth!$"
+
+MossdeepCity_Gym_Text_2215E2: @ 82215E2
+	.string "It seems that I could not overcome\n"
+	.string "your youthful energy.$"
+
+MossdeepCity_Gym_Text_22161B: @ 822161B
+	.string "You’re not getting through to the end!\n"
+	.string "Not if I can help it!$"
+
+MossdeepCity_Gym_Text_221658: @ 8221658
+	.string "How could you be so ludicrously\n"
+	.string "strong?$"
+
+MossdeepCity_Gym_Text_221680: @ 8221680
+	.string "Humph! You may be strong, but you’re\n"
+	.string "not suitable for the PSYCHIC type!\p"
+	.string "The way you battle is somehow brutal!$"
+
+MossdeepCity_Gym_Text_2216EE: @ 82216EE
+	.string "Wroooar! Have a taste of my super\n"
+	.string "POKéMON hard-battling power!$"
+
+MossdeepCity_Gym_Text_22172D: @ 822172D
+	.string "Oh!\n"
+	.string "Done in!$"
+
+MossdeepCity_Gym_Text_22173A: @ 822173A
+	.string "All right! I think I’ll develop a special\n"
+	.string "invincible POKéMON power next.$"
+
+MossdeepCity_Gym_Text_221783: @ 8221783
+	.string "TATE: Hehehe… Were you surprised?\p"
+	.string "LIZA: Fufufu… Were you surprised?\p"
+	.string "TATE: That there are two GYM LEADERS?\n"
+	.string "LIZA: That there are two GYM LEADERS?\p"
+	.string "TATE: We’re twins!\n"
+	.string "LIZA: We’re twins!\p"
+	.string "TATE: We don’t need to talk because…\n"
+	.string "LIZA: We can each determine what…\p"
+	.string "TATE: The other is thinking…\n"
+	.string "LIZA: All in our minds!\p"
+	.string "TATE: This combination of ours…\n"
+	.string "LIZA: Can you beat it?$"
+
+MossdeepCity_Gym_Text_2218EC: @ 82218EC
+	.string "TATE: What?! Our combination…\n"
+	.string "LIZA: Was shattered!\p"
+	.string "TATE: It can’t be helped. You’ve won…\n"
+	.string "LIZA: So, in recognition, take this.$"
+
+MossdeepCity_Gym_Text_22196A: @ 822196A
+	.string "{PLAYER} received the MIND BADGE\n"
+	.string "from TATE and LIZA.$"
+
+MossdeepCity_Gym_Text_221999: @ 8221999
+	.string "TATE: The MIND BADGE enhances the\n"
+	.string "SP. ATK and SP. DEF of POKéMON.\p"
+	.string "LIZA: It also lets you use the HM move\n"
+	.string "DIVE outside of battle.\p"
+	.string "TATE: You should also take this, too.$"
+
+MossdeepCity_Gym_Text_221A40: @ 8221A40
+	.string "TATE: That TM04 contains…\n"
+	.string "LIZA: CALM MIND!\p"
+	.string "TATE: It raises SP. ATK and…\n"
+	.string "LIZA: It raises SP. DEF!\p"
+	.string "TATE: It’s a move that’s perfect…\n"
+	.string "LIZA: For PSYCHIC POKéMON!\p"
+	.string "… … … … … …$"
+
+MossdeepCity_Gym_Text_221AEA: @ 8221AEA
+	.string "Registered GYM LEADERS TATE & LIZA\n"
+	.string "in the POKéNAV.$"
+
+MossdeepCity_Gym_Text_221B1D: @ 8221B1D
+	.string "TATE: Looks like the bond between you\n"
+	.string "and your POKéMON is far stronger than\l"
+	.string "the bond that we share as twins.\p"
+	.string "LIZA: You will become even stronger!\n"
+	.string "We’ve battled you, so we know.$"
+
+MossdeepCity_Gym_Text_221BCE: @ 8221BCE
+	.string "TATE: Hehehe… Were you surprised?\p"
+	.string "LIZA: That there are two GYM LEADERS?\p"
+	.string "TATE: Oops, you have only one…\n"
+	.string "LIZA: POKéMON that can battle.\p"
+	.string "TATE: We can’t battle that way!\p"
+	.string "LIZA: If you want to challenge us,\n"
+	.string "bring some more POKéMON.$"
+
+MossdeepCity_Gym_Text_221CB0: @ 8221CB0
+	.string "MOSSDEEP CITY POKéMON GYM$"
+
+MossdeepCity_Gym_Text_221CCA: @ 8221CCA
+	.string "MOSSDEEP CITY POKéMON GYM\p"
+	.string "LIZA AND TATE’S CERTIFIED TRAINERS:\n"
+	.string "{PLAYER}$"
+
+MossdeepCity_Gym_Text_221D0B: @ 8221D0B
+	.string "TATE: POKéMON…\n"
+	.string "LIZA: POKéMON…\p"
+	.string "TATE: By changing the party’s mix…\n"
+	.string "LIZA: The battle style changes.\p"
+	.string "TATE: But me…\n"
+	.string "LIZA: But me…\p"
+	.string "TATE: I’ll always be with LIZA!\n"
+	.string "LIZA: I’ll always be with TATE!\p"
+	.string "TATE: Our combination…\n"
+	.string "LIZA: We’ll show you again and again!$"
+
+MossdeepCity_Gym_Text_221E05: @ 8221E05
+	.string "TATE: You and your POKéMON…\n"
+	.string "LIZA: It’s as if you were siblings!$"
+
+MossdeepCity_Gym_Text_221E45: @ 8221E45
+	.string "TATE: You can knock us down,\n"
+	.string "but we’ll never stay down!\p"
+	.string "LIZA: Because the two of us,\n"
+	.string "we always support each other!$"
+
+MossdeepCity_Gym_Text_221EB8: @ 8221EB8
+	.string "TATE: You’re back again…\n"
+	.string "LIZA: You’re back again…\p"
+	.string "TATE: To give us a rematch.\n"
+	.string "LIZA: To give us a rematch.\p"
+	.string "TATE: But…\n"
+	.string "LIZA: For our match…\p"
+	.string "TATE: You brought just one POKéMON!\n"
+	.string "LIZA: You brought just one POKéMON!\p"
+	.string "TATE: We need you to bring at least…\n"
+	.string "LIZA: Two POKéMON when you come back.$"
+
diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc
new file mode 100644
index 000000000..a7832fb09
--- /dev/null
+++ b/data/maps/MossdeepCity_House1/events.inc
@@ -0,0 +1,11 @@
+MossdeepCity_House1_EventObjects: @ 8532978
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, 3, 1, 1, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0
+
+MossdeepCity_House1_MapWarps: @ 85329A8
+	warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY
+	warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY
+
+MossdeepCity_House1_MapEvents:: @ 85329B8
+	map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc
index 5260cf931..64dedcba6 100644
--- a/data/maps/MossdeepCity_House1/header.inc
+++ b/data/maps/MossdeepCity_House1/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_House1: @ 84838D8
-	.4byte MossdeepCity_House1_MapAttributes
+	.4byte House2_Layout
 	.4byte MossdeepCity_House1_MapEvents
 	.4byte MossdeepCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/scripts.inc
index b08d296c7..b08d296c7 100644
--- a/data/scripts/maps/MossdeepCity_House1.inc
+++ b/data/maps/MossdeepCity_House1/scripts.inc
diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc
new file mode 100644
index 000000000..86ba58946
--- /dev/null
+++ b/data/maps/MossdeepCity_House2/events.inc
@@ -0,0 +1,12 @@
+MossdeepCity_House2_EventObjects: @ 85329CC
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934
+
+MossdeepCity_House2_MapWarps: @ 8532A14
+	warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY
+	warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY
+
+MossdeepCity_House2_MapEvents:: @ 8532A24
+	map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc
index 1d0463231..b3cf19738 100644
--- a/data/maps/MossdeepCity_House2/header.inc
+++ b/data/maps/MossdeepCity_House2/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_House2: @ 84838F4
-	.4byte MossdeepCity_House2_MapAttributes
+	.4byte House1_Layout
 	.4byte MossdeepCity_House2_MapEvents
 	.4byte MossdeepCity_House2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/scripts.inc
index c61f74d99..c61f74d99 100644
--- a/data/scripts/maps/MossdeepCity_House2.inc
+++ b/data/maps/MossdeepCity_House2/scripts.inc
diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc
new file mode 100644
index 000000000..e40e79e10
--- /dev/null
+++ b/data/maps/MossdeepCity_House3/events.inc
@@ -0,0 +1,10 @@
+MossdeepCity_House3_EventObjects: @ 8532BD4
+	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0
+
+MossdeepCity_House3_MapWarps: @ 8532BEC
+	warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY
+	warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY
+
+MossdeepCity_House3_MapEvents:: @ 8532BFC
+	map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc
index d474eab75..d54538b4e 100644
--- a/data/maps/MossdeepCity_House3/header.inc
+++ b/data/maps/MossdeepCity_House3/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_House3: @ 8483964
-	.4byte MossdeepCity_House3_MapAttributes
+	.4byte House2_Layout
 	.4byte MossdeepCity_House3_MapEvents
 	.4byte MossdeepCity_House3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/scripts.inc
index dfdbfa956..dfdbfa956 100644
--- a/data/scripts/maps/MossdeepCity_House3.inc
+++ b/data/maps/MossdeepCity_House3/scripts.inc
diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc
new file mode 100644
index 000000000..96d8fe7d8
--- /dev/null
+++ b/data/maps/MossdeepCity_House4/events.inc
@@ -0,0 +1,12 @@
+MossdeepCity_House4_EventObjects: @ 8532CAC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0
+	object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, 1, 1, 1, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0
+
+MossdeepCity_House4_MapWarps: @ 8532CF4
+	warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY
+	warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY
+
+MossdeepCity_House4_MapEvents:: @ 8532D04
+	map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc
index 30fe8c01a..33acf2e51 100644
--- a/data/maps/MossdeepCity_House4/header.inc
+++ b/data/maps/MossdeepCity_House4/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_House4: @ 848399C
-	.4byte MossdeepCity_House4_MapAttributes
+	.4byte HouseWithBed_Layout
 	.4byte MossdeepCity_House4_MapEvents
 	.4byte MossdeepCity_House4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/scripts.inc
index cb3cc0d16..cb3cc0d16 100644
--- a/data/scripts/maps/MossdeepCity_House4.inc
+++ b/data/maps/MossdeepCity_House4/scripts.inc
diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc
new file mode 100644
index 000000000..d8314e6e5
--- /dev/null
+++ b/data/maps/MossdeepCity_Mart/events.inc
@@ -0,0 +1,13 @@
+MossdeepCity_Mart_EventObjects: @ 8532B50
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, 3, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0
+	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, 2, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_222408, 0
+
+MossdeepCity_Mart_MapWarps: @ 8532BB0
+	warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY
+	warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY
+
+MossdeepCity_Mart_MapEvents:: @ 8532BC0
+	map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc
index d745cc8f4..586c976e7 100644
--- a/data/maps/MossdeepCity_Mart/header.inc
+++ b/data/maps/MossdeepCity_Mart/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_Mart: @ 8483948
-	.4byte MossdeepCity_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte MossdeepCity_Mart_MapEvents
 	.4byte MossdeepCity_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/scripts.inc
index ed7ecd035..ed7ecd035 100644
--- a/data/scripts/maps/MossdeepCity_Mart.inc
+++ b/data/maps/MossdeepCity_Mart/scripts.inc
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..7e56185b2
--- /dev/null
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,13 @@
+MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0
+
+MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80
+	warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY
+	warp_def 6, 8, 3, 2, MAP_MOSSDEEP_CITY
+	warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F
+
+MossdeepCity_PokemonCenter_1F_MapEvents:: @ 8532A98
+	map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
index 0b9faca99..5ee83f3ce 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_PokemonCenter_1F: @ 8483910
-	.4byte MossdeepCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte MossdeepCity_PokemonCenter_1F_MapEvents
 	.4byte MossdeepCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
index 7fd2e61a0..7fd2e61a0 100644
--- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..c5d5af15a
--- /dev/null
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,15 @@
+MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 7, 3, 5, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0
+
+MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24
+	warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+MossdeepCity_PokemonCenter_2F_MapEvents:: @ 8532B3C
+	map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
index 45e4f0881..a6659fafb 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_PokemonCenter_2F: @ 848392C
-	.4byte MossdeepCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte MossdeepCity_PokemonCenter_2F_MapEvents
 	.4byte MossdeepCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
index 142bce560..142bce560 100644
--- a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
new file mode 100644
index 000000000..fa5a8f3bb
--- /dev/null
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
@@ -0,0 +1,21 @@
+MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, 3, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, 9, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756
+	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, 9, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756
+	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, 8, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756
+	object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, 8, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756
+	object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 5, 0, 76, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737
+	object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, 8, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753
+
+MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20
+	warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY
+	warp_def 8, 9, 0, 8, MAP_MOSSDEEP_CITY
+	warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F
+
+MossdeepCity_SpaceCenter_1F_MapEvents:: @ 8532E38
+	map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
index b503f8580..abfb64ee8 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_SpaceCenter_1F: @ 84839B8
-	.4byte MossdeepCity_SpaceCenter_1F_MapAttributes
+	.4byte MossdeepCity_SpaceCenter_1F_Layout
 	.4byte MossdeepCity_SpaceCenter_1F_MapEvents
 	.4byte MossdeepCity_SpaceCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
index 2edf6d251..2edf6d251 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
new file mode 100644
index 000000000..bf143934e
--- /dev/null
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
@@ -0,0 +1,17 @@
+MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C
+	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, 2, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0
+	object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, 8, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, 10, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, 7, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862
+	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, 9, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862
+	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, 10, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862
+	object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, 7, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862
+
+MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24
+	warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F
+
+MossdeepCity_SpaceCenter_2F_MapEvents:: @ 8532F2C
+	map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
index 388482c64..3a7fce680 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_SpaceCenter_2F: @ 84839D4
-	.4byte MossdeepCity_SpaceCenter_2F_MapAttributes
+	.4byte MossdeepCity_SpaceCenter_2F_Layout
 	.4byte MossdeepCity_SpaceCenter_2F_MapEvents
 	.4byte MossdeepCity_SpaceCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
new file mode 100644
index 000000000..0052f09aa
--- /dev/null
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -0,0 +1,524 @@
+MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58
+	map_script 3, MossdeepCity_SpaceCenter_2F_MapScript1_223D63
+	map_script 2, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5
+	.byte 0
+
+MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63
+	compare VAR_0x405D, 2
+	call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D7A
+	compare VAR_0x409F, 2
+	call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D9F
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A
+	clearflag FLAG_0x0CD
+	setobjectxyperm 3, 5, 3
+	setobjectmovementtype 3, 10
+	setobjectxyperm 1, 3, 2
+	setobjectmovementtype 1, 10
+	setobjectxyperm 2, 1, 3
+	setobjectmovementtype 2, 10
+	return
+
+MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F
+	setobjectxyperm 5, 11, 2
+	setobjectxyperm 7, 15, 2
+	setobjectxyperm 6, 13, 4
+	return
+
+MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5
+	map_script_2 VAR_0x409F, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF
+	.2byte 0
+
+MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF
+	playse SE_PIN
+	applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_272598
+	waitmovement 0
+	applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_27259A
+	waitmovement 0
+	msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, 5
+	compare VAR_RESULT, 1
+	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09
+	msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, 4
+	closemessage
+	applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_223E07
+	waitmovement 0
+	warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1
+	waitstate
+	releaseall
+	end
+
+MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07
+	walk_up
+	step_end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09
+	msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, 4
+	trainerbattle 3, TRAINER_GRUNT_34, 0, MossdeepCity_SpaceCenter_2F_Text_224461
+	applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85
+	waitmovement 0
+	applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A4
+	waitmovement 0
+	msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, 4
+	trainerbattle 3, TRAINER_GRUNT_35, 0, MossdeepCity_SpaceCenter_2F_Text_224499
+	applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81
+	waitmovement 0
+	applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A8
+	waitmovement 0
+	msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, 4
+	trainerbattle 3, TRAINER_GRUNT_36, 0, MossdeepCity_SpaceCenter_2F_Text_2244F1
+	applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89
+	waitmovement 0
+	setvar VAR_0x409F, 2
+	moveobjectoffscreen 5
+	moveobjectoffscreen 7
+	moveobjectoffscreen 6
+	releaseall
+	end
+
+MossdeepCity_SpaceCenter_2F_Movement_223E81: @ 8223E81
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
+	step_end
+
+MossdeepCity_SpaceCenter_2F_Movement_223E85: @ 8223E85
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
+	step_end
+
+MossdeepCity_SpaceCenter_2F_Movement_223E89: @ 8223E89
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
+	step_end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D
+	lock
+	faceplayer
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EB4
+	compare VAR_0x405D, 2
+	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE
+	compare VAR_0x405D, 2
+	goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EB4
+	goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223EB4:: @ 8223EB4
+	msgbox MossdeepCity_SpaceCenter_2F_Text_2241A1, 4
+	release
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223EBE:: @ 8223EBE
+	msgbox MossdeepCity_SpaceCenter_2F_Text_22420C, 4
+	release
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8
+	lock
+	faceplayer
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EEF
+	compare VAR_0x405D, 2
+	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9
+	compare VAR_0x405D, 2
+	goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EEF
+	goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223EEF:: @ 8223EEF
+	msgbox MossdeepCity_SpaceCenter_2F_Text_224253, 4
+	release
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223EF9:: @ 8223EF9
+	msgbox MossdeepCity_SpaceCenter_2F_Text_2242C5, 4
+	release
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03
+	lock
+	faceplayer
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F2A
+	compare VAR_0x405D, 2
+	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34
+	compare VAR_0x405D, 2
+	goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223F2A
+	goto MossdeepCity_SpaceCenter_2F_EventScript_223F34
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223F2A:: @ 8223F2A
+	msgbox MossdeepCity_SpaceCenter_2F_Text_224342, 4
+	release
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223F34:: @ 8223F34
+	msgbox MossdeepCity_SpaceCenter_2F_Text_224376, 4
+	release
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223F3E:: @ 8223F3E
+	msgbox MossdeepCity_SpaceCenter_2F_Text_22452C, 2
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223F47:: @ 8223F47
+	msgbox MossdeepCity_SpaceCenter_2F_Text_224570, 2
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223F50:: @ 8223F50
+	msgbox MossdeepCity_SpaceCenter_2F_Text_2245AF, 2
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59
+	lock
+	faceplayer
+	msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, 4
+	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223F6F:: @ 8223F6F
+	lockall
+	msgbox MossdeepCity_SpaceCenter_2F_Text_22467B, 4
+	releaseall
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A
+	lockall
+	checkflag FLAG_0x0CD
+	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223FDA
+	setflag FLAG_0x0CD
+	msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, 4
+	msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, 4
+	closemessage
+	delay 30
+	playse SE_KOUKA_L
+	switch VAR_FACING
+	case 1, MossdeepCity_SpaceCenter_2F_EventScript_223FBA
+	applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FC6
+	waitmovement 0
+	releaseall
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223FBA:: @ 8223FBA
+	applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FCF
+	waitmovement 0
+	releaseall
+	end
+
+MossdeepCity_SpaceCenter_2F_Movement_223FC6: @ 8223FC6
+	lock_facing_direction
+	walk_fast_up
+	walk_fast_up
+	unlock_facing_direction
+	delay_16
+	delay_16
+	walk_slow_down
+	walk_slow_down
+	step_end
+
+MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF
+	face_left
+	lock_facing_direction
+	walk_fast_right
+	walk_fast_right
+	unlock_facing_direction
+	delay_16
+	delay_16
+	walk_slow_left
+	walk_slow_left
+	face_down
+	step_end
+
+MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA
+	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E
+	waitmovement 0
+	msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, 5
+	compare VAR_RESULT, 1
+	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C
+	msgbox MossdeepCity_SpaceCenter_2F_Text_224854, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA
+	waitmovement 0
+	releaseall
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
+	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA
+	waitmovement 0
+	special SavePlayerParty
+	fadescreen 1
+	special sub_80F9438
+	waitstate
+	compare VAR_RESULT, 0
+	goto_if 5, MossdeepCity_SpaceCenter_2F_EventScript_224032
+	special LoadPlayerParty
+	goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA
+
+MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
+	special sub_80F94E8
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	special sub_81A1780
+	setvar VAR_0x8004, 8
+	setvar VAR_0x8005, 0
+	special sub_8163AC4
+	waitstate
+	setvar VAR_0x8004, 6
+	special sub_81A1780
+	special LoadPlayerParty
+	switch VAR_RESULT
+	case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071
+	fadescreen 1
+	special sp0C8_whiteout_maybe
+	waitstate
+
+MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
+	msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, 4
+	closemessage
+	delay 20
+	applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4
+	applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725AA
+	waitmovement 0
+	delay 60
+	applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A6
+	applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8
+	waitmovement 0
+	delay 20
+	msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, 4
+	closemessage
+	setvar VAR_0x405D, 3
+	fadedefaultbgm
+	fadescreen 1
+	setvar VAR_0x409F, 3
+	setflag FLAG_0x2F4
+	setflag FLAG_0x35E
+	setflag FLAG_0x337
+	removeobject 5
+	removeobject 7
+	removeobject 6
+	removeobject 8
+	removeobject 9
+	setobjectxy 3, 5, 6
+	turnobject 3, 1
+	setobjectxy 2, 11, 8
+	turnobject 2, 2
+	setobjectxy 1, 6, 2
+	turnobject 1, 2
+	call MossdeepCity_SpaceCenter_2F_EventScript_224131
+	fadescreen 0
+	msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, 4
+	closemessage
+	fadescreen 1
+	setflag FLAG_0x075
+	setflag FLAG_0x3C7
+	removeobject 4
+	setflag FLAG_0x2E1
+	clearflag FLAG_0x3C7
+	setvar VAR_0x40C6, 1
+	setflag FLAG_0x314
+	removeobject 3
+	setobjectxyperm 3, 5, 6
+	setobjectmovementtype 3, 2
+	addobject 3
+	fadescreen 0
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_224131:: @ 8224131
+	switch VAR_FACING
+	case 1, MossdeepCity_SpaceCenter_2F_EventScript_22414D
+	case 3, MossdeepCity_SpaceCenter_2F_EventScript_224152
+	return
+
+MossdeepCity_SpaceCenter_2F_EventScript_22414D:: @ 822414D
+	turnobject 4, 2
+	return
+
+MossdeepCity_SpaceCenter_2F_EventScript_224152:: @ 8224152
+	turnobject 4, 4
+	return
+
+MossdeepCity_SpaceCenter_2F_EventScript_224157:: @ 8224157
+	trainerbattle 10, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166
+	trainerbattle 11, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175
+	lockall
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_224193
+	compare VAR_RESULT, 1
+	call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_22419A
+	closemessage
+	clearflag FLAG_0x075
+	releaseall
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_224193:: @ 8224193
+	pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B38C1
+	waitmessage
+	return
+
+MossdeepCity_SpaceCenter_2F_EventScript_22419A:: @ 822419A
+	pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B39C6
+	waitmessage
+	return
+
+MossdeepCity_SpaceCenter_2F_Text_2241A1: @ 82241A1
+	.string "MOSSDEEP has mainly sunny weather,\n"
+	.string "and its winds are stable.\p"
+	.string "It’s an ideal location for launching\n"
+	.string "rockets.$"
+
+MossdeepCity_SpaceCenter_2F_Text_22420C: @ 822420C
+	.string "Why would TEAM MAGMA want to steal\n"
+	.string "our rocket fuel in the first place?$"
+
+MossdeepCity_SpaceCenter_2F_Text_224253: @ 8224253
+	.string "If only I was a little younger, I would\n"
+	.string "have liked being an astronaut…\p"
+	.string "No… It’s not too late!\n"
+	.string "I can and will try!$"
+
+MossdeepCity_SpaceCenter_2F_Text_2242C5: @ 82242C5
+	.string "If TEAM MAGMA takes the rocket fuel,\n"
+	.string "I won’t be able to go to space!\p"
+	.string "They can’t be allowed to get away\n"
+	.string "with such an outrage!$"
+
+MossdeepCity_SpaceCenter_2F_Text_224342: @ 8224342
+	.string "I wish ordinary people could go into\n"
+	.string "space one day…$"
+
+MossdeepCity_SpaceCenter_2F_Text_224376: @ 8224376
+	.string "TEAM MAGMA…\n"
+	.string "Do they want to go to space, too?$"
+
+MossdeepCity_SpaceCenter_2F_Text_2243A4: @ 82243A4
+	.string "What’s wrong with you?\p"
+	.string "You’re outnumbered three to one,\n"
+	.string "but you still want to take us on?$"
+
+MossdeepCity_SpaceCenter_2F_Text_2243FE: @ 82243FE
+	.string "Good answer!\n"
+	.string "That’s what a smart person’ll do!$"
+
+MossdeepCity_SpaceCenter_2F_Text_22442D: @ 822442D
+	.string "A reckless go-getter, are you?\n"
+	.string "Okay, I’ll go first!$"
+
+MossdeepCity_SpaceCenter_2F_Text_224461: @ 8224461
+	.string "I lost!\n"
+	.string "But!$"
+
+MossdeepCity_SpaceCenter_2F_Text_22446E: @ 822446E
+	.string "It’s too soon to be relieved!\n"
+	.string "I’m up next!$"
+
+MossdeepCity_SpaceCenter_2F_Text_224499: @ 8224499
+	.string "I lost, too!\n"
+	.string "But!$"
+
+MossdeepCity_SpaceCenter_2F_Text_2244AB: @ 82244AB
+	.string "I bet you want to take a break.\n"
+	.string "But I’m not about to let you do that!$"
+
+MossdeepCity_SpaceCenter_2F_Text_2244F1: @ 82244F1
+	.string "We should’ve taken a break…\n"
+	.string "That’s what we should’ve done…$"
+
+MossdeepCity_SpaceCenter_2F_Text_22452C: @ 822452C
+	.string "Three of us here, and look at the sorry\n"
+	.string "mess we got ourselves into.$"
+
+MossdeepCity_SpaceCenter_2F_Text_224570: @ 8224570
+	.string "We three losing like this…\n"
+	.string "We look worse than usual by triple!$"
+
+MossdeepCity_SpaceCenter_2F_Text_2245AF: @ 82245AF
+	.string "Are we being useful to our leader\n"
+	.string "at all?$"
+
+MossdeepCity_SpaceCenter_2F_Text_2245D9: @ 82245D9
+	.string "Hehehe!\p"
+	.string "We come all the way here to get some\n"
+	.string "fuel, and we’re interfered with again!\p"
+	.string "If you’re going to mess with us too,\n"
+	.string "we’ll take care of you at the same time!$"
+
+MossdeepCity_SpaceCenter_2F_Text_22467B: @ 822467B
+	.string "MAXIE: Clear out of the way!\n"
+	.string "Don’t you dare interfere!$"
+
+MossdeepCity_SpaceCenter_2F_Text_2246B2: @ 82246B2
+	.string "STEVEN: TEAM MAGMA…\p"
+	.string "What’s the point of stealing rocket\n"
+	.string "fuel?$"
+
+MossdeepCity_SpaceCenter_2F_Text_2246F0: @ 82246F0
+	.string "MAXIE: Fufufu… Since you’re so\n"
+	.string "curious, you deserve an explanation.\p"
+	.string "We’re going to jettison the entire\n"
+	.string "load into MT. CHIMNEY!\p"
+	.string "With GROUDON gone, we have no need\n"
+	.string "for that slag heap of a mountain!\p"
+	.string "So we’ll use the fuel’s power to make\n"
+	.string "the volcano erupt!\p"
+	.string "It will be savage!$"
+
+MossdeepCity_SpaceCenter_2F_Text_2247FF: @ 82247FF
+	.string "STEVEN: {PLAYER}{KUN}!\n"
+	.string "You’re going to help me?\p"
+	.string "Let’s go into battle together!\n"
+	.string "Are you ready?$"
+
+MossdeepCity_SpaceCenter_2F_Text_224854: @ 8224854
+	.string "STEVEN: Then, hurry!\n"
+	.string "Get ready quickly!$"
+
+MossdeepCity_SpaceCenter_2F_Text_22487C: @ 822487C
+	.string "All I want…\n"
+	.string "I just want to expand the land mass…$"
+
+MossdeepCity_SpaceCenter_Text_2248AD: @ 82248AD
+	.string "I’m with our leader…$"
+
+MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2
+	.string "MAXIE: We failed to make the volcano\n"
+	.string "erupt…\p"
+	.string "We failed to control GROUDON after\n"
+	.string "we had awoken it…\p"
+	.string "Is our goal to expand the land\n"
+	.string "misguided?\p"
+	.string "… … … … … …\n"
+	.string "… … … … … …\p"
+	.string "If…\n"
+	.string "If we, TEAM MAGMA, are wrong…\l"
+	.string "… … … … … …\p"
+	.string "Then might TEAM AQUA’s goal to expand\n"
+	.string "the sea also be equally misguided?$"
+
+MossdeepCity_SpaceCenter_2F_Text_2249DC: @ 82249DC
+	.string "MAXIE: All right…\n"
+	.string "We will give up on the fuel…\p"
+	.string "There appear to be more important\n"
+	.string "matters that I must examine…$"
+
+MossdeepCity_SpaceCenter_2F_Text_224A4A: @ 8224A4A
+	.string "STEVEN: Whew, that was too tense.\n"
+	.string "{PLAYER}{KUN}, thank you.\p"
+	.string "I have something to give you as\n"
+	.string "thanks for your support.\p"
+	.string "Please come see me at home\n"
+	.string "after this.\p"
+	.string "Oh, yes, I don’t live in RUSTBORO CITY.\n"
+	.string "I live right here on this island.$"
+
diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc
new file mode 100644
index 000000000..0ee8e7d15
--- /dev/null
+++ b/data/maps/MossdeepCity_StevensHouse/events.inc
@@ -0,0 +1,18 @@
+MossdeepCity_StevensHouse_EventObjects: @ 8532C10
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, 1, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 76, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727
+
+MossdeepCity_StevensHouse_MapWarps: @ 8532C58
+	warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY
+	warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY
+
+MossdeepCity_StevensHouse_MapBGEvents: @ 8532C68
+	bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222909
+	bg_event 1, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222909
+	bg_event 10, 4, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_222909
+	bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_222909
+
+MossdeepCity_StevensHouse_MapEvents:: @ 8532C98
+	map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents
+
diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc
index 179ebd36e..83a907bda 100644
--- a/data/maps/MossdeepCity_StevensHouse/header.inc
+++ b/data/maps/MossdeepCity_StevensHouse/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_StevensHouse: @ 8483980
-	.4byte MossdeepCity_StevensHouse_MapAttributes
+	.4byte MossdeepCity_StevensHouse_Layout
 	.4byte MossdeepCity_StevensHouse_MapEvents
 	.4byte MossdeepCity_StevensHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index 14d0cd5c7..14d0cd5c7 100644
--- a/data/scripts/maps/MossdeepCity_StevensHouse.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc
new file mode 100644
index 000000000..bb7e1a913
--- /dev/null
+++ b/data/maps/MtChimney/events.inc
@@ -0,0 +1,45 @@
+MtChimney_EventObjects: @ 85347C8
+	object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926
+	object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926
+	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926
+	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994
+	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927
+	object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926
+	object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
+	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927
+	object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
+	object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
+	object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927
+	object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927
+	object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926
+	object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
+	object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926
+	object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
+	object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927
+	object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926
+	object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
+	object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877
+	object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, 70, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877
+	object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, 17, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, 877
+	object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, 16, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, 877
+	object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, 9, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, 927
+	object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, 10, 1, 1, 1, 6, MtChimney_EventScript_22F208, 877
+
+MtChimney_MapWarps: @ 8534A98
+	warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION
+	warp_def 18, 36, 0, 1, MAP_MT_CHIMNEY_CABLE_CAR_STATION
+	warp_def 20, 41, 3, 2, MAP_JAGGED_PASS
+	warp_def 21, 41, 3, 3, MAP_JAGGED_PASS
+
+MtChimney_MapBGEvents: @ 8534AB8
+	bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_22F0E4
+	bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_22F141
+
+MtChimney_MapEvents:: @ 8534AD0
+	map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents
+
diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc
index 885541dde..bbdfaeb44 100644
--- a/data/maps/MtChimney/header.inc
+++ b/data/maps/MtChimney/header.inc
@@ -1,5 +1,5 @@
 MtChimney: @ 8484010
-	.4byte MtChimney_MapAttributes
+	.4byte MtChimney_Layout
 	.4byte MtChimney_MapEvents
 	.4byte MtChimney_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MtChimney.inc b/data/maps/MtChimney/scripts.inc
index 28135bb1e..28135bb1e 100644
--- a/data/scripts/maps/MtChimney.inc
+++ b/data/maps/MtChimney/scripts.inc
diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc
new file mode 100644
index 000000000..19385b3d5
--- /dev/null
+++ b/data/maps/MtChimney_CableCarStation/events.inc
@@ -0,0 +1,11 @@
+MtChimney_CableCarStation_EventObjects: @ 8533CA8
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0
+	object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0
+
+MtChimney_CableCarStation_MapWarps: @ 8533CD8
+	warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY
+	warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY
+
+MtChimney_CableCarStation_MapEvents:: @ 8533CE8
+	map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc
index e3f29070f..efd224564 100644
--- a/data/maps/MtChimney_CableCarStation/header.inc
+++ b/data/maps/MtChimney_CableCarStation/header.inc
@@ -1,5 +1,5 @@
 MtChimney_CableCarStation: @ 8483DFC
-	.4byte MtChimney_CableCarStation_MapAttributes
+	.4byte CableCarStation_Layout
 	.4byte MtChimney_CableCarStation_MapEvents
 	.4byte MtChimney_CableCarStation_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/scripts.inc
index b6c2118db..b6c2118db 100644
--- a/data/scripts/maps/MtChimney_CableCarStation.inc
+++ b/data/maps/MtChimney_CableCarStation/scripts.inc
diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc
new file mode 100644
index 000000000..80bf46c2e
--- /dev/null
+++ b/data/maps/MtPyre_1F/events.inc
@@ -0,0 +1,16 @@
+MtPyre_1F_EventObjects: @ 8534D64
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, 8, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, 7, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, 9, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0
+
+MtPyre_1F_MapWarps: @ 8534DAC
+	warp_def 17, 18, 3, 0, MAP_ROUTE122
+	warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR
+	warp_def 18, 18, 3, 0, MAP_ROUTE122
+	warp_def 4, 6, 3, 0, MAP_MT_PYRE_EXTERIOR
+	warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F
+	warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F
+
+MtPyre_1F_MapEvents:: @ 8534DDC
+	map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc
index 519211b49..17b7673c7 100644
--- a/data/maps/MtPyre_1F/header.inc
+++ b/data/maps/MtPyre_1F/header.inc
@@ -1,5 +1,5 @@
 MtPyre_1F: @ 8484064
-	.4byte MtPyre_1F_MapAttributes
+	.4byte MtPyre_1F_Layout
 	.4byte MtPyre_1F_MapEvents
 	.4byte MtPyre_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/maps/MtPyre_1F/scripts.inc
index 51c8a88fb..51c8a88fb 100644
--- a/data/scripts/maps/MtPyre_1F.inc
+++ b/data/maps/MtPyre_1F/scripts.inc
diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc
new file mode 100644
index 000000000..d5b24c06f
--- /dev/null
+++ b/data/maps/MtPyre_2F/events.inc
@@ -0,0 +1,20 @@
+MtPyre_2F_EventObjects: @ 8534DF0
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, 10, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, 1, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, 1129
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, 10, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 12, 10, 3, 8, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 9, 3, 8, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 9, 3, 8, 1, 1, 1, 1, MtPyre_2F_EventScript_23113F, 0
+	object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, 7, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0
+	object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, 17, 1, 1, 1, 2, MtPyre_2F_EventScript_231175, 0
+
+MtPyre_2F_MapWarps: @ 8534EB0
+	warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F
+	warp_def 10, 1, 3, 0, MAP_MT_PYRE_3F
+	warp_def 10, 12, 3, 4, MAP_MT_PYRE_3F
+	warp_def 6, 12, 3, 5, MAP_MT_PYRE_3F
+	warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F
+
+MtPyre_2F_MapEvents:: @ 8534ED8
+	map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc
index 6eb960c01..d4a35c4c6 100644
--- a/data/maps/MtPyre_2F/header.inc
+++ b/data/maps/MtPyre_2F/header.inc
@@ -1,5 +1,5 @@
 MtPyre_2F: @ 8484080
-	.4byte MtPyre_2F_MapAttributes
+	.4byte MtPyre_2F_Layout
 	.4byte MtPyre_2F_MapEvents
 	.4byte MtPyre_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc
new file mode 100644
index 000000000..de8520954
--- /dev/null
+++ b/data/maps/MtPyre_2F/scripts.inc
@@ -0,0 +1,135 @@
+MtPyre_2F_MapScripts:: @ 82310FB
+	map_script 2, MtPyre_2F_MapScript2_2A8327
+	map_script 3, MtPyre_2F_MapScript1_2A8331
+	map_script 5, MtPyre_2F_MapScript1_23110B
+	.byte 0
+
+MtPyre_2F_MapScript1_23110B: @ 823110B
+	setstepcallback 7
+	setholewarp MAP_MT_PYRE_1F, 255, 0, 0
+	end
+
+MtPyre_2F_EventScript_231116:: @ 8231116
+	msgbox MtPyre_2F_Text_2311A3, 2
+	end
+
+MtPyre_2F_EventScript_23111F:: @ 823111F
+	msgbox MtPyre_2F_Text_2311E6, 2
+	end
+
+MtPyre_2F_EventScript_231128:: @ 8231128
+	trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2
+	msgbox MtPyre_2F_Text_2312CB, 6
+	end
+
+MtPyre_2F_EventScript_23113F:: @ 823113F
+	trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414
+	msgbox MtPyre_2F_Text_2313B1, 6
+	end
+
+MtPyre_2F_EventScript_23115A:: @ 823115A
+	trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582
+	msgbox MtPyre_2F_Text_23154D, 6
+	end
+
+MtPyre_2F_EventScript_231175:: @ 8231175
+	trainerbattle 0, TRAINER_LEAH, 0, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645
+	msgbox MtPyre_2F_Text_23165A, 6
+	end
+
+MtPyre_2F_EventScript_23118C:: @ 823118C
+	trainerbattle 0, TRAINER_ZANDER, 0, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1
+	msgbox MtPyre_2F_Text_2316FB, 6
+	end
+
+MtPyre_2F_Text_2311A3: @ 82311A3
+	.string "Memories of my darling SKITTY…\n"
+	.string "My eyes overflow thinking about it.$"
+
+MtPyre_2F_Text_2311E6: @ 82311E6
+	.string "Ooch, ouch… There are holes in the\n"
+	.string "ground here and there.\p"
+	.string "I didn’t notice and took a tumble from\n"
+	.string "the floor above.$"
+
+MtPyre_2F_Text_231258: @ 8231258
+	.string "Hey! Are you searching for POKéMON?\n"
+	.string "You came along after me! You’re rude!$"
+
+MtPyre_2F_Text_2312A2: @ 82312A2
+	.string "Ayieeeeh!\n"
+	.string "I’m sorry, forgive me, please!$"
+
+MtPyre_2F_Text_2312CB: @ 82312CB
+	.string "People don’t come here often, so\n"
+	.string "I thought there’d be rare POKéMON.$"
+
+MtPyre_2F_Text_23130F: @ 823130F
+	.string "LUKE: We’re here on a dare.\p"
+	.string "Heheh, if I show her how cool I am,\n"
+	.string "she’ll fall for me. I know it!\p"
+	.string "I know! I’ll cream you and show her\n"
+	.string "how cool I am!$"
+
+MtPyre_2F_Text_2313A1: @ 82313A1
+	.string "LUKE: Whoopsie!$"
+
+MtPyre_2F_Text_2313B1: @ 82313B1
+	.string "LUKE: Well, we lost but that’s okay!\n"
+	.string "I’m right here by your side.\l"
+	.string "We’ll make it through this dare!$"
+
+MtPyre_2F_Text_231414: @ 8231414
+	.string "LUKE: If you want to take me on,\n"
+	.string "bring some more POKéMON.\p"
+	.string "If you don’t, I won’t be able to show\n"
+	.string "off to my girl how cool I am!$"
+
+MtPyre_2F_Text_231492: @ 8231492
+	.string "DEZ: I came here on a dare with my\n"
+	.string "boyfriend.\p"
+	.string "It’s really scary, but I’m with my\n"
+	.string "boyfriend. It’s okay.\p"
+	.string "I know! I’ll get my boyfriend to look\n"
+	.string "cool by beating you!$"
+
+MtPyre_2F_Text_231534: @ 8231534
+	.string "DEZ: Waaaah! I’m scared!$"
+
+MtPyre_2F_Text_23154D: @ 823154D
+	.string "DEZ: We’re lovey-dovey, so we don’t\n"
+	.string "care if we lose!$"
+
+MtPyre_2F_Text_231582: @ 8231582
+	.string "DEZ: If you want to challenge us, you\n"
+	.string "should bring at least two POKéMON.\p"
+	.string "My boyfriend’s strong.\n"
+	.string "Just one POKéMON won’t do at all.$"
+
+MtPyre_2F_Text_231604: @ 8231604
+	.string "You are an unfamiliar sight…\n"
+	.string "Depart before anything befalls you!$"
+
+MtPyre_2F_Text_231645: @ 8231645
+	.string "Hmm…\n"
+	.string "You’re durable.$"
+
+MtPyre_2F_Text_23165A: @ 823165A
+	.string "Our family has been TRAINERS here\n"
+	.string "since my great-grandmother’s time…\p"
+	.string "It is my duty to protect this\n"
+	.string "mountain…$"
+
+MtPyre_2F_Text_2316C7: @ 82316C7
+	.string "Kiyaaaaah!\n"
+	.string "I’m terrified!$"
+
+MtPyre_2F_Text_2316E1: @ 82316E1
+	.string "Nooooooo!\n"
+	.string "I lost my wits!$"
+
+MtPyre_2F_Text_2316FB: @ 82316FB
+	.string "I get freaked out every time I see\n"
+	.string "anything move…\p"
+	.string "I shouldn’t have come here to train…$"
+
diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc
new file mode 100644
index 000000000..bf0d1af77
--- /dev/null
+++ b/data/maps/MtPyre_3F/events.inc
@@ -0,0 +1,17 @@
+MtPyre_3F_EventObjects: @ 8534EEC
+	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, 18, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, 17, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, 1, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, 1120
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 14, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0
+
+MtPyre_3F_MapWarps: @ 8534F4C
+	warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F
+	warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F
+	warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F
+	warp_def 1, 12, 3, 5, MAP_MT_PYRE_4F
+	warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F
+	warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F
+
+MtPyre_3F_MapEvents:: @ 8534F7C
+	map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc
index 9dcd40578..8bf9f015a 100644
--- a/data/maps/MtPyre_3F/header.inc
+++ b/data/maps/MtPyre_3F/header.inc
@@ -1,5 +1,5 @@
 MtPyre_3F: @ 848409C
-	.4byte MtPyre_3F_MapAttributes
+	.4byte MtPyre_3F_Layout
 	.4byte MtPyre_3F_MapEvents
 	.4byte MtPyre_3F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MtPyre_3F.inc b/data/maps/MtPyre_3F/scripts.inc
index ec5373509..ec5373509 100644
--- a/data/scripts/maps/MtPyre_3F.inc
+++ b/data/maps/MtPyre_3F/scripts.inc
diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc
new file mode 100644
index 000000000..e39075d8b
--- /dev/null
+++ b/data/maps/MtPyre_4F/events.inc
@@ -0,0 +1,15 @@
+MtPyre_4F_EventObjects: @ 8534F90
+	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, 24, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, 1, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, 1130
+
+MtPyre_4F_MapWarps: @ 8534FC0
+	warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F
+	warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F
+	warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F
+	warp_def 12, 12, 3, 4, MAP_MT_PYRE_5F
+	warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F
+	warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F
+
+MtPyre_4F_MapEvents:: @ 8534FF0
+	map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc
index c94284c2f..9360976d4 100644
--- a/data/maps/MtPyre_4F/header.inc
+++ b/data/maps/MtPyre_4F/header.inc
@@ -1,5 +1,5 @@
 MtPyre_4F: @ 84840B8
-	.4byte MtPyre_4F_MapAttributes
+	.4byte MtPyre_4F_Layout
 	.4byte MtPyre_4F_MapEvents
 	.4byte MtPyre_4F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MtPyre_4F.inc b/data/maps/MtPyre_4F/scripts.inc
index 0573e0f11..0573e0f11 100644
--- a/data/scripts/maps/MtPyre_4F.inc
+++ b/data/maps/MtPyre_4F/scripts.inc
diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc
new file mode 100644
index 000000000..03a9b773f
--- /dev/null
+++ b/data/maps/MtPyre_5F/events.inc
@@ -0,0 +1,14 @@
+MtPyre_5F_EventObjects: @ 8535004
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, 17, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, 1052
+
+MtPyre_5F_MapWarps: @ 8535034
+	warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F
+	warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F
+	warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F
+	warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F
+	warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F
+
+MtPyre_5F_MapEvents:: @ 853505C
+	map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc
index efabc0917..193120ca8 100644
--- a/data/maps/MtPyre_5F/header.inc
+++ b/data/maps/MtPyre_5F/header.inc
@@ -1,5 +1,5 @@
 MtPyre_5F: @ 84840D4
-	.4byte MtPyre_5F_MapAttributes
+	.4byte MtPyre_5F_Layout
 	.4byte MtPyre_5F_MapEvents
 	.4byte MtPyre_5F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MtPyre_5F.inc b/data/maps/MtPyre_5F/scripts.inc
index 4678ac7e0..4678ac7e0 100644
--- a/data/scripts/maps/MtPyre_5F.inc
+++ b/data/maps/MtPyre_5F/scripts.inc
diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc
new file mode 100644
index 000000000..1f00209b2
--- /dev/null
+++ b/data/maps/MtPyre_6F/events.inc
@@ -0,0 +1,12 @@
+MtPyre_6F_EventObjects: @ 8535070
+	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, 23, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, 1, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, 1089
+	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, 24, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0
+
+MtPyre_6F_MapWarps: @ 85350B8
+	warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F
+	warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F
+
+MtPyre_6F_MapEvents:: @ 85350C8
+	map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc
index f6931369b..3c390f962 100644
--- a/data/maps/MtPyre_6F/header.inc
+++ b/data/maps/MtPyre_6F/header.inc
@@ -1,5 +1,5 @@
 MtPyre_6F: @ 84840F0
-	.4byte MtPyre_6F_MapAttributes
+	.4byte MtPyre_6F_Layout
 	.4byte MtPyre_6F_MapEvents
 	.4byte MtPyre_6F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/maps/MtPyre_6F/scripts.inc
index 8d5d912c2..8d5d912c2 100644
--- a/data/scripts/maps/MtPyre_6F.inc
+++ b/data/maps/MtPyre_6F/scripts.inc
diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc
new file mode 100644
index 000000000..badd884f9
--- /dev/null
+++ b/data/maps/MtPyre_Exterior/events.inc
@@ -0,0 +1,23 @@
+MtPyre_Exterior_EventObjects: @ 85350DC
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074
+
+MtPyre_Exterior_MapWarps: @ 853510C
+	warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F
+	warp_def 19, 10, 3, 1, MAP_MT_PYRE_SUMMIT
+	warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT
+
+MtPyre_Exterior_MapCoordEvents: @ 8535124
+	coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED
+	coord_event 25, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED
+	coord_event 22, 27, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FF2
+	coord_event 23, 28, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FF2
+	coord_event 26, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED
+
+MtPyre_Exterior_MapBGEvents: @ 8535174
+	bg_event 9, 8, 0, 7, 0, ITEM_ULTRA_BALL, 29, 0
+	bg_event 16, 22, 0, 7, 0, ITEM_MAX_ETHER, 78, 0
+
+MtPyre_Exterior_MapEvents:: @ 853518C
+	map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents
+
diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc
index 7d9df6a8e..013d84e84 100644
--- a/data/maps/MtPyre_Exterior/header.inc
+++ b/data/maps/MtPyre_Exterior/header.inc
@@ -1,5 +1,5 @@
 MtPyre_Exterior: @ 848410C
-	.4byte MtPyre_Exterior_MapAttributes
+	.4byte MtPyre_Exterior_Layout
 	.4byte MtPyre_Exterior_MapEvents
 	.4byte MtPyre_Exterior_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/scripts.inc
index 8f757ebb4..8f757ebb4 100644
--- a/data/scripts/maps/MtPyre_Exterior.inc
+++ b/data/maps/MtPyre_Exterior/scripts.inc
diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc
new file mode 100644
index 000000000..2df3aaafd
--- /dev/null
+++ b/data/maps/MtPyre_Summit/events.inc
@@ -0,0 +1,30 @@
+MtPyre_Summit_EventObjects: @ 85351A0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0
+	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, 916
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917
+	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, 9, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, 917
+	object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, 7, 1, 1, 0, 0, 0x0, 856
+
+MtPyre_Summit_MapWarps: @ 8535260
+	warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
+	warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
+	warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
+
+MtPyre_Summit_MapCoordEvents: @ 8535278
+	coord_event 22, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232018
+	coord_event 23, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232024
+	coord_event 24, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232030
+	coord_event 22, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_2321EC
+	coord_event 23, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_2321F8
+	coord_event 24, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_232204
+
+MtPyre_Summit_MapBGEvents: @ 85352D8
+	bg_event 9, 25, 0, 7, 0, ITEM_ZINC, 79, 0
+	bg_event 37, 7, 3, 7, 0, ITEM_RARE_CANDY, 80, 0
+
+MtPyre_Summit_MapEvents:: @ 85352F0
+	map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents
+
diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc
index ffdb8fb8a..55f9d512b 100644
--- a/data/maps/MtPyre_Summit/header.inc
+++ b/data/maps/MtPyre_Summit/header.inc
@@ -1,5 +1,5 @@
 MtPyre_Summit: @ 8484128
-	.4byte MtPyre_Summit_MapAttributes
+	.4byte MtPyre_Summit_Layout
 	.4byte MtPyre_Summit_MapEvents
 	.4byte MtPyre_Summit_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/scripts.inc
index fe39e9d48..fe39e9d48 100644
--- a/data/scripts/maps/MtPyre_Summit.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
diff --git a/data/maps/NavelRock_B1F/events.inc b/data/maps/NavelRock_B1F/events.inc
new file mode 100644
index 000000000..e83d221dd
--- /dev/null
+++ b/data/maps/NavelRock_B1F/events.inc
@@ -0,0 +1,7 @@
+NavelRock_B1F_MapWarps: @ 853DA94
+	warp_def 4, 3, 3, 0, MAP_NAVEL_ROCK_ENTRANCE
+	warp_def 18, 9, 3, 1, MAP_NAVEL_ROCK_FORK
+
+NavelRock_B1F_MapEvents:: @ 853DAA4
+	map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc
index 8570628b2..9a9b308de 100644
--- a/data/maps/NavelRock_B1F/header.inc
+++ b/data/maps/NavelRock_B1F/header.inc
@@ -1,5 +1,5 @@
 NavelRock_B1F: @ 84858C8
-	.4byte NavelRock_B1F_MapAttributes
+	.4byte NavelRock_B1F_Layout
 	.4byte NavelRock_B1F_MapEvents
 	.4byte NavelRock_B1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_B1F.inc b/data/maps/NavelRock_B1F/scripts.inc
index a8906f24d..a8906f24d 100644
--- a/data/scripts/maps/NavelRock_B1F.inc
+++ b/data/maps/NavelRock_B1F/scripts.inc
diff --git a/data/maps/NavelRock_Bottom/events.inc b/data/maps/NavelRock_Bottom/events.inc
new file mode 100644
index 000000000..fec170ae9
--- /dev/null
+++ b/data/maps/NavelRock_Bottom/events.inc
@@ -0,0 +1,9 @@
+NavelRock_Bottom_EventObjects: @ 853DD50
+	object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, 8, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800
+
+NavelRock_Bottom_MapWarps: @ 853DD68
+	warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11
+
+NavelRock_Bottom_MapEvents:: @ 853DD70
+	map_events NavelRock_Bottom_EventObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc
index e40c64d91..84d942a9e 100644
--- a/data/maps/NavelRock_Bottom/header.inc
+++ b/data/maps/NavelRock_Bottom/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Bottom: @ 8485AC0
-	.4byte NavelRock_Bottom_MapAttributes
+	.4byte NavelRock_Bottom_Layout
 	.4byte NavelRock_Bottom_MapEvents
 	.4byte NavelRock_Bottom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Bottom.inc b/data/maps/NavelRock_Bottom/scripts.inc
index cce93e624..cce93e624 100644
--- a/data/scripts/maps/NavelRock_Bottom.inc
+++ b/data/maps/NavelRock_Bottom/scripts.inc
diff --git a/data/maps/NavelRock_Down01/events.inc b/data/maps/NavelRock_Down01/events.inc
new file mode 100644
index 000000000..3a6045215
--- /dev/null
+++ b/data/maps/NavelRock_Down01/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Down01_MapWarps: @ 853DBC4
+	warp_def 3, 3, 3, 2, MAP_NAVEL_ROCK_FORK
+	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN02
+
+NavelRock_Down01_MapEvents:: @ 853DBD4
+	map_events 0x0, NavelRock_Down01_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc
index af66bb9bc..4f8237761 100644
--- a/data/maps/NavelRock_Down01/header.inc
+++ b/data/maps/NavelRock_Down01/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Down01: @ 848598C
-	.4byte NavelRock_Down01_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Down01_MapEvents
 	.4byte NavelRock_Down01_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Down01.inc b/data/maps/NavelRock_Down01/scripts.inc
index 9677167eb..9677167eb 100644
--- a/data/scripts/maps/NavelRock_Down01.inc
+++ b/data/maps/NavelRock_Down01/scripts.inc
diff --git a/data/maps/NavelRock_Down02/events.inc b/data/maps/NavelRock_Down02/events.inc
new file mode 100644
index 000000000..7441539c9
--- /dev/null
+++ b/data/maps/NavelRock_Down02/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Down02_MapWarps: @ 853DBE8
+	warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN01
+	warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN03
+
+NavelRock_Down02_MapEvents:: @ 853DBF8
+	map_events 0x0, NavelRock_Down02_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc
index 8b70d543f..027de3f91 100644
--- a/data/maps/NavelRock_Down02/header.inc
+++ b/data/maps/NavelRock_Down02/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Down02: @ 84859A8
-	.4byte NavelRock_Down02_MapAttributes
+	.4byte NavelRock_LadderRoom2_Layout
 	.4byte NavelRock_Down02_MapEvents
 	.4byte NavelRock_Down02_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Down02.inc b/data/maps/NavelRock_Down02/scripts.inc
index 946530a4a..946530a4a 100644
--- a/data/scripts/maps/NavelRock_Down02.inc
+++ b/data/maps/NavelRock_Down02/scripts.inc
diff --git a/data/maps/NavelRock_Down03/events.inc b/data/maps/NavelRock_Down03/events.inc
new file mode 100644
index 000000000..20dabdfaf
--- /dev/null
+++ b/data/maps/NavelRock_Down03/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Down03_MapWarps: @ 853DC0C
+	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN02
+	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN04
+
+NavelRock_Down03_MapEvents:: @ 853DC1C
+	map_events 0x0, NavelRock_Down03_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc
index 78d1e1db3..41ae68722 100644
--- a/data/maps/NavelRock_Down03/header.inc
+++ b/data/maps/NavelRock_Down03/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Down03: @ 84859C4
-	.4byte NavelRock_Down03_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Down03_MapEvents
 	.4byte NavelRock_Down03_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Down03.inc b/data/maps/NavelRock_Down03/scripts.inc
index 2a2a702c1..2a2a702c1 100644
--- a/data/scripts/maps/NavelRock_Down03.inc
+++ b/data/maps/NavelRock_Down03/scripts.inc
diff --git a/data/maps/NavelRock_Down04/events.inc b/data/maps/NavelRock_Down04/events.inc
new file mode 100644
index 000000000..e50f6fe23
--- /dev/null
+++ b/data/maps/NavelRock_Down04/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Down04_MapWarps: @ 853DC30
+	warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN03
+	warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN05
+
+NavelRock_Down04_MapEvents:: @ 853DC40
+	map_events 0x0, NavelRock_Down04_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc
index ea459e2ff..a45886c16 100644
--- a/data/maps/NavelRock_Down04/header.inc
+++ b/data/maps/NavelRock_Down04/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Down04: @ 84859E0
-	.4byte NavelRock_Down04_MapAttributes
+	.4byte NavelRock_LadderRoom2_Layout
 	.4byte NavelRock_Down04_MapEvents
 	.4byte NavelRock_Down04_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Down04.inc b/data/maps/NavelRock_Down04/scripts.inc
index acf5aa456..acf5aa456 100644
--- a/data/scripts/maps/NavelRock_Down04.inc
+++ b/data/maps/NavelRock_Down04/scripts.inc
diff --git a/data/maps/NavelRock_Down05/events.inc b/data/maps/NavelRock_Down05/events.inc
new file mode 100644
index 000000000..500d38e9b
--- /dev/null
+++ b/data/maps/NavelRock_Down05/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Down05_MapWarps: @ 853DC54
+	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN04
+	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN06
+
+NavelRock_Down05_MapEvents:: @ 853DC64
+	map_events 0x0, NavelRock_Down05_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc
index ddb4d997f..2ab0c76ba 100644
--- a/data/maps/NavelRock_Down05/header.inc
+++ b/data/maps/NavelRock_Down05/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Down05: @ 84859FC
-	.4byte NavelRock_Down05_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Down05_MapEvents
 	.4byte NavelRock_Down05_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Down05.inc b/data/maps/NavelRock_Down05/scripts.inc
index 22a0c2059..22a0c2059 100644
--- a/data/scripts/maps/NavelRock_Down05.inc
+++ b/data/maps/NavelRock_Down05/scripts.inc
diff --git a/data/maps/NavelRock_Down06/events.inc b/data/maps/NavelRock_Down06/events.inc
new file mode 100644
index 000000000..077367747
--- /dev/null
+++ b/data/maps/NavelRock_Down06/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Down06_MapWarps: @ 853DC78
+	warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN05
+	warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN07
+
+NavelRock_Down06_MapEvents:: @ 853DC88
+	map_events 0x0, NavelRock_Down06_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc
index 256d2d1c1..d8a17e85f 100644
--- a/data/maps/NavelRock_Down06/header.inc
+++ b/data/maps/NavelRock_Down06/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Down06: @ 8485A18
-	.4byte NavelRock_Down06_MapAttributes
+	.4byte NavelRock_LadderRoom2_Layout
 	.4byte NavelRock_Down06_MapEvents
 	.4byte NavelRock_Down06_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Down06.inc b/data/maps/NavelRock_Down06/scripts.inc
index 9acfe1e6a..9acfe1e6a 100644
--- a/data/scripts/maps/NavelRock_Down06.inc
+++ b/data/maps/NavelRock_Down06/scripts.inc
diff --git a/data/maps/NavelRock_Down07/events.inc b/data/maps/NavelRock_Down07/events.inc
new file mode 100644
index 000000000..83f7ce9a6
--- /dev/null
+++ b/data/maps/NavelRock_Down07/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Down07_MapWarps: @ 853DC9C
+	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN06
+	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN08
+
+NavelRock_Down07_MapEvents:: @ 853DCAC
+	map_events 0x0, NavelRock_Down07_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc
index d49181bc4..0a77e6406 100644
--- a/data/maps/NavelRock_Down07/header.inc
+++ b/data/maps/NavelRock_Down07/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Down07: @ 8485A34
-	.4byte NavelRock_Down07_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Down07_MapEvents
 	.4byte NavelRock_Down07_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Down07.inc b/data/maps/NavelRock_Down07/scripts.inc
index 6c08fcc85..6c08fcc85 100644
--- a/data/scripts/maps/NavelRock_Down07.inc
+++ b/data/maps/NavelRock_Down07/scripts.inc
diff --git a/data/maps/NavelRock_Down08/events.inc b/data/maps/NavelRock_Down08/events.inc
new file mode 100644
index 000000000..38bef10e8
--- /dev/null
+++ b/data/maps/NavelRock_Down08/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Down08_MapWarps: @ 853DCC0
+	warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN07
+	warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN09
+
+NavelRock_Down08_MapEvents:: @ 853DCD0
+	map_events 0x0, NavelRock_Down08_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc
index db1c426c2..a3cbed38a 100644
--- a/data/maps/NavelRock_Down08/header.inc
+++ b/data/maps/NavelRock_Down08/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Down08: @ 8485A50
-	.4byte NavelRock_Down08_MapAttributes
+	.4byte NavelRock_LadderRoom2_Layout
 	.4byte NavelRock_Down08_MapEvents
 	.4byte NavelRock_Down08_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Down08.inc b/data/maps/NavelRock_Down08/scripts.inc
index 5a40a72a5..5a40a72a5 100644
--- a/data/scripts/maps/NavelRock_Down08.inc
+++ b/data/maps/NavelRock_Down08/scripts.inc
diff --git a/data/maps/NavelRock_Down09/events.inc b/data/maps/NavelRock_Down09/events.inc
new file mode 100644
index 000000000..e3843e759
--- /dev/null
+++ b/data/maps/NavelRock_Down09/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Down09_MapWarps: @ 853DCE4
+	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN08
+	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN10
+
+NavelRock_Down09_MapEvents:: @ 853DCF4
+	map_events 0x0, NavelRock_Down09_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc
index 6f53a936f..6aed92500 100644
--- a/data/maps/NavelRock_Down09/header.inc
+++ b/data/maps/NavelRock_Down09/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Down09: @ 8485A6C
-	.4byte NavelRock_Down09_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Down09_MapEvents
 	.4byte NavelRock_Down09_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Down09.inc b/data/maps/NavelRock_Down09/scripts.inc
index 80bbbc0e5..80bbbc0e5 100644
--- a/data/scripts/maps/NavelRock_Down09.inc
+++ b/data/maps/NavelRock_Down09/scripts.inc
diff --git a/data/maps/NavelRock_Down10/events.inc b/data/maps/NavelRock_Down10/events.inc
new file mode 100644
index 000000000..805e399b4
--- /dev/null
+++ b/data/maps/NavelRock_Down10/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Down10_MapWarps: @ 853DD08
+	warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN09
+	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN11
+
+NavelRock_Down10_MapEvents:: @ 853DD18
+	map_events 0x0, NavelRock_Down10_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc
index f3945194a..bb96b7e3d 100644
--- a/data/maps/NavelRock_Down10/header.inc
+++ b/data/maps/NavelRock_Down10/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Down10: @ 8485A88
-	.4byte NavelRock_Down10_MapAttributes
+	.4byte NavelRock_LadderRoom2_Layout
 	.4byte NavelRock_Down10_MapEvents
 	.4byte NavelRock_Down10_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Down10.inc b/data/maps/NavelRock_Down10/scripts.inc
index 2b27edeb5..2b27edeb5 100644
--- a/data/scripts/maps/NavelRock_Down10.inc
+++ b/data/maps/NavelRock_Down10/scripts.inc
diff --git a/data/maps/NavelRock_Down11/events.inc b/data/maps/NavelRock_Down11/events.inc
new file mode 100644
index 000000000..505a6ed6d
--- /dev/null
+++ b/data/maps/NavelRock_Down11/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Down11_MapWarps: @ 853DD2C
+	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_BOTTOM
+	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN10
+
+NavelRock_Down11_MapEvents:: @ 853DD3C
+	map_events 0x0, NavelRock_Down11_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc
index d02b578a1..48ed319eb 100644
--- a/data/maps/NavelRock_Down11/header.inc
+++ b/data/maps/NavelRock_Down11/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Down11: @ 8485AA4
-	.4byte NavelRock_Down11_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Down11_MapEvents
 	.4byte NavelRock_Down11_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Down11.inc b/data/maps/NavelRock_Down11/scripts.inc
index 91c6fa36a..91c6fa36a 100644
--- a/data/scripts/maps/NavelRock_Down11.inc
+++ b/data/maps/NavelRock_Down11/scripts.inc
diff --git a/data/maps/NavelRock_Entrance/events.inc b/data/maps/NavelRock_Entrance/events.inc
new file mode 100644
index 000000000..ee45485a7
--- /dev/null
+++ b/data/maps/NavelRock_Entrance/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Entrance_MapWarps: @ 853DA70
+	warp_def 10, 5, 3, 0, MAP_NAVEL_ROCK_B1F
+	warp_def 10, 26, 3, 1, MAP_NAVEL_ROCK_EXTERIOR
+
+NavelRock_Entrance_MapEvents:: @ 853DA80
+	map_events 0x0, NavelRock_Entrance_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc
index 521af14c7..cc8d2446b 100644
--- a/data/maps/NavelRock_Entrance/header.inc
+++ b/data/maps/NavelRock_Entrance/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Entrance: @ 84858AC
-	.4byte NavelRock_Entrance_MapAttributes
+	.4byte NavelRock_Entrance_Layout
 	.4byte NavelRock_Entrance_MapEvents
 	.4byte NavelRock_Entrance_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Entrance.inc b/data/maps/NavelRock_Entrance/scripts.inc
index 9c25f5054..9c25f5054 100644
--- a/data/scripts/maps/NavelRock_Entrance.inc
+++ b/data/maps/NavelRock_Entrance/scripts.inc
diff --git a/data/maps/NavelRock_Exterior/events.inc b/data/maps/NavelRock_Exterior/events.inc
new file mode 100644
index 000000000..66bbf376f
--- /dev/null
+++ b/data/maps/NavelRock_Exterior/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Exterior_MapWarps: @ 853DA00
+	warp_def 10, 18, 0, 0, MAP_NAVEL_ROCK_HARBOR
+	warp_def 10, 10, 0, 1, MAP_NAVEL_ROCK_ENTRANCE
+
+NavelRock_Exterior_MapEvents:: @ 853DA10
+	map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc
index 5d74b9eab..a01250cab 100644
--- a/data/maps/NavelRock_Exterior/header.inc
+++ b/data/maps/NavelRock_Exterior/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Exterior: @ 8485874
-	.4byte NavelRock_Exterior_MapAttributes
+	.4byte NavelRock_Exterior_Layout
 	.4byte NavelRock_Exterior_MapEvents
 	.4byte NavelRock_Exterior_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Exterior.inc b/data/maps/NavelRock_Exterior/scripts.inc
index daa3fc964..daa3fc964 100644
--- a/data/scripts/maps/NavelRock_Exterior.inc
+++ b/data/maps/NavelRock_Exterior/scripts.inc
diff --git a/data/maps/NavelRock_Fork/events.inc b/data/maps/NavelRock_Fork/events.inc
new file mode 100644
index 000000000..869dc0f08
--- /dev/null
+++ b/data/maps/NavelRock_Fork/events.inc
@@ -0,0 +1,8 @@
+NavelRock_Fork_MapWarps: @ 853DAB8
+	warp_def 4, 6, 3, 0, MAP_NAVEL_ROCK_UP1
+	warp_def 11, 79, 3, 1, MAP_NAVEL_ROCK_B1F
+	warp_def 22, 6, 3, 0, MAP_NAVEL_ROCK_DOWN01
+
+NavelRock_Fork_MapEvents:: @ 853DAD0
+	map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc
index 94740f43b..a6dab9d20 100644
--- a/data/maps/NavelRock_Fork/header.inc
+++ b/data/maps/NavelRock_Fork/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Fork: @ 84858E4
-	.4byte NavelRock_Fork_MapAttributes
+	.4byte NavelRock_Fork_Layout
 	.4byte NavelRock_Fork_MapEvents
 	.4byte NavelRock_Fork_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Fork.inc b/data/maps/NavelRock_Fork/scripts.inc
index 4269feeac..4269feeac 100644
--- a/data/scripts/maps/NavelRock_Fork.inc
+++ b/data/maps/NavelRock_Fork/scripts.inc
diff --git a/data/maps/NavelRock_Harbor/events.inc b/data/maps/NavelRock_Harbor/events.inc
new file mode 100644
index 000000000..2ffdc5fa1
--- /dev/null
+++ b/data/maps/NavelRock_Harbor/events.inc
@@ -0,0 +1,10 @@
+NavelRock_Harbor_EventObjects: @ 853DA24
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, 7, 1, 1, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, 10, 1, 1, 0, 0, 0x0, 0
+
+NavelRock_Harbor_MapWarps: @ 853DA54
+	warp_def 8, 2, 0, 0, MAP_NAVEL_ROCK_EXTERIOR
+
+NavelRock_Harbor_MapEvents:: @ 853DA5C
+	map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc
index 644442986..c7243f452 100644
--- a/data/maps/NavelRock_Harbor/header.inc
+++ b/data/maps/NavelRock_Harbor/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Harbor: @ 8485890
-	.4byte NavelRock_Harbor_MapAttributes
+	.4byte IslandHarbor_Layout
 	.4byte NavelRock_Harbor_MapEvents
 	.4byte NavelRock_Harbor_MapScripts
 	.4byte 0x0
diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc
new file mode 100644
index 000000000..7f5a9e4c7
--- /dev/null
+++ b/data/maps/NavelRock_Harbor/scripts.inc
@@ -0,0 +1,27 @@
+NavelRock_Harbor_MapScripts:: @ 82690BC
+	.byte 0
+
+NavelRock_Harbor_EventScript_2690BD:: @ 82690BD
+	lock
+	faceplayer
+	msgbox NavelRock_Harbor_Text_2C6CE6, 5
+	compare VAR_RESULT, 0
+	goto_eq NavelRock_Harbor_EventScript_269102
+	msgbox NavelRock_Harbor_Text_2A6A5D, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA
+	waitmovement 0
+	delay 30
+	hideobjectat 1, MAP_NAVEL_ROCK_HARBOR
+	setvar VAR_0x8004, 2
+	call NavelRock_Harbor_EventScript_272250
+	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
+	waitstate
+	release
+	end
+
+NavelRock_Harbor_EventScript_269102:: @ 8269102
+	msgbox NavelRock_Harbor_Text_2A6A82, 4
+	release
+	end
+
diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc
new file mode 100644
index 000000000..dc7c1e7df
--- /dev/null
+++ b/data/maps/NavelRock_Top/events.inc
@@ -0,0 +1,15 @@
+NavelRock_Top_EventObjects: @ 853DB74
+	object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, 8, 1, 1, 0, 0, 0x0, 801
+
+NavelRock_Top_MapWarps: @ 853DB8C
+	warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4
+
+NavelRock_Top_MapCoordEvents: @ 853DB94
+	coord_event 12, 10, 3, 0, VAR_TEMP_1, 0, 0, NavelRock_Top_EventScript_26916F
+
+NavelRock_Top_MapBGEvents: @ 853DBA4
+	bg_event 12, 9, 3, 7, 0, ITEM_SACRED_ASH, 109, 0
+
+NavelRock_Top_MapEvents:: @ 853DBB0
+	map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents
+
diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc
index f6e72236f..4d1535615 100644
--- a/data/maps/NavelRock_Top/header.inc
+++ b/data/maps/NavelRock_Top/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Top: @ 8485970
-	.4byte NavelRock_Top_MapAttributes
+	.4byte NavelRock_Top_Layout
 	.4byte NavelRock_Top_MapEvents
 	.4byte NavelRock_Top_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/maps/NavelRock_Top/scripts.inc
index 67ddbc373..67ddbc373 100644
--- a/data/scripts/maps/NavelRock_Top.inc
+++ b/data/maps/NavelRock_Top/scripts.inc
diff --git a/data/maps/NavelRock_Up1/events.inc b/data/maps/NavelRock_Up1/events.inc
new file mode 100644
index 000000000..fd0741a6a
--- /dev/null
+++ b/data/maps/NavelRock_Up1/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Up1_MapWarps: @ 853DAE4
+	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_FORK
+	warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP2
+
+NavelRock_Up1_MapEvents:: @ 853DAF4
+	map_events 0x0, NavelRock_Up1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc
index d9a51ab0f..c7484c59f 100644
--- a/data/maps/NavelRock_Up1/header.inc
+++ b/data/maps/NavelRock_Up1/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Up1: @ 8485900
-	.4byte NavelRock_Up1_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Up1_MapEvents
 	.4byte NavelRock_Up1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Up1.inc b/data/maps/NavelRock_Up1/scripts.inc
index c85af5f0c..c85af5f0c 100644
--- a/data/scripts/maps/NavelRock_Up1.inc
+++ b/data/maps/NavelRock_Up1/scripts.inc
diff --git a/data/maps/NavelRock_Up2/events.inc b/data/maps/NavelRock_Up2/events.inc
new file mode 100644
index 000000000..bd142b997
--- /dev/null
+++ b/data/maps/NavelRock_Up2/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Up2_MapWarps: @ 853DB08
+	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP1
+	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_UP3
+
+NavelRock_Up2_MapEvents:: @ 853DB18
+	map_events 0x0, NavelRock_Up2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc
index 94d42c6c4..824ef267d 100644
--- a/data/maps/NavelRock_Up2/header.inc
+++ b/data/maps/NavelRock_Up2/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Up2: @ 848591C
-	.4byte NavelRock_Up2_MapAttributes
+	.4byte NavelRock_LadderRoom2_Layout
 	.4byte NavelRock_Up2_MapEvents
 	.4byte NavelRock_Up2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Up2.inc b/data/maps/NavelRock_Up2/scripts.inc
index 27ae52190..27ae52190 100644
--- a/data/scripts/maps/NavelRock_Up2.inc
+++ b/data/maps/NavelRock_Up2/scripts.inc
diff --git a/data/maps/NavelRock_Up3/events.inc b/data/maps/NavelRock_Up3/events.inc
new file mode 100644
index 000000000..9491e5dac
--- /dev/null
+++ b/data/maps/NavelRock_Up3/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Up3_MapWarps: @ 853DB2C
+	warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_UP2
+	warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP4
+
+NavelRock_Up3_MapEvents:: @ 853DB3C
+	map_events 0x0, NavelRock_Up3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc
index 2a57b2444..7782ca0f4 100644
--- a/data/maps/NavelRock_Up3/header.inc
+++ b/data/maps/NavelRock_Up3/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Up3: @ 8485938
-	.4byte NavelRock_Up3_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Up3_MapEvents
 	.4byte NavelRock_Up3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Up3.inc b/data/maps/NavelRock_Up3/scripts.inc
index a9c3e2a3c..a9c3e2a3c 100644
--- a/data/scripts/maps/NavelRock_Up3.inc
+++ b/data/maps/NavelRock_Up3/scripts.inc
diff --git a/data/maps/NavelRock_Up4/events.inc b/data/maps/NavelRock_Up4/events.inc
new file mode 100644
index 000000000..3d81f1523
--- /dev/null
+++ b/data/maps/NavelRock_Up4/events.inc
@@ -0,0 +1,7 @@
+NavelRock_Up4_MapWarps: @ 853DB50
+	warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP3
+	warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_TOP
+
+NavelRock_Up4_MapEvents:: @ 853DB60
+	map_events 0x0, NavelRock_Up4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc
index 17e8ae965..c022d9d0b 100644
--- a/data/maps/NavelRock_Up4/header.inc
+++ b/data/maps/NavelRock_Up4/header.inc
@@ -1,5 +1,5 @@
 NavelRock_Up4: @ 8485954
-	.4byte NavelRock_Up4_MapAttributes
+	.4byte NavelRock_LadderRoom2_Layout
 	.4byte NavelRock_Up4_MapEvents
 	.4byte NavelRock_Up4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NavelRock_Up4.inc b/data/maps/NavelRock_Up4/scripts.inc
index c6beead6d..c6beead6d 100644
--- a/data/scripts/maps/NavelRock_Up4.inc
+++ b/data/maps/NavelRock_Up4/scripts.inc
diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc
new file mode 100644
index 000000000..29f46af20
--- /dev/null
+++ b/data/maps/NewMauville_Entrance/events.inc
@@ -0,0 +1,10 @@
+NewMauville_Entrance_MapWarps: @ 8536474
+	warp_def 4, 6, 3, 0, MAP_ROUTE110
+	warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE
+
+NewMauville_Entrance_MapCoordEvents: @ 8536484
+	coord_event 4, 2, 3, 0, VAR_0x40BA, 0, 0, NewMauville_Entrance_EventScript_2372FF
+
+NewMauville_Entrance_MapEvents:: @ 8536494
+	map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0
+
diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc
index 8bdf39e18..147f003d0 100644
--- a/data/maps/NewMauville_Entrance/header.inc
+++ b/data/maps/NewMauville_Entrance/header.inc
@@ -1,5 +1,5 @@
 NewMauville_Entrance: @ 8484470
-	.4byte NewMauville_Entrance_MapAttributes
+	.4byte NewMauville_Entrance_Layout
 	.4byte NewMauville_Entrance_MapEvents
 	.4byte NewMauville_Entrance_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/scripts.inc
index 727b77985..727b77985 100644
--- a/data/scripts/maps/NewMauville_Entrance.inc
+++ b/data/maps/NewMauville_Entrance/scripts.inc
diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc
new file mode 100644
index 000000000..794f1965c
--- /dev/null
+++ b/data/maps/NewMauville_Inside/events.inc
@@ -0,0 +1,38 @@
+NewMauville_Inside_EventObjects: @ 85364A8
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, 1110
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, 1122
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, 1123
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, 974
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, 975
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, 976
+
+NewMauville_Inside_MapWarps: @ 8536568
+	warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE
+
+NewMauville_Inside_MapCoordEvents: @ 8536570
+	coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459
+	coord_event 18, 36, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471
+	coord_event 4, 26, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459
+	coord_event 16, 22, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459
+	coord_event 25, 18, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471
+	coord_event 2, 11, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471
+	coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459
+	coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459
+	coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471
+	coord_event 33, 6, 3, 0, VAR_0x40BA, 1, 0, NewMauville_Inside_EventScript_237725
+
+NewMauville_Inside_MapBGEvents: @ 8536610
+	bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F
+	bg_event 32, 3, 3, 0, 0, NewMauville_Inside_EventScript_23778F
+	bg_event 32, 2, 0, 0, 0, NewMauville_Inside_EventScript_23778F
+	bg_event 33, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F
+	bg_event 34, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F
+	bg_event 35, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F
+	bg_event 35, 3, 3, 0, 0, NewMauville_Inside_EventScript_23778F
+	bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_23778F
+
+NewMauville_Inside_MapEvents:: @ 8536670
+	map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents
+
diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc
index 585719630..3eda8df5e 100644
--- a/data/maps/NewMauville_Inside/header.inc
+++ b/data/maps/NewMauville_Inside/header.inc
@@ -1,5 +1,5 @@
 NewMauville_Inside: @ 848448C
-	.4byte NewMauville_Inside_MapAttributes
+	.4byte NewMauville_Inside_Layout
 	.4byte NewMauville_Inside_MapEvents
 	.4byte NewMauville_Inside_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/scripts.inc
index 81b21287d..81b21287d 100644
--- a/data/scripts/maps/NewMauville_Inside.inc
+++ b/data/maps/NewMauville_Inside/scripts.inc
diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc
index f6b5336bb..db0232f83 100644
--- a/data/maps/OldaleTown/connections.inc
+++ b/data/maps/OldaleTown/connections.inc
@@ -1,7 +1,7 @@
 OldaleTown_MapConnectionsList: @ 8486614
-	connection up, 0, ROUTE_103, 0
-	connection down, 0, ROUTE_101, 0
-	connection left, 0, ROUTE_102, 0
+	connection up, 0, MAP_ROUTE103
+	connection down, 0, MAP_ROUTE101
+	connection left, 0, MAP_ROUTE102
 
 OldaleTown_MapConnections: @ 8486638
 	.4byte 0x3
diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc
new file mode 100644
index 000000000..b7bc6ab08
--- /dev/null
+++ b/data/maps/OldaleTown/events.inc
@@ -0,0 +1,28 @@
+OldaleTown_EventObjects: @ 8527854
+	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0
+	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0
+	object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 11, 19, 3, 7, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, 979
+
+OldaleTown_MapWarps: @ 85278B4
+	warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1
+	warp_def 15, 16, 0, 0, MAP_OLDALE_TOWN_HOUSE2
+	warp_def 6, 16, 0, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_1F
+	warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART
+
+OldaleTown_MapCoordEvents: @ 85278D4
+	coord_event 0, 10, 3, 0, VAR_0x4051, 0, 0, OldaleTown_EventScript_1E903F
+	coord_event 8, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E9086
+	coord_event 9, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E90A6
+	coord_event 10, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E90C6
+
+OldaleTown_MapBGEvents: @ 8527914
+	bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_1E8EEA
+	bg_event 7, 16, 0, 1, 0, OldaleTown_EventScript_271E73
+	bg_event 15, 6, 0, 1, 0, OldaleTown_EventScript_271E6A
+	bg_event 8, 16, 0, 1, 0, OldaleTown_EventScript_271E73
+	bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_271E6A
+
+OldaleTown_MapEvents:: @ 8527950
+	map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents
+
diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc
index 3eeb1e72d..3d8ae1db5 100644
--- a/data/maps/OldaleTown/header.inc
+++ b/data/maps/OldaleTown/header.inc
@@ -1,5 +1,5 @@
 OldaleTown: @ 84825D0
-	.4byte OldaleTown_MapAttributes
+	.4byte OldaleTown_Layout
 	.4byte OldaleTown_MapEvents
 	.4byte OldaleTown_MapScripts
 	.4byte OldaleTown_MapConnections
diff --git a/data/scripts/maps/OldaleTown.inc b/data/maps/OldaleTown/scripts.inc
index 32bca3703..32bca3703 100644
--- a/data/scripts/maps/OldaleTown.inc
+++ b/data/maps/OldaleTown/scripts.inc
diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc
new file mode 100644
index 000000000..cf853c8ac
--- /dev/null
+++ b/data/maps/OldaleTown_House1/events.inc
@@ -0,0 +1,10 @@
+OldaleTown_House1_EventObjects: @ 852D7B4
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 2, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0
+
+OldaleTown_House1_MapWarps: @ 852D7CC
+	warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN
+	warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN
+
+OldaleTown_House1_MapEvents:: @ 852D7DC
+	map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc
index 245f1e146..6039540cc 100644
--- a/data/maps/OldaleTown_House1/header.inc
+++ b/data/maps/OldaleTown_House1/header.inc
@@ -1,5 +1,5 @@
 OldaleTown_House1: @ 8482B80
-	.4byte OldaleTown_House1_MapAttributes
+	.4byte House1_Layout
 	.4byte OldaleTown_House1_MapEvents
 	.4byte OldaleTown_House1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/scripts.inc
index 6a36ff57e..6a36ff57e 100644
--- a/data/scripts/maps/OldaleTown_House1.inc
+++ b/data/maps/OldaleTown_House1/scripts.inc
diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc
new file mode 100644
index 000000000..2feeb8949
--- /dev/null
+++ b/data/maps/OldaleTown_House2/events.inc
@@ -0,0 +1,11 @@
+OldaleTown_House2_EventObjects: @ 852D7F0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0
+
+OldaleTown_House2_MapWarps: @ 852D820
+	warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN
+	warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN
+
+OldaleTown_House2_MapEvents:: @ 852D830
+	map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc
index 7bf092b6b..75753041f 100644
--- a/data/maps/OldaleTown_House2/header.inc
+++ b/data/maps/OldaleTown_House2/header.inc
@@ -1,5 +1,5 @@
 OldaleTown_House2: @ 8482B9C
-	.4byte OldaleTown_House2_MapAttributes
+	.4byte House2_Layout
 	.4byte OldaleTown_House2_MapEvents
 	.4byte OldaleTown_House2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/scripts.inc
index 55941705c..55941705c 100644
--- a/data/scripts/maps/OldaleTown_House2.inc
+++ b/data/maps/OldaleTown_House2/scripts.inc
diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc
new file mode 100644
index 000000000..f850fa482
--- /dev/null
+++ b/data/maps/OldaleTown_Mart/events.inc
@@ -0,0 +1,12 @@
+OldaleTown_Mart_EventObjects: @ 852D95C
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, 3, 0, 1, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0
+
+OldaleTown_Mart_MapWarps: @ 852D9A4
+	warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN
+	warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN
+
+OldaleTown_Mart_MapEvents:: @ 852D9B4
+	map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc
index 4f4ea646f..043acab8d 100644
--- a/data/maps/OldaleTown_Mart/header.inc
+++ b/data/maps/OldaleTown_Mart/header.inc
@@ -1,5 +1,5 @@
 OldaleTown_Mart: @ 8482BF0
-	.4byte OldaleTown_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte OldaleTown_Mart_MapEvents
 	.4byte OldaleTown_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/scripts.inc
index de8893712..de8893712 100644
--- a/data/scripts/maps/OldaleTown_Mart.inc
+++ b/data/maps/OldaleTown_Mart/scripts.inc
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..bb102baab
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc
@@ -0,0 +1,14 @@
+OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, 10, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0
+
+OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4
+	warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN
+	warp_def 6, 8, 3, 2, MAP_OLDALE_TOWN
+	warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F
+
+OldaleTown_PokemonCenter_1F_MapEvents:: @ 852D8BC
+	map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
index cc564e6ae..d51331b61 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 OldaleTown_PokemonCenter_1F: @ 8482BB8
-	.4byte OldaleTown_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte OldaleTown_PokemonCenter_1F_MapEvents
 	.4byte OldaleTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
index ece540e70..ece540e70 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..b25b155ea
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702
+
+OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930
+	warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+OldaleTown_PokemonCenter_2F_MapEvents:: @ 852D948
+	map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
index 798a5f72b..9b9df67fd 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 OldaleTown_PokemonCenter_2F: @ 8482BD4
-	.4byte OldaleTown_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte OldaleTown_PokemonCenter_2F_MapEvents
 	.4byte OldaleTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
index 788157beb..788157beb 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc
index fcbdec008..5c84301bf 100644
--- a/data/maps/PacifidlogTown/connections.inc
+++ b/data/maps/PacifidlogTown/connections.inc
@@ -1,6 +1,6 @@
 PacifidlogTown_MapConnectionsList: @ 84866B4
-	connection left, 0, ROUTE_132, 0
-	connection right, 0, ROUTE_131, 0
+	connection left, 0, MAP_ROUTE132
+	connection right, 0, MAP_ROUTE131
 
 PacifidlogTown_MapConnections: @ 84866CC
 	.4byte 0x2
diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc
new file mode 100644
index 000000000..41d54e9fc
--- /dev/null
+++ b/data/maps/PacifidlogTown/events.inc
@@ -0,0 +1,21 @@
+PacifidlogTown_EventObjects: @ 8527DE8
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0
+	object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0
+
+PacifidlogTown_MapWarps: @ 8527E30
+	warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F
+	warp_def 16, 13, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE1
+	warp_def 3, 22, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE2
+	warp_def 12, 24, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE3
+	warp_def 2, 12, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE4
+	warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5
+
+PacifidlogTown_MapBGEvents: @ 8527E60
+	bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73
+	bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_1EBADE
+	bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73
+
+PacifidlogTown_MapEvents:: @ 8527E84
+	map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents
+
diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc
index a630f5efa..3244c01b8 100644
--- a/data/maps/PacifidlogTown/header.inc
+++ b/data/maps/PacifidlogTown/header.inc
@@ -1,5 +1,5 @@
 PacifidlogTown: @ 848265C
-	.4byte PacifidlogTown_MapAttributes
+	.4byte PacifidlogTown_Layout
 	.4byte PacifidlogTown_MapEvents
 	.4byte PacifidlogTown_MapScripts
 	.4byte PacifidlogTown_MapConnections
diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/maps/PacifidlogTown/scripts.inc
index 1f4f0e872..1f4f0e872 100644
--- a/data/scripts/maps/PacifidlogTown.inc
+++ b/data/maps/PacifidlogTown/scripts.inc
diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc
new file mode 100644
index 000000000..77ca4c832
--- /dev/null
+++ b/data/maps/PacifidlogTown_House1/events.inc
@@ -0,0 +1,11 @@
+PacifidlogTown_House1_EventObjects: @ 852EBA0
+	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0
+
+PacifidlogTown_House1_MapWarps: @ 852EBD0
+	warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN
+	warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN
+
+PacifidlogTown_House1_MapEvents:: @ 852EBE0
+	map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc
index a0e8763e3..b78d36a2a 100644
--- a/data/maps/PacifidlogTown_House1/header.inc
+++ b/data/maps/PacifidlogTown_House1/header.inc
@@ -1,5 +1,5 @@
 PacifidlogTown_House1: @ 8482F8C
-	.4byte PacifidlogTown_House1_MapAttributes
+	.4byte PacifidlogTown_House1_Layout
 	.4byte PacifidlogTown_House1_MapEvents
 	.4byte PacifidlogTown_House1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/scripts.inc
index b4fe4c979..b4fe4c979 100644
--- a/data/scripts/maps/PacifidlogTown_House1.inc
+++ b/data/maps/PacifidlogTown_House1/scripts.inc
diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc
new file mode 100644
index 000000000..450533014
--- /dev/null
+++ b/data/maps/PacifidlogTown_House2/events.inc
@@ -0,0 +1,12 @@
+PacifidlogTown_House2_EventObjects: @ 852EBF4
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, 8, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203792, 0
+	object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203891, 0
+	object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0
+
+PacifidlogTown_House2_MapWarps: @ 852EC3C
+	warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN
+	warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN
+
+PacifidlogTown_House2_MapEvents:: @ 852EC4C
+	map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc
index 8548cfc32..571dcd9ce 100644
--- a/data/maps/PacifidlogTown_House2/header.inc
+++ b/data/maps/PacifidlogTown_House2/header.inc
@@ -1,5 +1,5 @@
 PacifidlogTown_House2: @ 8482FA8
-	.4byte PacifidlogTown_House2_MapAttributes
+	.4byte PacifidlogTown_House2_Layout
 	.4byte PacifidlogTown_House2_MapEvents
 	.4byte PacifidlogTown_House2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/scripts.inc
index 0e87677e6..0e87677e6 100644
--- a/data/scripts/maps/PacifidlogTown_House2.inc
+++ b/data/maps/PacifidlogTown_House2/scripts.inc
diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc
new file mode 100644
index 000000000..635ba86a7
--- /dev/null
+++ b/data/maps/PacifidlogTown_House3/events.inc
@@ -0,0 +1,11 @@
+PacifidlogTown_House3_EventObjects: @ 852EC60
+	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, 10, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0
+
+PacifidlogTown_House3_MapWarps: @ 852EC90
+	warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN
+	warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN
+
+PacifidlogTown_House3_MapEvents:: @ 852ECA0
+	map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc
index 7fa97cda2..fb60530a6 100644
--- a/data/maps/PacifidlogTown_House3/header.inc
+++ b/data/maps/PacifidlogTown_House3/header.inc
@@ -1,5 +1,5 @@
 PacifidlogTown_House3: @ 8482FC4
-	.4byte PacifidlogTown_House3_MapAttributes
+	.4byte PacifidlogTown_House1_Layout
 	.4byte PacifidlogTown_House3_MapEvents
 	.4byte PacifidlogTown_House3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/scripts.inc
index 98977b766..98977b766 100644
--- a/data/scripts/maps/PacifidlogTown_House3.inc
+++ b/data/maps/PacifidlogTown_House3/scripts.inc
diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc
new file mode 100644
index 000000000..e5f8dd4f1
--- /dev/null
+++ b/data/maps/PacifidlogTown_House4/events.inc
@@ -0,0 +1,12 @@
+PacifidlogTown_House4_EventObjects: @ 852ECB4
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0
+
+PacifidlogTown_House4_MapWarps: @ 852ECFC
+	warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN
+	warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN
+
+PacifidlogTown_House4_MapEvents:: @ 852ED0C
+	map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc
index b505892ad..7beed0a39 100644
--- a/data/maps/PacifidlogTown_House4/header.inc
+++ b/data/maps/PacifidlogTown_House4/header.inc
@@ -1,5 +1,5 @@
 PacifidlogTown_House4: @ 8482FE0
-	.4byte PacifidlogTown_House4_MapAttributes
+	.4byte PacifidlogTown_House2_Layout
 	.4byte PacifidlogTown_House4_MapEvents
 	.4byte PacifidlogTown_House4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/scripts.inc
index a3e9cf0a4..a3e9cf0a4 100644
--- a/data/scripts/maps/PacifidlogTown_House4.inc
+++ b/data/maps/PacifidlogTown_House4/scripts.inc
diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc
new file mode 100644
index 000000000..febb80ad6
--- /dev/null
+++ b/data/maps/PacifidlogTown_House5/events.inc
@@ -0,0 +1,11 @@
+PacifidlogTown_House5_EventObjects: @ 852ED20
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0
+
+PacifidlogTown_House5_MapWarps: @ 852ED50
+	warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN
+	warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN
+
+PacifidlogTown_House5_MapEvents:: @ 852ED60
+	map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc
index 055a1b566..671c7d28e 100644
--- a/data/maps/PacifidlogTown_House5/header.inc
+++ b/data/maps/PacifidlogTown_House5/header.inc
@@ -1,5 +1,5 @@
 PacifidlogTown_House5: @ 8482FFC
-	.4byte PacifidlogTown_House5_MapAttributes
+	.4byte PacifidlogTown_House1_Layout
 	.4byte PacifidlogTown_House5_MapEvents
 	.4byte PacifidlogTown_House5_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/scripts.inc
index ec97a639e..ec97a639e 100644
--- a/data/scripts/maps/PacifidlogTown_House5.inc
+++ b/data/maps/PacifidlogTown_House5/scripts.inc
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..66b8caa67
--- /dev/null
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, 1, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0
+
+PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8
+	warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN
+	warp_def 6, 8, 3, 0, MAP_PACIFIDLOG_TOWN
+	warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F
+
+PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 852EB00
+	map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
index 0c84c8b8a..d11ea93d2 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 PacifidlogTown_PokemonCenter_1F: @ 8482F54
-	.4byte PacifidlogTown_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte PacifidlogTown_PokemonCenter_1F_MapEvents
 	.4byte PacifidlogTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
index fd34cd2aa..fd34cd2aa 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..1aa279980
--- /dev/null
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702
+
+PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74
+	warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 852EB8C
+	map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
index 6804ac368..00724203f 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 PacifidlogTown_PokemonCenter_2F: @ 8482F70
-	.4byte PacifidlogTown_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte PacifidlogTown_PokemonCenter_2F_MapEvents
 	.4byte PacifidlogTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
index 0199c2215..0199c2215 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc
index 4a75eea3a..96bd6cbce 100644
--- a/data/maps/PetalburgCity/connections.inc
+++ b/data/maps/PetalburgCity/connections.inc
@@ -1,6 +1,6 @@
 PetalburgCity_MapConnectionsList: @ 84866D4
-	connection left, -50, ROUTE_104, 0
-	connection right, 10, ROUTE_102, 0
+	connection left, -50, MAP_ROUTE104
+	connection right, 10, MAP_ROUTE102
 
 PetalburgCity_MapConnections: @ 84866EC
 	.4byte 0x2
diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc
new file mode 100644
index 000000000..29fe0e02e
--- /dev/null
+++ b/data/maps/PetalburgCity/events.inc
@@ -0,0 +1,42 @@
+PetalburgCity_EventObjects: @ 8525FD0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, 2, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, 728
+	object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 726
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0
+	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, 3, 0, 1, 0, 0, PetalburgCity_EventScript_1DC488, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 830
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040
+	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0
+	object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, 1, 1, 1, 0, 0, 0x0, 995
+
+PetalburgCity_MapWarps: @ 85260A8
+	warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1
+	warp_def 7, 5, 0, 0, MAP_PETALBURG_CITY_WALLYS_HOUSE
+	warp_def 15, 8, 0, 0, MAP_PETALBURG_CITY_GYM
+	warp_def 20, 16, 0, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_1F
+	warp_def 20, 24, 0, 0, MAP_PETALBURG_CITY_HOUSE2
+	warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART
+
+PetalburgCity_MapCoordEvents: @ 85260D8
+	coord_event 8, 10, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC49A
+	coord_event 8, 11, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4A6
+	coord_event 8, 12, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4B2
+	coord_event 8, 13, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4BE
+	coord_event 4, 10, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC691
+	coord_event 4, 11, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6A7
+	coord_event 4, 12, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6BD
+	coord_event 4, 13, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6D3
+
+PetalburgCity_MapBGEvents: @ 8526158
+	bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_1DC476
+	bg_event 26, 12, 0, 1, 0, PetalburgCity_EventScript_271E6A
+	bg_event 21, 16, 0, 1, 0, PetalburgCity_EventScript_271E73
+	bg_event 17, 16, 0, 0, 0, PetalburgCity_EventScript_1DC47F
+	bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_271E73
+	bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_271E6A
+	bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_1DC491
+	bg_event 11, 29, 3, 7, 0, ITEM_RARE_CANDY, 95, 0
+
+PetalburgCity_MapEvents:: @ 85261B8
+	map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents
+
diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc
index d87259512..248c6d2ae 100644
--- a/data/maps/PetalburgCity/header.inc
+++ b/data/maps/PetalburgCity/header.inc
@@ -1,5 +1,5 @@
 PetalburgCity: @ 84824B8
-	.4byte PetalburgCity_MapAttributes
+	.4byte PetalburgCity_Layout
 	.4byte PetalburgCity_MapEvents
 	.4byte gStdScripts_End
 	.4byte PetalburgCity_MapConnections
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
new file mode 100644
index 000000000..67a9f83f3
--- /dev/null
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -0,0 +1,771 @@
+PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7
+	setflag FLAG_VISITED_PETALBURG_CITY
+	compare VAR_0x4057, 0
+	call_if 1, PetalburgCity_EventScript_1DC307
+	compare VAR_0x4057, 2
+	call_if 1, PetalburgCity_EventScript_1DC30F
+	compare VAR_0x4057, 4
+	call_if 1, PetalburgCity_EventScript_1DC30F
+	compare VAR_0x4085, 8
+	call_if 1, PetalburgCity_EventScript_1DC316
+	end
+
+PetalburgCity_EventScript_1DC307:: @ 81DC307
+	setobjectxyperm 8, 5, 11
+	return
+
+PetalburgCity_EventScript_1DC30F:: @ 81DC30F
+	setflag FLAG_SPECIAL_FLAG_0x4000
+	savebgm MUS_TSURETEK
+	return
+
+PetalburgCity_EventScript_1DC316:: @ 81DC316
+	setvar VAR_0x4085, 7
+	return
+
+PetalburgCity_MapScript2_1DC31C: @ 81DC31C
+	map_script_2 VAR_0x4057, 2, PetalburgCity_EventScript_1DC32E
+	map_script_2 VAR_0x4057, 4, PetalburgCity_EventScript_1DC390
+	.2byte 0
+
+PetalburgCity_EventScript_1DC32E:: @ 81DC32E
+	lockall
+	special SavePlayerParty
+	special PutZigzagoonInPlayerParty
+	applymovement 2, PetalburgCity_Movement_1DC451
+	applymovement 255, PetalburgCity_Movement_1DC430
+	waitmovement 0
+	msgbox PetalburgCity_Text_1EC1F8, 4
+	special StartWallyTutorialBattle
+	waitstate
+	msgbox PetalburgCity_Text_1EC271, 4
+	applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY
+	waitmovement 2, MAP_PETALBURG_CITY
+	msgbox PetalburgCity_Text_1EC297, 4
+	closemessage
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	setvar VAR_0x4057, 3
+	fadedefaultbgm
+	clearflag FLAG_SPECIAL_FLAG_0x4001
+	special LoadPlayerParty
+	setvar VAR_0x4085, 1
+	warp MAP_PETALBURG_CITY_GYM, 255, 4, 108
+	waitstate
+	releaseall
+	end
+
+PetalburgCity_EventScript_1DC390:: @ 81DC390
+	lockall
+	setflag FLAG_SPECIAL_FLAG_0x4000
+	applymovement 5, PetalburgCity_Movement_1DC41B
+	applymovement 255, PetalburgCity_Movement_1DC406
+	waitmovement 0
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 5
+	opendoor VAR_0x8004, VAR_0x8005
+	waitdooranim
+	applymovement 5, PetalburgCity_Movement_1DC42D
+	applymovement 255, PetalburgCity_Movement_1DC418
+	waitmovement 0
+	setflag FLAG_0x33E
+	hideobjectat 255, MAP_PETALBURG_CITY
+	closedoor VAR_0x8004, VAR_0x8005
+	waitdooranim
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	fadedefaultbgm
+	clearflag FLAG_SPECIAL_FLAG_0x4001
+	warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4
+	waitstate
+	releaseall
+	end
+
+PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6
+	lock
+	faceplayer
+	msgbox PetalburgCity_Text_1DC985, 4
+	closemessage
+	applymovement 3, PetalburgCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD
+	msgbox PetalburgCity_Text_1DC837, 2
+	end
+
+PetalburgCity_Movement_1DC406: @ 81DC406
+	delay_8
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+PetalburgCity_Movement_1DC418: @ 81DC418
+	walk_up
+	walk_up
+	step_end
+
+PetalburgCity_Movement_1DC41B: @ 81DC41B
+	delay_8
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+PetalburgCity_Movement_1DC42D: @ 81DC42D
+	walk_up
+	set_invisible
+	step_end
+
+PetalburgCity_Movement_1DC430: @ 81DC430
+	delay_8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
+	step_end
+
+PetalburgCity_Movement_1DC451: @ 81DC451
+	delay_8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
+	step_end
+
+PetalburgCity_EventScript_1DC476:: @ 81DC476
+	msgbox PetalburgCity_Text_1DCAAA, 3
+	end
+
+PetalburgCity_EventScript_1DC47F:: @ 81DC47F
+	msgbox PetalburgCity_Text_1DCAF1, 3
+	end
+
+PetalburgCity_EventScript_1DC488:: @ 81DC488
+	msgbox PetalburgCity_Text_1DCA30, 2
+	end
+
+PetalburgCity_EventScript_1DC491:: @ 81DC491
+	msgbox PetalburgCity_Text_1DCB23, 3
+	end
+
+PetalburgCity_EventScript_1DC49A:: @ 81DC49A
+	lockall
+	setvar VAR_0x8008, 0
+	goto PetalburgCity_EventScript_1DC4CA
+	end
+
+PetalburgCity_EventScript_1DC4A6:: @ 81DC4A6
+	lockall
+	setvar VAR_0x8008, 1
+	goto PetalburgCity_EventScript_1DC4CA
+	end
+
+PetalburgCity_EventScript_1DC4B2:: @ 81DC4B2
+	lockall
+	setvar VAR_0x8008, 2
+	goto PetalburgCity_EventScript_1DC4CA
+	end
+
+PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE
+	lockall
+	setvar VAR_0x8008, 3
+	goto PetalburgCity_EventScript_1DC4CA
+	end
+
+PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA
+	applymovement 8, PetalburgCity_Movement_27259E
+	waitmovement 0
+	playbgm MUS_TSURETEK, 0
+	playse SE_PIN
+	applymovement 8, PetalburgCity_Movement_272598
+	waitmovement 0
+	applymovement 8, PetalburgCity_Movement_27259A
+	waitmovement 0
+	compare VAR_0x8008, 0
+	call_if 1, PetalburgCity_EventScript_1DC57F
+	compare VAR_0x8008, 1
+	call_if 1, PetalburgCity_EventScript_1DC594
+	compare VAR_0x8008, 2
+	call_if 1, PetalburgCity_EventScript_1DC59F
+	compare VAR_0x8008, 3
+	call_if 1, PetalburgCity_EventScript_1DC5B4
+	msgbox PetalburgCity_Text_1DC881, 4
+	closemessage
+	compare VAR_0x8008, 0
+	call_if 1, PetalburgCity_EventScript_1DC5C9
+	compare VAR_0x8008, 1
+	call_if 1, PetalburgCity_EventScript_1DC5DB
+	compare VAR_0x8008, 2
+	call_if 1, PetalburgCity_EventScript_1DC5ED
+	compare VAR_0x8008, 3
+	call_if 1, PetalburgCity_EventScript_1DC5FF
+	msgbox PetalburgCity_Text_1DC91B, 4
+	applymovement 8, PetalburgCity_Movement_2725A8
+	applymovement 255, PetalburgCity_Movement_2725A8
+	waitmovement 0
+	msgbox PetalburgCity_Text_1DC93E, 4
+	closemessage
+	applymovement 8, PetalburgCity_Movement_1DC658
+	waitmovement 0
+	fadedefaultbgm
+	releaseall
+	end
+
+PetalburgCity_EventScript_1DC57F:: @ 81DC57F
+	applymovement 8, PetalburgCity_Movement_1DC615
+	waitmovement 0
+	applymovement 255, PetalburgCity_Movement_2725AA
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC594:: @ 81DC594
+	applymovement 8, PetalburgCity_Movement_1DC61A
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC59F:: @ 81DC59F
+	applymovement 8, PetalburgCity_Movement_1DC61D
+	waitmovement 0
+	applymovement 255, PetalburgCity_Movement_2725A6
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4
+	applymovement 8, PetalburgCity_Movement_1DC622
+	waitmovement 0
+	applymovement 255, PetalburgCity_Movement_2725A6
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC5C9:: @ 81DC5C9
+	applymovement 8, PetalburgCity_Movement_1DC628
+	applymovement 255, PetalburgCity_Movement_1DC665
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC5DB:: @ 81DC5DB
+	applymovement 8, PetalburgCity_Movement_1DC633
+	applymovement 255, PetalburgCity_Movement_1DC66F
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC5ED:: @ 81DC5ED
+	applymovement 8, PetalburgCity_Movement_1DC641
+	applymovement 255, PetalburgCity_Movement_1DC67C
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF
+	applymovement 8, PetalburgCity_Movement_1DC64C
+	applymovement 255, PetalburgCity_Movement_1DC686
+	waitmovement 0
+	return
+
+PetalburgCity_Movement_1DC611:: @ 81DC611
+	delay_16
+	delay_16
+	delay_16
+	step_end
+
+PetalburgCity_Movement_1DC615: @ 81DC615
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+PetalburgCity_Movement_1DC61A: @ 81DC61A
+	walk_right
+	walk_right
+	step_end
+
+PetalburgCity_Movement_1DC61D: @ 81DC61D
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+PetalburgCity_Movement_1DC622: @ 81DC622
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+PetalburgCity_Movement_1DC628: @ 81DC628
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+PetalburgCity_Movement_1DC633: @ 81DC633
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+PetalburgCity_Movement_1DC641: @ 81DC641
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+PetalburgCity_Movement_1DC64C: @ 81DC64C
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+PetalburgCity_Movement_1DC658: @ 81DC658
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+PetalburgCity_Movement_1DC665: @ 81DC665
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	step_end
+
+PetalburgCity_Movement_1DC66F: @ 81DC66F
+	delay_16
+	delay_16
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	step_end
+
+PetalburgCity_Movement_1DC67C: @ 81DC67C
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	step_end
+
+PetalburgCity_Movement_1DC686: @ 81DC686
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	step_end
+
+PetalburgCity_EventScript_1DC691:: @ 81DC691
+	lockall
+	addobject 9
+	setvar VAR_0x8008, 0
+	setobjectxy 9, 13, 10
+	goto PetalburgCity_EventScript_1DC6E9
+	end
+
+PetalburgCity_EventScript_1DC6A7:: @ 81DC6A7
+	lockall
+	addobject 9
+	setvar VAR_0x8008, 1
+	setobjectxy 9, 13, 11
+	goto PetalburgCity_EventScript_1DC6E9
+	end
+
+PetalburgCity_EventScript_1DC6BD:: @ 81DC6BD
+	lockall
+	addobject 9
+	setvar VAR_0x8008, 2
+	setobjectxy 9, 13, 12
+	goto PetalburgCity_EventScript_1DC6E9
+	end
+
+PetalburgCity_EventScript_1DC6D3:: @ 81DC6D3
+	lockall
+	addobject 9
+	setvar VAR_0x8008, 3
+	setobjectxy 9, 13, 13
+	goto PetalburgCity_EventScript_1DC6E9
+	end
+
+PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9
+	applymovement 9, PetalburgCity_Movement_1DC7D6
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, PetalburgCity_Movement_272598
+	waitmovement 0
+	applymovement 9, PetalburgCity_Movement_27259A
+	waitmovement 0
+	applymovement 9, PetalburgCity_Movement_1DC7DB
+	waitmovement 0
+	applymovement 255, PetalburgCity_Movement_2725A8
+	waitmovement 0
+	setvar VAR_0x40D1, 1
+	msgbox PetalburgCity_Text_1DCB31, 4
+	closemessage
+	applymovement 9, PetalburgCity_Movement_2725A8
+	waitmovement 0
+	delay 30
+	msgbox PetalburgCity_Text_1DCB82, 4
+	closemessage
+	applymovement 9, PetalburgCity_Movement_2725A4
+	waitmovement 0
+	delay 30
+	msgbox PetalburgCity_Text_1DCC09, 4
+	closemessage
+	compare VAR_0x8008, 0
+	call_if 1, PetalburgCity_EventScript_1DC78E
+	compare VAR_0x8008, 1
+	call_if 1, PetalburgCity_EventScript_1DC7A0
+	compare VAR_0x8008, 2
+	call_if 1, PetalburgCity_EventScript_1DC7B2
+	compare VAR_0x8008, 3
+	call_if 1, PetalburgCity_EventScript_1DC7C4
+	setvar VAR_0x40C9, 1
+	removeobject 9
+	releaseall
+	end
+
+PetalburgCity_EventScript_1DC78E:: @ 81DC78E
+	applymovement 255, PetalburgCity_Movement_1DC7EE
+	applymovement 9, PetalburgCity_Movement_1DC7E0
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC7A0:: @ 81DC7A0
+	applymovement 255, PetalburgCity_Movement_1DC802
+	applymovement 9, PetalburgCity_Movement_1DC7F5
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC7B2:: @ 81DC7B2
+	applymovement 255, PetalburgCity_Movement_1DC815
+	applymovement 9, PetalburgCity_Movement_1DC808
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC7C4:: @ 81DC7C4
+	applymovement 255, PetalburgCity_Movement_1DC828
+	applymovement 9, PetalburgCity_Movement_1DC81B
+	waitmovement 0
+	return
+
+PetalburgCity_Movement_1DC7D6: @ 81DC7D6
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+PetalburgCity_Movement_1DC7DB: @ 81DC7DB
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+PetalburgCity_Movement_1DC7E0: @ 81DC7E0
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+PetalburgCity_Movement_1DC7EE: @ 81DC7EE
+	delay_16
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
+	step_end
+
+PetalburgCity_Movement_1DC7F5: @ 81DC7F5
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+PetalburgCity_Movement_1DC802: @ 81DC802
+	delay_16
+	walk_in_place_fastest_down
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
+	step_end
+
+PetalburgCity_Movement_1DC808: @ 81DC808
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+PetalburgCity_Movement_1DC815: @ 81DC815
+	delay_16
+	walk_in_place_fastest_down
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
+	step_end
+
+PetalburgCity_Movement_1DC81B: @ 81DC81B
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+PetalburgCity_Movement_1DC828: @ 81DC828
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
+	step_end
+
+PetalburgCity_EventScript_1DC82E:: @ 81DC82E
+	msgbox PetalburgCity_Text_1DC881, 2
+	end
+
+PetalburgCity_Text_1DC837: @ 81DC837
+	.string "Where has our WALLY gone?\p"
+	.string "We have to leave for VERDANTURF TOWN\n"
+	.string "very soon…$"
+
+PetalburgCity_Text_1DC881: @ 81DC881
+	.string "Hiya! Are you maybe…\n"
+	.string "A rookie TRAINER?\p"
+	.string "Do you know what POKéMON TRAINERS\n"
+	.string "do when they reach a new town?\p"
+	.string "They first check what kind of GYM\n"
+	.string "is in the town.$"
+
+PetalburgCity_Text_1DC91B: @ 81DC91B
+	.string "See? This is PETALBURG CITY’s GYM.$"
+
+PetalburgCity_Text_1DC93E: @ 81DC93E
+	.string "This is the GYM’s sign. Look for it\n"
+	.string "whenever you’re looking for a GYM.$"
+
+PetalburgCity_Text_1DC985: @ 81DC985
+	.string "My face is reflected in the water.\p"
+	.string "It’s a shining grin full of hope…\p"
+	.string "Or it could be a look of somber silence\n"
+	.string "struggling with fear…\p"
+	.string "What do you see reflected in your face?$"
+
+PetalburgCity_Text_1DCA30: @ 81DCA30
+	.string "Let’s say you have six POKéMON.\n"
+	.string "If you catch another one…\p"
+	.string "It is automatically sent to a STORAGE\n"
+	.string "BOX over a PC connection.$"
+
+PetalburgCity_Text_1DCAAA: @ 81DCAAA
+	.string "PETALBURG CITY POKéMON GYM\n"
+	.string "LEADER: NORMAN\l"
+	.string "“A man in pursuit of power!”$"
+
+PetalburgCity_Text_1DCAF1: @ 81DCAF1
+	.string "PETALBURG CITY\n"
+	.string "“Where people mingle with nature.”$"
+
+PetalburgCity_Text_1DCB23: @ 81DCB23
+	.string "WALLY’S HOUSE$"
+
+PetalburgCity_Text_1DCB31: @ 81DCB31
+	.string "Excuse me!\p"
+	.string "Let me guess, from the way you’re\n"
+	.string "dressed, are you a POKéMON TRAINER?$"
+
+PetalburgCity_Text_1DCB82: @ 81DCB82
+	.string "… … … … … …\p"
+	.string "Well, maybe not.\n"
+	.string "Your clothes aren’t all that dirty.\p"
+	.string "You’re either a rookie TRAINER,\n"
+	.string "or maybe you’re just an ordinary kid.$"
+
+PetalburgCity_Text_1DCC09: @ 81DCC09
+	.string "I’m roaming the land in search of\n"
+	.string "talented TRAINERS.\p"
+	.string "I’m sorry to have taken your time.$"
diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc
new file mode 100644
index 000000000..2df386d2c
--- /dev/null
+++ b/data/maps/PetalburgCity_Gym/events.inc
@@ -0,0 +1,72 @@
+PetalburgCity_Gym_EventObjects: @ 852EDC8
+	object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781
+	object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, 866
+	object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, 7, 1, 1, 0, 0, 0x0, 824
+
+PetalburgCity_Gym_MapWarps: @ 852EED0
+	warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY
+	warp_def 5, 111, 3, 2, MAP_PETALBURG_CITY
+	warp_def 1, 105, 3, 3, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 85, 3, 2, MAP_PETALBURG_CITY_GYM
+	warp_def 6, 85, 3, 2, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 105, 3, 6, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 98, 3, 5, MAP_PETALBURG_CITY_GYM
+	warp_def 2, 98, 3, 5, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 79, 3, 10, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 79, 3, 12, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 46, 3, 8, MAP_PETALBURG_CITY_GYM
+	warp_def 6, 46, 3, 8, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 59, 3, 9, MAP_PETALBURG_CITY_GYM
+	warp_def 2, 59, 3, 9, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 92, 3, 16, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 92, 3, 18, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 59, 3, 14, MAP_PETALBURG_CITY_GYM
+	warp_def 6, 59, 3, 14, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 72, 3, 15, MAP_PETALBURG_CITY_GYM
+	warp_def 2, 72, 3, 15, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 40, 3, 24, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 53, 3, 26, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 53, 3, 28, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 66, 3, 30, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 20, 3, 20, MAP_PETALBURG_CITY_GYM
+	warp_def 2, 20, 3, 20, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 20, 3, 21, MAP_PETALBURG_CITY_GYM
+	warp_def 6, 20, 3, 21, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 33, 3, 22, MAP_PETALBURG_CITY_GYM
+	warp_def 2, 33, 3, 22, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 33, 3, 23, MAP_PETALBURG_CITY_GYM
+	warp_def 6, 33, 3, 23, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 14, 3, 34, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 27, 3, 36, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 7, 3, 32, MAP_PETALBURG_CITY_GYM
+	warp_def 2, 7, 3, 32, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 7, 3, 33, MAP_PETALBURG_CITY_GYM
+	warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM
+
+PetalburgCity_Gym_MapBGEvents: @ 852F000
+	bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_205137
+	bg_event 7, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_205187
+	bg_event 1, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_2051BC
+	bg_event 7, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_2051EF
+	bg_event 1, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_205222
+	bg_event 7, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_205255
+	bg_event 7, 40, 3, 0, 0, PetalburgCity_Gym_EventScript_205288
+	bg_event 1, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_2052BB
+	bg_event 7, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_2052EE
+	bg_event 1, 66, 3, 0, 0, PetalburgCity_Gym_EventScript_205321
+	bg_event 7, 14, 3, 0, 0, PetalburgCity_Gym_EventScript_205354
+	bg_event 1, 27, 3, 0, 0, PetalburgCity_Gym_EventScript_205387
+	bg_event 1, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_20576E
+	bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_20577E
+
+PetalburgCity_Gym_MapEvents:: @ 852F0A8
+	map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents
+
diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc
index 18a39e943..739f19b74 100644
--- a/data/maps/PetalburgCity_Gym/header.inc
+++ b/data/maps/PetalburgCity_Gym/header.inc
@@ -1,5 +1,5 @@
 PetalburgCity_Gym: @ 8483034
-	.4byte PetalburgCity_Gym_MapAttributes
+	.4byte PetalburgCity_Gym_Layout
 	.4byte PetalburgCity_Gym_MapEvents
 	.4byte PetalburgCity_Gym_MapScripts
 	.4byte 0x0
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
new file mode 100644
index 000000000..e95e434b5
--- /dev/null
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -0,0 +1,1703 @@
+PetalburgCity_Gym_MapScripts:: @ 8204889
+	map_script 1, PetalburgCity_Gym_MapScript1_20489E
+	map_script 3, PetalburgCity_Gym_MapScript1_20492D
+	map_script 4, PetalburgCity_Gym_MapScript2_20498B
+	map_script 2, PetalburgCity_Gym_MapScript2_20499A
+	.byte 0
+
+PetalburgCity_Gym_MapScript1_20489E: @ 820489E
+	compare VAR_0x4085, 6
+	goto_eq PetalburgCity_Gym_EventScript_2048B5
+	compare VAR_0x4085, 7
+	call_if 4, PetalburgCity_Gym_EventScript_2048FF
+	end
+
+PetalburgCity_Gym_EventScript_2048B5:: @ 82048B5
+	setvar VAR_0x8005, 1
+	call PetalburgCity_Gym_EventScript_20555E
+	checktrainerflag TRAINER_RANDALL
+	call_if 1, PetalburgCity_Gym_EventScript_20557F
+	checktrainerflag TRAINER_MARY
+	call_if 1, PetalburgCity_Gym_EventScript_2055A0
+	checktrainerflag TRAINER_PARKER
+	call_if 1, PetalburgCity_Gym_EventScript_2055C1
+	checktrainerflag TRAINER_ALEXIA
+	call_if 1, PetalburgCity_Gym_EventScript_2055E2
+	checktrainerflag TRAINER_GEORGE
+	call_if 1, PetalburgCity_Gym_EventScript_205603
+	checktrainerflag TRAINER_JODY
+	call_if 1, PetalburgCity_Gym_EventScript_205624
+	checktrainerflag TRAINER_BERKE
+	call_if 1, PetalburgCity_Gym_EventScript_205645
+	end
+
+PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF
+	setvar VAR_0x8005, 1
+	call PetalburgCity_Gym_EventScript_20555E
+	call PetalburgCity_Gym_EventScript_20557F
+	call PetalburgCity_Gym_EventScript_2055A0
+	call PetalburgCity_Gym_EventScript_2055C1
+	call PetalburgCity_Gym_EventScript_2055E2
+	call PetalburgCity_Gym_EventScript_205603
+	call PetalburgCity_Gym_EventScript_205624
+	call PetalburgCity_Gym_EventScript_205645
+	return
+
+PetalburgCity_Gym_MapScript1_20492D: @ 820492D
+	compare VAR_0x4085, 1
+	call_if 1, PetalburgCity_Gym_EventScript_20494D
+	compare VAR_0x4085, 6
+	call_if 0, PetalburgCity_Gym_EventScript_204955
+	checkflag FLAG_SYS_GAME_CLEAR
+	call_if 1, PetalburgCity_Gym_EventScript_20495D
+	end
+
+PetalburgCity_Gym_EventScript_20494D:: @ 820494D
+	setobjectxyperm 10, 5, 108
+	return
+
+PetalburgCity_Gym_EventScript_204955:: @ 8204955
+	setobjectxyperm 1, 4, 107
+	return
+
+PetalburgCity_Gym_EventScript_20495D:: @ 820495D
+	setorcopyvar 0x8015, 269
+	specialvar VAR_RESULT, IsTrainerReadyForRematch
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_204985
+	compare VAR_0x4085, 8
+	goto_eq PetalburgCity_Gym_EventScript_204985
+	setobjectxyperm 1, 4, 107
+	return
+
+PetalburgCity_Gym_EventScript_204985:: @ 8204985
+	setvar VAR_0x4085, 8
+	end
+
+PetalburgCity_Gym_MapScript2_20498B: @ 820498B
+	map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_204995
+	.2byte 0
+
+PetalburgCity_Gym_EventScript_204995:: @ 8204995
+	turnobject 255, 2
+	end
+
+PetalburgCity_Gym_MapScript2_20499A: @ 820499A
+	map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_2049A4
+	.2byte 0
+
+PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4
+	lockall
+	msgbox PetalburgCity_Gym_Text_205B32, 4
+	msgbox PetalburgCity_Gym_Text_205B4C, 4
+	closemessage
+	applymovement 255, PetalburgCity_Gym_Movement_2725AA
+	applymovement 10, PetalburgCity_Gym_Movement_2049EC
+	waitmovement 0
+	playse SE_KAIDAN
+	removeobject 10
+	setflag FLAG_0x2D6
+	delay 30
+	applymovement 255, PetalburgCity_Gym_Movement_2725A6
+	waitmovement 0
+	msgbox PetalburgCity_Gym_Text_205C40, 4
+	setvar VAR_0x4085, 2
+	releaseall
+	end
+
+PetalburgCity_Gym_Movement_2049EC: @ 82049EC
+	walk_down
+	walk_down
+	walk_down
+	delay_16
+	step_end
+
+PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1
+	lock
+	faceplayer
+	switch VAR_0x4085
+	case 2, PetalburgCity_Gym_EventScript_204D4A
+	case 3, PetalburgCity_Gym_EventScript_204D54
+	case 4, PetalburgCity_Gym_EventScript_204D5E
+	case 5, PetalburgCity_Gym_EventScript_204D68
+	case 6, PetalburgCity_Gym_EventScript_204E3B
+	case 7, PetalburgCity_Gym_EventScript_204D80
+	case 8, PetalburgCity_Gym_EventScript_204DB3
+	msgbox PetalburgCity_Gym_Text_2057A2, 4
+	closemessage
+	switch VAR_FACING
+	case 1, PetalburgCity_Gym_EventScript_204A80
+	case 2, PetalburgCity_Gym_EventScript_204A8B
+	case 3, PetalburgCity_Gym_EventScript_204A96
+	case 4, PetalburgCity_Gym_EventScript_204AA1
+	end
+
+PetalburgCity_Gym_EventScript_204A80:: @ 8204A80
+	setvar VAR_0x8008, 0
+	goto PetalburgCity_Gym_EventScript_204AAC
+	end
+
+PetalburgCity_Gym_EventScript_204A8B:: @ 8204A8B
+	setvar VAR_0x8008, 1
+	goto PetalburgCity_Gym_EventScript_204AAC
+	end
+
+PetalburgCity_Gym_EventScript_204A96:: @ 8204A96
+	setvar VAR_0x8008, 2
+	goto PetalburgCity_Gym_EventScript_204AAC
+	end
+
+PetalburgCity_Gym_EventScript_204AA1:: @ 8204AA1
+	setvar VAR_0x8008, 3
+	goto PetalburgCity_Gym_EventScript_204AAC
+	end
+
+PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC
+	addobject 10
+	playse SE_DOOR
+	compare VAR_0x8008, 0
+	call_if 1, PetalburgCity_Gym_EventScript_204C31
+	compare VAR_0x8008, 1
+	call_if 1, PetalburgCity_Gym_EventScript_204C43
+	compare VAR_0x8008, 2
+	call_if 1, PetalburgCity_Gym_EventScript_204C5F
+	compare VAR_0x8008, 3
+	call_if 1, PetalburgCity_Gym_EventScript_204C5F
+	msgbox PetalburgCity_Gym_Text_2058B1, 4
+	msgbox PetalburgCity_Gym_Text_2058DB, 4
+	msgbox PetalburgCity_Gym_Text_205910, 4
+	msgbox PetalburgCity_Gym_Text_2059D8, 4
+	compare VAR_0x8008, 0
+	call_if 1, PetalburgCity_Gym_EventScript_204CC7
+	compare VAR_0x8008, 1
+	call_if 1, PetalburgCity_Gym_EventScript_204CD2
+	compare VAR_0x8008, 2
+	call_if 1, PetalburgCity_Gym_EventScript_204CE4
+	compare VAR_0x8008, 3
+	call_if 1, PetalburgCity_Gym_EventScript_204CF6
+	msgbox PetalburgCity_Gym_Text_2059E8, 4
+	compare VAR_0x8008, 0
+	call_if 1, PetalburgCity_Gym_EventScript_204D08
+	compare VAR_0x8008, 1
+	call_if 1, PetalburgCity_Gym_EventScript_204D13
+	compare VAR_0x8008, 2
+	call_if 1, PetalburgCity_Gym_EventScript_204D1E
+	compare VAR_0x8008, 3
+	call_if 1, PetalburgCity_Gym_EventScript_204D29
+	msgbox PetalburgCity_Gym_Text_205A46, 4
+	msgbox PetalburgCity_Gym_Text_205A89, 4
+	msgbox PetalburgCity_Gym_Text_205AF4, 4
+	compare VAR_0x8008, 0
+	call_if 1, PetalburgCity_Gym_EventScript_204D72
+	compare VAR_0x8008, 1
+	call_if 1, PetalburgCity_Gym_EventScript_204D73
+	compare VAR_0x8008, 2
+	call_if 1, PetalburgCity_Gym_EventScript_204D7E
+	compare VAR_0x8008, 3
+	call_if 1, PetalburgCity_Gym_EventScript_204D7F
+	compare VAR_0x8008, 0
+	call_if 1, PetalburgCity_Gym_EventScript_204D34
+	compare VAR_0x8008, 1
+	call_if 1, PetalburgCity_Gym_EventScript_204D3F
+	compare VAR_0x8008, 2
+	call_if 1, PetalburgCity_Gym_EventScript_204D34
+	compare VAR_0x8008, 3
+	call_if 1, PetalburgCity_Gym_EventScript_204D34
+	msgbox PetalburgCity_Gym_Text_205B0F, 4
+	closemessage
+	setflag FLAG_SPECIAL_FLAG_0x4001
+	playbgm MUS_TSURETEK, 0
+	compare VAR_0x8008, 0
+	call_if 1, PetalburgCity_Gym_EventScript_204C78
+	compare VAR_0x8008, 1
+	call_if 1, PetalburgCity_Gym_EventScript_204C91
+	compare VAR_0x8008, 2
+	call_if 1, PetalburgCity_Gym_EventScript_204CA3
+	compare VAR_0x8008, 3
+	call_if 1, PetalburgCity_Gym_EventScript_204CB5
+	removeobject 10
+	setflag FLAG_0x2D8
+	setvar VAR_0x4085, 1
+	setvar VAR_0x4057, 2
+	clearflag FLAG_0x2D6
+	clearflag FLAG_0x362
+	setflag FLAG_0x379
+	special InitBirchState
+	warp MAP_PETALBURG_CITY, 255, 15, 8
+	waitstate
+	release
+	end
+
+PetalburgCity_Gym_EventScript_204C31:: @ 8204C31
+	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	applymovement 10, PetalburgCity_Gym_Movement_2050EB
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204C43:: @ 8204C43
+	applymovement 10, PetalburgCity_Gym_Movement_2050E1
+	waitmovement 0
+	applymovement 1, PetalburgCity_Gym_Movement_2725A8
+	applymovement 255, PetalburgCity_Gym_Movement_2725A8
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F
+	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	applymovement 255, PetalburgCity_Gym_Movement_2725AA
+	applymovement 10, PetalburgCity_Gym_Movement_2050EB
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204C78:: @ 8204C78
+	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	applymovement 10, PetalburgCity_Gym_Movement_205102
+	applymovement 255, PetalburgCity_Gym_Movement_205111
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204C91:: @ 8204C91
+	applymovement 10, PetalburgCity_Gym_Movement_2050F2
+	applymovement 255, PetalburgCity_Gym_Movement_205109
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204CA3:: @ 8204CA3
+	applymovement 10, PetalburgCity_Gym_Movement_205102
+	applymovement 255, PetalburgCity_Gym_Movement_20511B
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5
+	applymovement 10, PetalburgCity_Gym_Movement_2050FA
+	applymovement 255, PetalburgCity_Gym_Movement_205123
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7
+	applymovement 1, PetalburgCity_Gym_Movement_2725A6
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2
+	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	applymovement 255, PetalburgCity_Gym_Movement_2725A6
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4
+	applymovement 1, PetalburgCity_Gym_Movement_2725A8
+	applymovement 255, PetalburgCity_Gym_Movement_2725A4
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6
+	applymovement 1, PetalburgCity_Gym_Movement_2725A4
+	applymovement 255, PetalburgCity_Gym_Movement_2725A8
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204D08:: @ 8204D08
+	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204D13:: @ 8204D13
+	applymovement 1, PetalburgCity_Gym_Movement_2725A8
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E
+	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204D29:: @ 8204D29
+	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204D34:: @ 8204D34
+	applymovement 10, PetalburgCity_Gym_Movement_27259E
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F
+	applymovement 10, PetalburgCity_Gym_Movement_2725AA
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204D4A:: @ 8204D4A
+	msgbox PetalburgCity_Gym_Text_205DB4, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_204D54:: @ 8204D54
+	msgbox PetalburgCity_Gym_Text_205EAE, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_204D5E:: @ 8204D5E
+	msgbox PetalburgCity_Gym_Text_205F87, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_204D68:: @ 8204D68
+	msgbox PetalburgCity_Gym_Text_205F87, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_204D72:: @ 8204D72
+	return
+
+PetalburgCity_Gym_EventScript_204D73:: @ 8204D73
+	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204D7E:: @ 8204D7E
+	return
+
+PetalburgCity_Gym_EventScript_204D7F:: @ 8204D7F
+	return
+
+PetalburgCity_Gym_EventScript_204D80:: @ 8204D80
+	call PetalburgCity_Gym_EventScript_204DCE
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_204E1D
+	checkflag FLAG_0x0A9
+	goto_if 0, PetalburgCity_Gym_EventScript_204DAC
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq PetalburgCity_Gym_EventScript_20512D
+	msgbox PetalburgCity_Gym_Text_206417, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_204DAC:: @ 8204DAC
+	call PetalburgCity_Gym_EventScript_204ED2
+	release
+	end
+
+PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3
+	trainerbattle 7, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A
+	msgbox PetalburgCity_Gym_Text_2075F7, 6
+	end
+
+PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE
+	specialvar VAR_RESULT, IsEnigmaBerryValid
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_204E17
+	checkitem ITEM_ENIGMA_BERRY, 1
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_204E17
+	checkpcitem ITEM_ENIGMA_BERRY, 1
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_204E17
+	compare VAR_ENIGMA_BERRY_AVAILABLE, 0
+	goto_eq PetalburgCity_Gym_EventScript_204E17
+	msgbox PetalburgCity_Gym_Text_2A6D3D, 4
+	setvar VAR_RESULT, 1
+	return
+
+PetalburgCity_Gym_EventScript_204E17:: @ 8204E17
+	setvar VAR_RESULT, 0
+	return
+
+PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D
+	giveitem_std ITEM_ENIGMA_BERRY
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_272054
+	setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
+	release
+	end
+
+PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
+	msgbox PetalburgCity_Gym_Text_205FE5, 4
+	trainerbattle 3, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_206107
+	message PetalburgCity_Gym_Text_206162
+	waitmessage
+	call PetalburgCity_Gym_EventScript_27207E
+	msgbox PetalburgCity_Gym_Text_20618A, 4
+	setflag FLAG_0x4F4
+	setvar VAR_0x4085, 7
+	setflag FLAG_BADGE05_GET
+	special sub_813B9A0
+	call PetalburgCity_Gym_EventScript_2721F8
+	setflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON
+	clearflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
+	setvar VAR_0x8008, 5
+	call PetalburgCity_Gym_EventScript_271F43
+	clearflag FLAG_0x3AC
+	call PetalburgCity_Gym_EventScript_2048FF
+	special DrawWholeMapView
+	call PetalburgCity_Gym_EventScript_204ED2
+	delay 30
+	msgbox PetalburgCity_Gym_Text_2062FB, 4
+	closemessage
+	delay 40
+	playse SE_DOOR
+	delay 10
+	addobject 11
+	switch VAR_FACING
+	case 2, PetalburgCity_Gym_EventScript_204EF5
+	case 3, PetalburgCity_Gym_EventScript_204F09
+	case 4, PetalburgCity_Gym_EventScript_204EFF
+	end
+
+PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2
+	giveitem_std ITEM_TM42
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_27205E
+	setflag FLAG_0x0A9
+	msgbox PetalburgCity_Gym_Text_206254, 4
+	return
+
+PetalburgCity_Gym_EventScript_204EF5:: @ 8204EF5
+	setvar VAR_0x8008, 1
+	goto PetalburgCity_Gym_EventScript_204F13
+
+PetalburgCity_Gym_EventScript_204EFF:: @ 8204EFF
+	setvar VAR_0x8008, 2
+	goto PetalburgCity_Gym_EventScript_204F13
+
+PetalburgCity_Gym_EventScript_204F09:: @ 8204F09
+	setvar VAR_0x8008, 3
+	goto PetalburgCity_Gym_EventScript_204F13
+
+PetalburgCity_Gym_EventScript_204F13:: @ 8204F13
+	applymovement 11, PetalburgCity_Gym_Movement_2050BB
+	waitmovement 0
+	playse SE_PIN
+	applymovement 11, PetalburgCity_Gym_Movement_272598
+	waitmovement 0
+	applymovement 11, PetalburgCity_Gym_Movement_27259A
+	waitmovement 0
+	delay 10
+	compare VAR_0x8008, 1
+	call_if 1, PetalburgCity_Gym_EventScript_204FED
+	compare VAR_0x8008, 2
+	call_if 1, PetalburgCity_Gym_EventScript_205009
+	compare VAR_0x8008, 3
+	call_if 1, PetalburgCity_Gym_EventScript_205025
+	msgbox PetalburgCity_Gym_Text_206377, 4
+	closemessage
+	delay 20
+	compare VAR_0x8008, 1
+	call_if 1, PetalburgCity_Gym_EventScript_204FCC
+	compare VAR_0x8008, 2
+	call_if 1, PetalburgCity_Gym_EventScript_204FD7
+	compare VAR_0x8008, 3
+	call_if 1, PetalburgCity_Gym_EventScript_204FE2
+	msgbox PetalburgCity_Gym_Text_2063CA, 4
+	closemessage
+	setflag FLAG_SPECIAL_FLAG_0x4001
+	playbgm MUS_TSURETEK, 0
+	compare VAR_0x8008, 1
+	call_if 1, PetalburgCity_Gym_EventScript_205041
+	compare VAR_0x8008, 2
+	call_if 1, PetalburgCity_Gym_EventScript_20505A
+	compare VAR_0x8008, 3
+	call_if 1, PetalburgCity_Gym_EventScript_20506C
+	removeobject 11
+	setvar VAR_0x4057, 4
+	clearflag FLAG_0x33E
+	warp MAP_PETALBURG_CITY, 255, 15, 8
+	waitstate
+	release
+	end
+
+PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC
+	applymovement 11, PetalburgCity_Gym_Movement_2725A6
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7
+	applymovement 11, PetalburgCity_Gym_Movement_2725A8
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2
+	applymovement 11, PetalburgCity_Gym_Movement_2725A4
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_204FED:: @ 8204FED
+	applymovement 11, PetalburgCity_Gym_Movement_2050C3
+	waitmovement 0
+	applymovement 255, PetalburgCity_Gym_Movement_2725A4
+	applymovement 1, PetalburgCity_Gym_Movement_2725A4
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_205009:: @ 8205009
+	applymovement 11, PetalburgCity_Gym_Movement_2050CA
+	waitmovement 0
+	applymovement 255, PetalburgCity_Gym_Movement_2725AA
+	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_205025:: @ 8205025
+	applymovement 11, PetalburgCity_Gym_Movement_2050D0
+	waitmovement 0
+	applymovement 255, PetalburgCity_Gym_Movement_2725AA
+	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_205041:: @ 8205041
+	applymovement 11, PetalburgCity_Gym_Movement_20507E
+	applymovement 1, PetalburgCity_Gym_Movement_2725AA
+	applymovement 255, PetalburgCity_Gym_Movement_2050A1
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_20505A:: @ 820505A
+	applymovement 11, PetalburgCity_Gym_Movement_205089
+	applymovement 255, PetalburgCity_Gym_Movement_2050A9
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_20506C:: @ 820506C
+	applymovement 11, PetalburgCity_Gym_Movement_205094
+	applymovement 255, PetalburgCity_Gym_Movement_2050B1
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_Movement_20507E: @ 820507E
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_down
+	set_invisible
+	step_end
+
+PetalburgCity_Gym_Movement_205089: @ 8205089
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_down
+	set_invisible
+	step_end
+
+PetalburgCity_Gym_Movement_205094: @ 8205094
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_down
+	set_invisible
+	step_end
+
+PetalburgCity_Gym_Movement_2050A1: @ 82050A1
+	delay_16
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	step_end
+
+PetalburgCity_Gym_Movement_2050A9: @ 82050A9
+	delay_16
+	walk_down
+	walk_down
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+PetalburgCity_Gym_Movement_2050B1: @ 82050B1
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	step_end
+
+PetalburgCity_Gym_Movement_2050BB: @ 82050BB
+	walk_up
+	delay_8
+	walk_in_place_fastest_right
+	delay_8
+	walk_in_place_fastest_left
+	delay_16
+	walk_in_place_fastest_up
+	step_end
+
+PetalburgCity_Gym_Movement_2050C3: @ 82050C3
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
+	step_end
+
+PetalburgCity_Gym_Movement_2050CA: @ 82050CA
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+PetalburgCity_Gym_Movement_2050D0: @ 82050D0
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_up
+	step_end
+
+PetalburgCity_Gym_Movement_2050D8: @ 82050D8
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_down
+	step_end
+
+PetalburgCity_Gym_Movement_2050E1: @ 82050E1
+	delay_16
+	walk_up
+	delay_16
+	delay_8
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	step_end
+
+PetalburgCity_Gym_Movement_2050EB: @ 82050EB
+	delay_16
+	walk_up
+	delay_16
+	delay_8
+	walk_up
+	walk_up
+	step_end
+
+PetalburgCity_Gym_Movement_2050F2: @ 82050F2
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
+	step_end
+
+PetalburgCity_Gym_Movement_2050FA: @ 82050FA
+	walk_down
+	walk_down
+	walk_right
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
+	step_end
+
+PetalburgCity_Gym_Movement_205102: @ 8205102
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
+	step_end
+
+PetalburgCity_Gym_Movement_205109: @ 8205109
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	step_end
+
+PetalburgCity_Gym_Movement_205111: @ 8205111
+	delay_16
+	delay_16
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	step_end
+
+PetalburgCity_Gym_Movement_20511B: @ 820511B
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	step_end
+
+PetalburgCity_Gym_Movement_205123: @ 8205123
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_down
+	delay_8
+	step_end
+
+PetalburgCity_Gym_EventScript_20512D:: @ 820512D
+	msgbox PetalburgCity_Gym_Text_2064C3, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_205137:: @ 8205137
+	lockall
+	compare VAR_0x4085, 6
+	goto_if 0, PetalburgCity_Gym_EventScript_20517D
+	setvar VAR_0x8008, 7
+	setvar VAR_0x8009, 85
+	msgbox PetalburgCity_Gym_Text_20721E, 5
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_20516C
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_20517B
+	end
+
+PetalburgCity_Gym_EventScript_20516C:: @ 820516C
+	closemessage
+	delay 30
+	warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777
+	waitstate
+	releaseall
+	end
+
+PetalburgCity_Gym_EventScript_20517B:: @ 820517B
+	releaseall
+	end
+
+PetalburgCity_Gym_EventScript_20517D:: @ 820517D
+	msgbox PetalburgCity_Gym_Text_2071F4, 4
+	releaseall
+	end
+
+PetalburgCity_Gym_EventScript_205187:: @ 8205187
+	lockall
+	compare VAR_0x4085, 6
+	goto_if 0, PetalburgCity_Gym_EventScript_20517D
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, 98
+	msgbox PetalburgCity_Gym_Text_207280, 5
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_20516C
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_20517B
+	end
+
+PetalburgCity_Gym_EventScript_2051BC:: @ 82051BC
+	lockall
+	checktrainerflag TRAINER_RANDALL
+	goto_if 0, PetalburgCity_Gym_EventScript_20517D
+	setvar VAR_0x8008, 7
+	setvar VAR_0x8009, 46
+	msgbox PetalburgCity_Gym_Text_2072BB, 5
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_20516C
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_20517B
+	end
+
+PetalburgCity_Gym_EventScript_2051EF:: @ 82051EF
+	lockall
+	checktrainerflag TRAINER_RANDALL
+	goto_if 0, PetalburgCity_Gym_EventScript_20517D
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, 59
+	msgbox PetalburgCity_Gym_Text_2072F7, 5
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_20516C
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_20517B
+	end
+
+PetalburgCity_Gym_EventScript_205222:: @ 8205222
+	lockall
+	checktrainerflag TRAINER_MARY
+	goto_if 0, PetalburgCity_Gym_EventScript_20517D
+	setvar VAR_0x8008, 7
+	setvar VAR_0x8009, 59
+	msgbox PetalburgCity_Gym_Text_2072F7, 5
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_20516C
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_20517B
+	end
+
+PetalburgCity_Gym_EventScript_205255:: @ 8205255
+	lockall
+	checktrainerflag TRAINER_MARY
+	goto_if 0, PetalburgCity_Gym_EventScript_20517D
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, 72
+	msgbox PetalburgCity_Gym_Text_207331, 5
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_20516C
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_20517B
+	end
+
+PetalburgCity_Gym_EventScript_205288:: @ 8205288
+	lockall
+	checktrainerflag TRAINER_PARKER
+	goto_if 0, PetalburgCity_Gym_EventScript_20517D
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, 20
+	msgbox PetalburgCity_Gym_Text_20736C, 5
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_20516C
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_20517B
+	end
+
+PetalburgCity_Gym_EventScript_2052BB:: @ 82052BB
+	lockall
+	checktrainerflag TRAINER_ALEXIA
+	goto_if 0, PetalburgCity_Gym_EventScript_20517D
+	setvar VAR_0x8008, 7
+	setvar VAR_0x8009, 20
+	msgbox PetalburgCity_Gym_Text_20736C, 5
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_20516C
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_20517B
+	end
+
+PetalburgCity_Gym_EventScript_2052EE:: @ 82052EE
+	lockall
+	checktrainerflag TRAINER_ALEXIA
+	goto_if 0, PetalburgCity_Gym_EventScript_20517D
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, 33
+	msgbox PetalburgCity_Gym_Text_2073A7, 5
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_20516C
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_20517B
+	end
+
+PetalburgCity_Gym_EventScript_205321:: @ 8205321
+	lockall
+	checktrainerflag TRAINER_GEORGE
+	goto_if 0, PetalburgCity_Gym_EventScript_20517D
+	setvar VAR_0x8008, 7
+	setvar VAR_0x8009, 33
+	msgbox PetalburgCity_Gym_Text_2073A7, 5
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_20516C
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_20517B
+	end
+
+PetalburgCity_Gym_EventScript_205354:: @ 8205354
+	lockall
+	checktrainerflag TRAINER_JODY
+	goto_if 0, PetalburgCity_Gym_EventScript_20517D
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, 7
+	msgbox PetalburgCity_Gym_Text_2073E4, 5
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_20516C
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_20517B
+	end
+
+PetalburgCity_Gym_EventScript_205387:: @ 8205387
+	lockall
+	checktrainerflag TRAINER_BERKE
+	goto_if 0, PetalburgCity_Gym_EventScript_20517D
+	setvar VAR_0x8008, 7
+	setvar VAR_0x8009, 7
+	msgbox PetalburgCity_Gym_Text_2073E4, 5
+	compare VAR_RESULT, 1
+	goto_eq PetalburgCity_Gym_EventScript_20516C
+	compare VAR_RESULT, 0
+	goto_eq PetalburgCity_Gym_EventScript_20517B
+	end
+
+PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA
+	trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE
+	checkflag FLAG_0x4F4
+	goto_eq PetalburgCity_Gym_EventScript_2053ED
+	msgbox PetalburgCity_Gym_Text_2067D8, 6
+	end
+
+PetalburgCity_Gym_EventScript_2053DE:: @ 82053DE
+	setvar VAR_0x8005, 0
+	call PetalburgCity_Gym_EventScript_20557F
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED
+	msgbox PetalburgCity_Gym_Text_20685E, 2
+	end
+
+PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6
+	trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A
+	checkflag FLAG_0x4F4
+	goto_eq PetalburgCity_Gym_EventScript_205429
+	msgbox PetalburgCity_Gym_Text_206996, 6
+	end
+
+PetalburgCity_Gym_EventScript_20541A:: @ 820541A
+	setvar VAR_0x8005, 0
+	call PetalburgCity_Gym_EventScript_2055C1
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_205429:: @ 8205429
+	msgbox PetalburgCity_Gym_Text_2069D9, 2
+	end
+
+PetalburgCity_Gym_EventScript_205432:: @ 8205432
+	trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456
+	checkflag FLAG_0x4F4
+	goto_eq PetalburgCity_Gym_EventScript_205465
+	msgbox PetalburgCity_Gym_Text_206AE9, 6
+	end
+
+PetalburgCity_Gym_EventScript_205456:: @ 8205456
+	setvar VAR_0x8005, 0
+	call PetalburgCity_Gym_EventScript_205603
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_205465:: @ 8205465
+	msgbox PetalburgCity_Gym_Text_206BB1, 2
+	end
+
+PetalburgCity_Gym_EventScript_20546E:: @ 820546E
+	trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492
+	checkflag FLAG_0x4F4
+	goto_eq PetalburgCity_Gym_EventScript_2054A1
+	msgbox PetalburgCity_Gym_Text_206C9F, 6
+	end
+
+PetalburgCity_Gym_EventScript_205492:: @ 8205492
+	setvar VAR_0x8005, 0
+	call PetalburgCity_Gym_EventScript_205645
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1
+	msgbox PetalburgCity_Gym_Text_206D56, 2
+	end
+
+PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA
+	trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE
+	checkflag FLAG_0x4F4
+	goto_eq PetalburgCity_Gym_EventScript_2054DD
+	msgbox PetalburgCity_Gym_Text_206E26, 6
+	end
+
+PetalburgCity_Gym_EventScript_2054CE:: @ 82054CE
+	setvar VAR_0x8005, 0
+	call PetalburgCity_Gym_EventScript_2055A0
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD
+	msgbox PetalburgCity_Gym_Text_206ED8, 2
+	end
+
+PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6
+	trainerbattle 2, TRAINER_ALEXIA, 0, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A
+	checkflag FLAG_0x4F4
+	goto_eq PetalburgCity_Gym_EventScript_205519
+	msgbox PetalburgCity_Gym_Text_206F9F, 6
+	end
+
+PetalburgCity_Gym_EventScript_20550A:: @ 820550A
+	setvar VAR_0x8005, 0
+	call PetalburgCity_Gym_EventScript_2055E2
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_205519:: @ 8205519
+	msgbox PetalburgCity_Gym_Text_207069, 2
+	end
+
+PetalburgCity_Gym_EventScript_205522:: @ 8205522
+	trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546
+	checkflag FLAG_0x4F4
+	goto_eq PetalburgCity_Gym_EventScript_205555
+	msgbox PetalburgCity_Gym_Text_2070FB, 6
+	end
+
+PetalburgCity_Gym_EventScript_205546:: @ 8205546
+	setvar VAR_0x8005, 0
+	call PetalburgCity_Gym_EventScript_205624
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_205555:: @ 8205555
+	msgbox PetalburgCity_Gym_Text_207170, 2
+	end
+
+PetalburgCity_Gym_EventScript_20555E:: @ 820555E
+	setvar VAR_0x8004, 1
+	compare VAR_0x8005, 0
+	call_if 1, PetalburgCity_Gym_EventScript_205746
+	compare VAR_0x8005, 1
+	call_if 1, PetalburgCity_Gym_EventScript_20574B
+	call PetalburgCity_Gym_EventScript_205666
+	return
+
+PetalburgCity_Gym_EventScript_20557F:: @ 820557F
+	setvar VAR_0x8004, 2
+	compare VAR_0x8005, 0
+	call_if 1, PetalburgCity_Gym_EventScript_205746
+	compare VAR_0x8005, 1
+	call_if 1, PetalburgCity_Gym_EventScript_20574B
+	call PetalburgCity_Gym_EventScript_20568B
+	return
+
+PetalburgCity_Gym_EventScript_2055A0:: @ 82055A0
+	setvar VAR_0x8004, 3
+	compare VAR_0x8005, 0
+	call_if 1, PetalburgCity_Gym_EventScript_205746
+	compare VAR_0x8005, 1
+	call_if 1, PetalburgCity_Gym_EventScript_20574B
+	call PetalburgCity_Gym_EventScript_2056B0
+	return
+
+PetalburgCity_Gym_EventScript_2055C1:: @ 82055C1
+	setvar VAR_0x8004, 4
+	compare VAR_0x8005, 0
+	call_if 1, PetalburgCity_Gym_EventScript_205746
+	compare VAR_0x8005, 1
+	call_if 1, PetalburgCity_Gym_EventScript_20574B
+	call PetalburgCity_Gym_EventScript_2056D5
+	return
+
+PetalburgCity_Gym_EventScript_2055E2:: @ 82055E2
+	setvar VAR_0x8004, 5
+	compare VAR_0x8005, 0
+	call_if 1, PetalburgCity_Gym_EventScript_205746
+	compare VAR_0x8005, 1
+	call_if 1, PetalburgCity_Gym_EventScript_20574B
+	call PetalburgCity_Gym_EventScript_2056E8
+	return
+
+PetalburgCity_Gym_EventScript_205603:: @ 8205603
+	setvar VAR_0x8004, 6
+	compare VAR_0x8005, 0
+	call_if 1, PetalburgCity_Gym_EventScript_205746
+	compare VAR_0x8005, 1
+	call_if 1, PetalburgCity_Gym_EventScript_20574B
+	call PetalburgCity_Gym_EventScript_20570D
+	return
+
+PetalburgCity_Gym_EventScript_205624:: @ 8205624
+	setvar VAR_0x8004, 7
+	compare VAR_0x8005, 0
+	call_if 1, PetalburgCity_Gym_EventScript_205746
+	compare VAR_0x8005, 1
+	call_if 1, PetalburgCity_Gym_EventScript_20574B
+	call PetalburgCity_Gym_EventScript_205720
+	return
+
+PetalburgCity_Gym_EventScript_205645:: @ 8205645
+	setvar VAR_0x8004, 8
+	compare VAR_0x8005, 0
+	call_if 1, PetalburgCity_Gym_EventScript_205746
+	compare VAR_0x8005, 1
+	call_if 1, PetalburgCity_Gym_EventScript_20574B
+	call PetalburgCity_Gym_EventScript_205733
+	return
+
+PetalburgCity_Gym_EventScript_205666:: @ 8205666
+	setmetatile 6, 85, 528, 0
+	setmetatile 7, 85, 529, 0
+	setmetatile 1, 98, 528, 0
+	setmetatile 2, 98, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_20568B:: @ 820568B
+	setmetatile 6, 46, 528, 0
+	setmetatile 7, 46, 529, 0
+	setmetatile 1, 59, 528, 0
+	setmetatile 2, 59, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_2056B0:: @ 82056B0
+	setmetatile 6, 59, 528, 0
+	setmetatile 7, 59, 529, 0
+	setmetatile 1, 72, 528, 0
+	setmetatile 2, 72, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_2056D5:: @ 82056D5
+	setmetatile 1, 20, 528, 0
+	setmetatile 2, 20, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_2056E8:: @ 82056E8
+	setmetatile 6, 20, 528, 0
+	setmetatile 7, 20, 529, 0
+	setmetatile 1, 33, 528, 0
+	setmetatile 2, 33, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_20570D:: @ 820570D
+	setmetatile 6, 33, 528, 0
+	setmetatile 7, 33, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_205720:: @ 8205720
+	setmetatile 1, 7, 528, 0
+	setmetatile 2, 7, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_205733:: @ 8205733
+	setmetatile 6, 7, 528, 0
+	setmetatile 7, 7, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_205746:: @ 8205746
+	special PetalburgGymSpecial1
+	waitstate
+	return
+
+PetalburgCity_Gym_EventScript_20574B:: @ 820574B
+	special PetalburgGymSpecial2
+	return
+
+PetalburgCity_Gym_EventScript_20574F:: @ 820574F
+	lock
+	faceplayer
+	checkflag FLAG_0x4F4
+	goto_eq PetalburgCity_Gym_EventScript_205764
+	msgbox PetalburgCity_Gym_Text_206542, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_205764:: @ 8205764
+	msgbox PetalburgCity_Gym_Text_2066F3, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_20576E:: @ 820576E
+	lockall
+	checkflag FLAG_BADGE05_GET
+	goto_eq PetalburgCity_Gym_EventScript_20578E
+	goto PetalburgCity_Gym_EventScript_205798
+	end
+
+PetalburgCity_Gym_EventScript_20577E:: @ 820577E
+	lockall
+	checkflag FLAG_BADGE05_GET
+	goto_eq PetalburgCity_Gym_EventScript_20578E
+	goto PetalburgCity_Gym_EventScript_205798
+	end
+
+PetalburgCity_Gym_EventScript_20578E:: @ 820578E
+	msgbox PetalburgCity_Gym_Text_207467, 4
+	releaseall
+	end
+
+PetalburgCity_Gym_EventScript_205798:: @ 8205798
+	msgbox PetalburgCity_Gym_Text_20744C, 4
+	releaseall
+	end
+
+PetalburgCity_Gym_Text_2057A2: @ 82057A2
+	.string "DAD: Hm?\p"
+	.string "Well, if it isn’t {PLAYER}!\n"
+	.string "So you’re all finished moving in?\p"
+	.string "I’m surprised that you managed to\n"
+	.string "get here by yourself.\p"
+	.string "Oh, I see.\n"
+	.string "You’re with your POKéMON.\p"
+	.string "Hm… Then I guess you’re going to\n"
+	.string "become a TRAINER like me, {PLAYER}.\p"
+	.string "That’s great news!\n"
+	.string "I’ll be looking forward to it!$"
+
+PetalburgCity_Gym_Text_2058B1: @ 82058B1
+	.string "Um… I…\n"
+	.string "I’d like to get a POKéMON, please…$"
+
+PetalburgCity_Gym_Text_2058DB: @ 82058DB
+	.string "DAD: Hm? You’re… Uh… Oh, right.\n"
+	.string "You’re WALLY, right?$"
+
+PetalburgCity_Gym_Text_205910: @ 8205910
+	.string "WALLY: I’m going to go stay with my\n"
+	.string "relatives in VERDANTURF TOWN.\p"
+	.string "I thought I would be lonely by myself,\n"
+	.string "so I wanted to take a POKéMON along.\p"
+	.string "But I’ve never caught a POKéMON before.\n"
+	.string "I don’t know how…$"
+
+PetalburgCity_Gym_Text_2059D8: @ 82059D8
+	.string "DAD: Hm. I see.$"
+
+PetalburgCity_Gym_Text_2059E8: @ 82059E8
+	.string "DAD: {PLAYER}, you heard that,\n"
+	.string "right?\p"
+	.string "Go with WALLY and make sure that he\n"
+	.string "safely catches a POKéMON.$"
+
+PetalburgCity_Gym_Text_205A46: @ 8205A46
+	.string "WALLY, here, I’ll loan you my POKéMON.\p"
+	.string "WALLY received a ZIGZAGOON!$"
+
+PetalburgCity_Gym_Text_205A89: @ 8205A89
+	.string "WALLY: Oh, wow!\n"
+	.string "A POKéMON!\p"
+	.string "DAD: Hm. I’ll give you a POKé BALL, too.\n"
+	.string "Go for it!\p"
+	.string "WALLY received a POKé BALL!$"
+
+PetalburgCity_Gym_Text_205AF4: @ 8205AF4
+	.string "WALLY: Oh, wow!\n"
+	.string "Thank you!$"
+
+PetalburgCity_Gym_Text_205B0F: @ 8205B0F
+	.string "{PLAYER}… Would you really come\n"
+	.string "with me?$"
+
+PetalburgCity_Gym_Text_205B32: @ 8205B32
+	.string "DAD: So, did it work out?$"
+
+PetalburgCity_Gym_Text_205B4C: @ 8205B4C
+	.string "WALLY: Thank you, yes, it did.\n"
+	.string "Here’s your POKéMON back.\p"
+	.string "{PLAYER}, thank you for coming along\n"
+	.string "with me.\p"
+	.string "You two are why I was able to catch\n"
+	.string "my POKéMON.\p"
+	.string "I promise I’ll take really good\n"
+	.string "care of it.\p"
+	.string "Oh! My mom’s waiting for me,\n"
+	.string "so I have to go!\p"
+	.string "Bye, {PLAYER}!$"
+
+PetalburgCity_Gym_Text_205C40: @ 8205C40
+	.string "DAD: Now…\p"
+	.string "{PLAYER}, if you want to become a\n"
+	.string "strong TRAINER, here’s my advice.\p"
+	.string "Head for RUSTBORO CITY beyond this\n"
+	.string "town.\p"
+	.string "There, you should challenge\n"
+	.string "the GYM LEADER, ROXANNE.\p"
+	.string "After her, go on to other POKéMON\n"
+	.string "GYMS and defeat their LEADERS.\p"
+	.string "Collect BADGES from them,\n"
+	.string "understood?\p"
+	.string "Of course, I’m a GYM LEADER, too.\n"
+	.string "We’ll battle one day, {PLAYER}.\p"
+	.string "But that’s only after you become\n"
+	.string "stronger.$"
+
+PetalburgCity_Gym_Text_205DB4: @ 8205DB4
+	.string "DAD: Hm? Aren’t you going to the\n"
+	.string "POKéMON GYM in RUSTBORO CITY?\p"
+	.string "There’s no challenge for me to\n"
+	.string "battle a greenhorn TRAINER.\p"
+	.string "{PLAYER}, I want you to challenge me\n"
+	.string "when you become a lot stronger.\p"
+	.string "I’ll battle you, {PLAYER}, when you\n"
+	.string "can show me four GYM BADGES, okay?$"
+
+PetalburgCity_Gym_Text_205EAE: @ 8205EAE
+	.string "DAD: I see… So, you’ve beaten\n"
+	.string "the GYM LEADER in RUSTBORO CITY.\p"
+	.string "But there are many more TRAINERS\n"
+	.string "who are stronger than you, {PLAYER}.\p"
+	.string "Across the sea in DEWFORD TOWN is a\n"
+	.string "GYM LEADER named BRAWLY.\p"
+	.string "You should go challenge him.$"
+
+PetalburgCity_Gym_Text_205F87: @ 8205F87
+	.string "DAD: Hm… {PLAYER}, you have gotten\n"
+	.string "stronger.\p"
+	.string "I can tell by the number of BADGES\n"
+	.string "that you’ve earned.$"
+
+PetalburgCity_Gym_Text_205FE5: @ 8205FE5
+	.string "DAD: Hm…\n"
+	.string "So, you did get four GYM BADGES.\p"
+	.string "Fine, as I promised, we will have\n"
+	.string "a POKéMON battle.\p"
+	.string "{PLAYER}…\p"
+	.string "I’m so happy that I can have\n"
+	.string "a real battle with my own child.\p"
+	.string "But, a battle is a battle!\p"
+	.string "I will do everything in my power as\n"
+	.string "a GYM LEADER to win.\p"
+	.string "{PLAYER}, you’d better give it your\n"
+	.string "best shot, too!$"
+
+PetalburgCity_Gym_Text_206107: @ 8206107
+	.string "…\p"
+	.string "I… I can’t…\p"
+	.string "I can’t believe it. {PLAYER}…\p"
+	.string "I lost to {PLAYER}?\p"
+	.string "But, rules are rules!\n"
+	.string "Here, take this.$"
+
+PetalburgCity_Gym_Text_206162: @ 8206162
+	.string "{PLAYER} received the BALANCE BADGE\n"
+	.string "from DAD!$"
+
+PetalburgCity_Gym_Text_20618A: @ 820618A
+	.string "DAD: With that BADGE, the DEFENSE\n"
+	.string "of all your POKéMON will increase.\p"
+	.string "POKéMON that know the HM move SURF\n"
+	.string "will be able to travel over water.\p"
+	.string "This is my gift to you. {PLAYER}, I’m\n"
+	.string "sure you can use it correctly.$"
+
+PetalburgCity_Gym_Text_206254: @ 8206254
+	.string "DAD: TM42 contains FACADE.\p"
+	.string "It doubles the power of moves if\n"
+	.string "the POKéMON is poisoned, paralyzed,\l"
+	.string "or burned.\p"
+	.string "It might be able to turn a bad\n"
+	.string "situation into an advantage.$"
+
+PetalburgCity_Gym_Text_2062FB: @ 82062FB
+	.string "DAD: As the GYM LEADER, I can’t\n"
+	.string "express how upset I am…\p"
+	.string "But as a father, it makes me both\n"
+	.string "happy and a little sad. It’s odd…$"
+
+PetalburgCity_Gym_Text_206377: @ 8206377
+	.string "Ah, there you are, {PLAYER}{KUN}!\p"
+	.string "Please come with me.\n"
+	.string "I have something I want you to have.$"
+
+PetalburgCity_Gym_Text_2063CA: @ 82063CA
+	.string "NORMAN, you don’t mind, do you?\p"
+	.string "Let me borrow your {PLAYER}{KUN} for\n"
+	.string "a minute or two.$"
+
+PetalburgCity_Gym_Text_206417: @ 8206417
+	.string "DAD: {PLAYER}, you should go visit\n"
+	.string "your mother every so often.\p"
+	.string "I’m going to stay here and redouble\n"
+	.string "my training.\p"
+	.string "It would bother me as a TRAINER to\n"
+	.string "not avenge my loss to you, {PLAYER}!$"
+
+PetalburgCity_Gym_Text_2064C3: @ 82064C3
+	.string "DAD: {PLAYER}, how are things going?\p"
+	.string "The world of POKéMON is deep.\p"
+	.string "I honestly think that no amount of\n"
+	.string "training would ever be enough.$"
+
+PetalburgCity_Gym_Text_206542: @ 8206542
+	.string "Hey, how’s it going, CHAMPION-\n"
+	.string "bound {PLAYER}?\p"
+	.string "The doors in this GYM open when you\n"
+	.string "beat the awaiting TRAINERS.\p"
+	.string "Whoops! The doors in this room are\n"
+	.string "already open, so don’t attack me!\p"
+	.string "The TRAINERS of PETALBURG GYM\n"
+	.string "use all kinds of items.\p"
+	.string "The door at the left leads to\n"
+	.string "the SPEED ROOM.\p"
+	.string "The door at the right leads to\n"
+	.string "the ACCURACY ROOM.\p"
+	.string "The room’s name will be on\n"
+	.string "the door, so choose carefully.\p"
+	.string "Once you’ve chosen the door…\n"
+	.string "Well, hey, go for it!$"
+
+PetalburgCity_Gym_Text_2066F3: @ 82066F3
+	.string "{PLAYER}! Whoa! You’ve overcome even\n"
+	.string "your own father!\p"
+	.string "Like, whoa!\n"
+	.string "What a stunning turn of events!$"
+
+PetalburgCity_Gym_Text_20674F: @ 820674F
+	.string "The ability to attack before the\n"
+	.string "opponent…\p"
+	.string "Just that alone puts me at a great\n"
+	.string "advantage, don’t you agree?$"
+
+PetalburgCity_Gym_Text_2067B9: @ 82067B9
+	.string "That was a magnificent battle!$"
+
+PetalburgCity_Gym_Text_2067D8: @ 82067D8
+	.string "Go on to the next room where a new\n"
+	.string "challenge awaits you.\p"
+	.string "At the left is the CONFUSION ROOM.\p"
+	.string "The right door leads to the DEFENSE\n"
+	.string "ROOM.$"
+
+PetalburgCity_Gym_Text_20685E: @ 820685E
+	.string "Whomever you beat, and whomever you\n"
+	.string "may lose to, you never shirk from\l"
+	.string "training yourself and your POKéMON.\p"
+	.string "That’s what I think being a\n"
+	.string "GYM LEADER is all about.$"
+
+PetalburgCity_Gym_Text_2068FD: @ 82068FD
+	.string "This is the CONFUSION ROOM.\p"
+	.string "Let me see how well bonded you are\n"
+	.string "with your POKéMON!$"
+
+PetalburgCity_Gym_Text_20694F: @ 820694F
+	.string "I couldn’t confuse your team enough…\n"
+	.string "You share a strong bond together.$"
+
+PetalburgCity_Gym_Text_206996: @ 8206996
+	.string "The next room is the STRENGTH ROOM.\n"
+	.string "Can you withstand brute force?$"
+
+PetalburgCity_Gym_Text_2069D9: @ 82069D9
+	.string "After you beat our LEADER, the\n"
+	.string "training has become a lot tougher.$"
+
+PetalburgCity_Gym_Text_206A1B: @ 8206A1B
+	.string "Just when you think you’re going to\n"
+	.string "win, your opponent restores HP…\p"
+	.string "Can you just imagine how awful that\n"
+	.string "must feel?\p"
+	.string "I’ll show you exactly how awful it\n"
+	.string "feels!$"
+
+PetalburgCity_Gym_Text_206AB8: @ 8206AB8
+	.string "I couldn’t restore HP enough…\n"
+	.string "What ATTACK power…$"
+
+PetalburgCity_Gym_Text_206AE9: @ 8206AE9
+	.string "I should have expected no less from\n"
+	.string "our LEADER’s kid.\p"
+	.string "No, wait! A TRAINER’s abilities are\n"
+	.string "earned only through effort.\p"
+	.string "I lost because my own efforts\n"
+	.string "weren’t enough.\p"
+	.string "Go on! The ONE-HIT KO ROOM is next.$"
+
+PetalburgCity_Gym_Text_206BB1: @ 8206BB1
+	.string "I’m going to keep training at GYMS.\n"
+	.string "One day, I’ll become a LEADER.$"
+
+PetalburgCity_Gym_Text_206BF4: @ 8206BF4
+	.string "I’m not going to take it easy just\n"
+	.string "because you’re our LEADER’s kid.\p"
+	.string "I’ll show you how horrid it is for\n"
+	.string "a POKéMON to take a critical hit!$"
+
+PetalburgCity_Gym_Text_206C7D: @ 8206C7D
+	.string "Your power…\n"
+	.string "You’re the real deal.$"
+
+PetalburgCity_Gym_Text_206C9F: @ 8206C9F
+	.string "Your father really is strong.\n"
+	.string "He’s a TRAINER worth my respect.\p"
+	.string "And, I sense the same glow coming\n"
+	.string "from you as your father.\p"
+	.string "I hope that you’ll stage a terrific\n"
+	.string "battle with your father!$"
+
+PetalburgCity_Gym_Text_206D56: @ 8206D56
+	.string "Since your dad became the LEADER,\n"
+	.string "the TRAINERS of PETALBURG CITY have\l"
+	.string "become a lot tougher.$"
+
+PetalburgCity_Gym_Text_206DB2: @ 8206DB2
+	.string "Giggle…\n"
+	.string "This is the ACCURACY ROOM.\p"
+	.string "It’s pretty nasty when every attack\n"
+	.string "lands without fail.$"
+
+PetalburgCity_Gym_Text_206E0D: @ 8206E0D
+	.string "You were a cut above me…$"
+
+PetalburgCity_Gym_Text_206E26: @ 8206E26
+	.string "There are some even stronger\n"
+	.string "TRAINERS waiting for you.\p"
+	.string "The left is the DEFENSE ROOM, and\n"
+	.string "the right is the RECOVERY ROOM.\p"
+	.string "Your POKéMON’s ATTACK power will be\n"
+	.string "on trial either way.$"
+
+PetalburgCity_Gym_Text_206ED8: @ 8206ED8
+	.string "Do you know what we’re trying to\n"
+	.string "achieve as TRAINERS?\p"
+	.string "We’re striving to become soul mates\n"
+	.string "with our POKéMON.$"
+
+PetalburgCity_Gym_Text_206F44: @ 8206F44
+	.string "The higher the DEFENSE, the more\n"
+	.string "reckless I can be in attack.$"
+
+PetalburgCity_Gym_Text_206F82: @ 8206F82
+	.string "Our defenses weren’t enough…$"
+
+PetalburgCity_Gym_Text_206F9F: @ 8206F9F
+	.string "I think you’ve taught me a valuable\n"
+	.string "lesson here.\p"
+	.string "Now, go on! The left door goes to\n"
+	.string "the STRENGTH ROOM.\p"
+	.string "The right door opens to\n"
+	.string "the ONE-HIT KO ROOM.\p"
+	.string "Both of them have TRAINERS who are\n"
+	.string "skilled at offense.$"
+
+PetalburgCity_Gym_Text_207069: @ 8207069
+	.string "Hi! Have you tried using SURF?$"
+
+PetalburgCity_Gym_Text_207088: @ 8207088
+	.string "Our GYM LEADER told us to go all out\n"
+	.string "and beat you.\p"
+	.string "Even if you happen to be the\n"
+	.string "LEADER’s kid!$"
+
+PetalburgCity_Gym_Text_2070E6: @ 82070E6
+	.string "But… I went all out!$"
+
+PetalburgCity_Gym_Text_2070FB: @ 82070FB
+	.string "The way you use your POKéMON…\n"
+	.string "It’s like your father’s style.\p"
+	.string "Go on through! The GYM LEADER, your\n"
+	.string "father, is waiting!$"
+
+PetalburgCity_Gym_Text_207170: @ 8207170
+	.string "Sure, it’s fine to make your POKéMON\n"
+	.string "stronger.\p"
+	.string "But what decides the winner?\p"
+	.string "Why, it’s the feelings TRAINERS have\n"
+	.string "for their POKéMON.$"
+
+PetalburgCity_Gym_Text_2071F4: @ 82071F4
+	.string "This door appears to be locked\n"
+	.string "right now…$"
+
+PetalburgCity_Gym_Text_20721E: @ 820721E
+	.string "“SPEED ROOM,” the sign says.\p"
+	.string "Do you want to go through?$"
+
+PetalburgCity_Gym_Text_207256: @ 8207256
+	.string "This door appears to be locked\n"
+	.string "right now…$"
+
+PetalburgCity_Gym_Text_207280: @ 8207280
+	.string "“ACCURACY ROOM,” the sign says.\p"
+	.string "Do you want to go through?$"
+
+PetalburgCity_Gym_Text_2072BB: @ 82072BB
+	.string "“CONFUSION ROOM,” the sign says.\p"
+	.string "Do you want to go through?$"
+
+PetalburgCity_Gym_Text_2072F7: @ 82072F7
+	.string "“DEFENSE ROOM,” the sign says.\p"
+	.string "Do you want to go through?$"
+
+PetalburgCity_Gym_Text_207331: @ 8207331
+	.string "“RECOVERY ROOM,” the sign says.\p"
+	.string "Do you want to go through?$"
+
+PetalburgCity_Gym_Text_20736C: @ 820736C
+	.string "“STRENGTH ROOM,” the sign says.\p"
+	.string "Do you want to go through?$"
+
+PetalburgCity_Gym_Text_2073A7: @ 82073A7
+	.string "“ONE-HIT KO ROOM,” the sign says.\p"
+	.string "Do you want to go through?$"
+
+PetalburgCity_Gym_Text_2073E4: @ 82073E4
+	.string "“GYM LEADER’S ROOM\p"
+	.string "“See for yourself what POKéMON await\n"
+	.string "you!” the sign says.\p"
+	.string "Do you want to go through?$"
+
+PetalburgCity_Gym_Text_20744C: @ 820744C
+	.string "PETALBURG CITY POKéMON GYM$"
+
+PetalburgCity_Gym_Text_207467: @ 8207467
+	.string "PETALBURG CITY POKéMON GYM\p"
+	.string "NORMAN’S CERTIFIED TRAINERS:\n"
+	.string "{PLAYER}$"
+
+PetalburgCity_Gym_Text_2074A2: @ 82074A2
+	.string "DAD: {PLAYER}…\n"
+	.string "I had a feeling that you would come.\p"
+	.string "I would never refuse to accept\n"
+	.string "a challenge from you.\p"
+	.string "You do understand, don’t you?\p"
+	.string "Inside a GYM, it doesn’t matter that\n"
+	.string "we are a parent and child.\p"
+	.string "…No, because we are parent and child,\n"
+	.string "we owe it to each other to do the best\l"
+	.string "we can. Isn’t that right, {PLAYER}?$"
+
+PetalburgCity_Gym_Text_2075CE: @ 82075CE
+	.string "Uh… Haha…\n"
+	.string "Maybe that was going too hard…$"
+
+PetalburgCity_Gym_Text_2075F7: @ 82075F7
+	.string "DAD: {PLAYER}…\n"
+	.string "What is your dream?\p"
+	.string "My dream…\n"
+	.string "Hahaha…\l"
+	.string "It has already come true, actually.$"
+
+PetalburgCity_Gym_Text_20764A: @ 820764A
+	.string "DAD: {PLAYER}…\n"
+	.string "I had a feeling that you would come.\p"
+	.string "I would never refuse to accept\n"
+	.string "a challenge from you.\p"
+	.string "You do understand, don’t you?\p"
+	.string "Inside a GYM, it doesn’t matter that\n"
+	.string "we are a parent and child.\p"
+	.string "Hm? Wait a second, {PLAYER}.\p"
+	.string "Do you only have one POKéMON that is\n"
+	.string "capable of battle?\p"
+	.string "Sorry, but you’ll have to come back\n"
+	.string "with at least two POKéMON.$"
+
diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc
new file mode 100644
index 000000000..dcd3b071f
--- /dev/null
+++ b/data/maps/PetalburgCity_House1/events.inc
@@ -0,0 +1,11 @@
+PetalburgCity_House1_EventObjects: @ 852F0BC
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, 2, 2, 2, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0
+
+PetalburgCity_House1_MapWarps: @ 852F0EC
+	warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY
+	warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY
+
+PetalburgCity_House1_MapEvents:: @ 852F0FC
+	map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc
index 2175ff856..6aeb5deef 100644
--- a/data/maps/PetalburgCity_House1/header.inc
+++ b/data/maps/PetalburgCity_House1/header.inc
@@ -1,5 +1,5 @@
 PetalburgCity_House1: @ 8483050
-	.4byte PetalburgCity_House1_MapAttributes
+	.4byte House1_Layout
 	.4byte PetalburgCity_House1_MapEvents
 	.4byte PetalburgCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/scripts.inc
index f727ec8a1..f727ec8a1 100644
--- a/data/scripts/maps/PetalburgCity_House1.inc
+++ b/data/maps/PetalburgCity_House1/scripts.inc
diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc
new file mode 100644
index 000000000..7d1a863cb
--- /dev/null
+++ b/data/maps/PetalburgCity_House2/events.inc
@@ -0,0 +1,11 @@
+PetalburgCity_House2_EventObjects: @ 852F110
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, 2, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0
+
+PetalburgCity_House2_MapWarps: @ 852F140
+	warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY
+	warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY
+
+PetalburgCity_House2_MapEvents:: @ 852F150
+	map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc
index 9213bc710..9595c1372 100644
--- a/data/maps/PetalburgCity_House2/header.inc
+++ b/data/maps/PetalburgCity_House2/header.inc
@@ -1,5 +1,5 @@
 PetalburgCity_House2: @ 848306C
-	.4byte PetalburgCity_House2_MapAttributes
+	.4byte HouseWithBed_Layout
 	.4byte PetalburgCity_House2_MapEvents
 	.4byte PetalburgCity_House2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/scripts.inc
index 44987b3d6..44987b3d6 100644
--- a/data/scripts/maps/PetalburgCity_House2.inc
+++ b/data/maps/PetalburgCity_House2/scripts.inc
diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc
new file mode 100644
index 000000000..3dc327c6a
--- /dev/null
+++ b/data/maps/PetalburgCity_Mart/events.inc
@@ -0,0 +1,13 @@
+PetalburgCity_Mart_EventObjects: @ 852F294
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0
+
+PetalburgCity_Mart_MapWarps: @ 852F2F4
+	warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY
+	warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY
+
+PetalburgCity_Mart_MapEvents:: @ 852F304
+	map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc
index d2dc3edf3..7742f8bfe 100644
--- a/data/maps/PetalburgCity_Mart/header.inc
+++ b/data/maps/PetalburgCity_Mart/header.inc
@@ -1,5 +1,5 @@
 PetalburgCity_Mart: @ 84830C0
-	.4byte PetalburgCity_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte PetalburgCity_Mart_MapEvents
 	.4byte PetalburgCity_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/scripts.inc
index 665ad3bae..665ad3bae 100644
--- a/data/scripts/maps/PetalburgCity_Mart.inc
+++ b/data/maps/PetalburgCity_Mart/scripts.inc
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..e7a4ec6e6
--- /dev/null
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,15 @@
+PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, 2, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, 1, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0
+
+PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC
+	warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY
+	warp_def 6, 8, 3, 3, MAP_PETALBURG_CITY
+	warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F
+
+PetalburgCity_PokemonCenter_1F_MapEvents:: @ 852F1F4
+	map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
index 581432e20..af57b7bab 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 PetalburgCity_PokemonCenter_1F: @ 8483088
-	.4byte PetalburgCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte PetalburgCity_PokemonCenter_1F_MapEvents
 	.4byte PetalburgCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
index f4a31854e..f4a31854e 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..7d2ff52f4
--- /dev/null
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702
+
+PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268
+	warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+PetalburgCity_PokemonCenter_2F_MapEvents:: @ 852F280
+	map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
index c16cfdee2..1528ab624 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 PetalburgCity_PokemonCenter_2F: @ 84830A4
-	.4byte PetalburgCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte PetalburgCity_PokemonCenter_2F_MapEvents
 	.4byte PetalburgCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
index 38d01972a..38d01972a 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc
new file mode 100644
index 000000000..563d61579
--- /dev/null
+++ b/data/maps/PetalburgCity_WallysHouse/events.inc
@@ -0,0 +1,11 @@
+PetalburgCity_WallysHouse_EventObjects: @ 852ED74
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0
+
+PetalburgCity_WallysHouse_MapWarps: @ 852EDA4
+	warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY
+	warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY
+
+PetalburgCity_WallysHouse_MapEvents:: @ 852EDB4
+	map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc
index fc953bf81..4e207706d 100644
--- a/data/maps/PetalburgCity_WallysHouse/header.inc
+++ b/data/maps/PetalburgCity_WallysHouse/header.inc
@@ -1,5 +1,5 @@
 PetalburgCity_WallysHouse: @ 8483018
-	.4byte PetalburgCity_WallysHouse_MapAttributes
+	.4byte House2_Layout
 	.4byte PetalburgCity_WallysHouse_MapEvents
 	.4byte PetalburgCity_WallysHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc
index e64bd57b1..e64bd57b1 100644
--- a/data/scripts/maps/PetalburgCity_WallysHouse.inc
+++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc
diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc
new file mode 100644
index 000000000..da904f8ef
--- /dev/null
+++ b/data/maps/PetalburgWoods/events.inc
@@ -0,0 +1,38 @@
+PetalburgWoods_EventObjects: @ 85345E4
+	object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17
+	object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, 725
+	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, 724
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058
+	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, 3, 1, 2, 0, 0, PetalburgWoods_EventScript_22E210, 0
+	object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0
+	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0
+	object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, 2, 2, 1, 0, 0, PetalburgWoods_EventScript_22E219, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, 1117
+	object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_22E222, 0
+
+PetalburgWoods_MapWarps: @ 853471C
+	warp_def 14, 5, 0, 2, MAP_ROUTE104
+	warp_def 15, 5, 0, 3, MAP_ROUTE104
+	warp_def 16, 38, 0, 4, MAP_ROUTE104
+	warp_def 17, 38, 0, 5, MAP_ROUTE104
+	warp_def 36, 38, 0, 6, MAP_ROUTE104
+	warp_def 37, 38, 0, 7, MAP_ROUTE104
+
+PetalburgWoods_MapCoordEvents: @ 853474C
+	coord_event 26, 23, 3, 0, VAR_0x4098, 0, 0, PetalburgWoods_EventScript_22DFD7
+	coord_event 27, 23, 3, 0, VAR_0x4098, 0, 0, PetalburgWoods_EventScript_22E079
+
+PetalburgWoods_MapBGEvents: @ 853476C
+	bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_22E25B
+	bg_event 39, 35, 3, 7, 0, ITEM_POTION, 58, 0
+	bg_event 26, 6, 3, 7, 0, ITEM_TINY_MUSHROOM, 59, 0
+	bg_event 40, 29, 3, 7, 0, ITEM_TINY_MUSHROOM, 60, 0
+	bg_event 4, 19, 3, 7, 0, ITEM_POKE_BALL, 61, 0
+	bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_22E264
+
+PetalburgWoods_MapEvents:: @ 85347B4
+	map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents
+
diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc
index 1b1731f58..096f4a704 100644
--- a/data/maps/PetalburgWoods/header.inc
+++ b/data/maps/PetalburgWoods/header.inc
@@ -1,5 +1,5 @@
 PetalburgWoods: @ 8483FF4
-	.4byte PetalburgWoods_MapAttributes
+	.4byte PetalburgWoods_Layout
 	.4byte PetalburgWoods_MapEvents
 	.4byte PetalburgWoods_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/maps/PetalburgWoods/scripts.inc
index 7c9a1ae49..7c9a1ae49 100644
--- a/data/scripts/maps/PetalburgWoods.inc
+++ b/data/maps/PetalburgWoods/scripts.inc
diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc
new file mode 100644
index 000000000..7970c14ba
--- /dev/null
+++ b/data/maps/RecordCorner/events.inc
@@ -0,0 +1,18 @@
+RecordCorner_EventObjects: @ 8539DFC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0
+
+RecordCorner_MapWarps: @ 8539E14
+	warp_def 8, 9, 3, 127, MAP_NONE
+	warp_def 9, 9, 3, 127, MAP_NONE
+	warp_def 11, 9, 3, 127, MAP_NONE
+	warp_def 10, 9, 3, 127, MAP_NONE
+
+RecordCorner_MapCoordEvents: @ 8539E34
+	coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827741D
+	coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277447
+	coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277432
+	coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827745C
+
+RecordCorner_MapEvents:: @ 8539E74
+	map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0
+
diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc
index 67ebd9405..7235504fa 100644
--- a/data/maps/RecordCorner/header.inc
+++ b/data/maps/RecordCorner/header.inc
@@ -1,5 +1,5 @@
 RecordCorner: @ 8484D68
-	.4byte RecordCorner_MapAttributes
+	.4byte RecordCorner_Layout
 	.4byte RecordCorner_MapEvents
 	.4byte RecordCorner_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RecordCorner.inc b/data/maps/RecordCorner/scripts.inc
index 4f342b860..4f342b860 100644
--- a/data/scripts/maps/RecordCorner.inc
+++ b/data/maps/RecordCorner/scripts.inc
diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc
index aee630352..f5f35e974 100644
--- a/data/maps/Route101/connections.inc
+++ b/data/maps/Route101/connections.inc
@@ -1,6 +1,6 @@
 Route101_MapConnectionsList: @ 848680C
-	connection up, 0, OLDALE_TOWN, 0
-	connection down, 0, LITTLEROOT_TOWN, 0
+	connection up, 0, MAP_OLDALE_TOWN
+	connection down, 0, MAP_LITTLEROOT_TOWN
 
 Route101_MapConnections: @ 8486824
 	.4byte 0x2
diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc
new file mode 100644
index 000000000..82b674f9e
--- /dev/null
+++ b/data/maps/Route101/events.inc
@@ -0,0 +1,25 @@
+Route101_EventObjects: @ 8527E98
+	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0
+	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720
+	object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700
+	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750
+	object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, 5, 1, 1, 0, 0, Route101_EventScript_1EBE04, 991
+
+Route101_MapCoordEvents: @ 8527F28
+	coord_event 10, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE
+	coord_event 11, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE
+	coord_event 10, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD4E
+	coord_event 11, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD4E
+	coord_event 6, 16, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
+	coord_event 6, 15, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
+	coord_event 6, 17, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
+	coord_event 6, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
+	coord_event 7, 13, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD7A
+
+Route101_MapBGEvents: @ 8527FB8
+	bg_event 5, 9, 0, 0, 0, Route101_EventScript_1EBE0D
+
+Route101_MapEvents:: @ 8527FC4
+	map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents
+
diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc
index 9550dc26b..ef027d1c6 100644
--- a/data/maps/Route101/header.inc
+++ b/data/maps/Route101/header.inc
@@ -1,5 +1,5 @@
 Route101: @ 8482678
-	.4byte Route101_MapAttributes
+	.4byte Route101_Layout
 	.4byte Route101_MapEvents
 	.4byte Route101_MapScripts
 	.4byte Route101_MapConnections
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
new file mode 100644
index 000000000..9593ae59e
--- /dev/null
+++ b/data/maps/Route101/scripts.inc
@@ -0,0 +1,301 @@
+Route101_MapScripts:: @ 81EBCBA
+	map_script 3, Route101_MapScript1_1EBCC5
+	map_script 2, Route101_MapScript2_1EBCCB
+	.byte 0
+
+Route101_MapScript1_1EBCC5: @ 81EBCC5
+	call Route101_EventScript_2720AD
+	end
+
+Route101_MapScript2_1EBCCB: @ 81EBCCB
+	map_script_2 VAR_0x4060, 0, Route101_EventScript_1EBCD5
+	.2byte 0
+
+Route101_EventScript_1EBCD5:: @ 81EBCD5
+	setflag FLAG_SPECIAL_FLAG_0x4000
+	setvar VAR_0x4060, 1
+	end
+
+Route101_EventScript_1EBCDE:: @ 81EBCDE
+	lockall
+	playbgm MUS_EVENT0, 1
+	msgbox Route101_Text_1EBE8F, 4
+	closemessage
+	setobjectxy 2, 0, 15
+	setobjectxy 4, 0, 16
+	applymovement 255, Route101_Movement_1EBDC2
+	applymovement 2, Route101_Movement_1EBDE7
+	applymovement 4, Route101_Movement_1EBDB5
+	waitmovement 0
+	applymovement 4, Route101_Movement_1EBD96
+	applymovement 2, Route101_Movement_1EBDC8
+	waitmovement 0
+	applymovement 2, Route101_Movement_2725A8
+	waitmovement 0
+	applymovement 4, Route101_Movement_1EBDBD
+	applymovement 2, Route101_Movement_1EBDEF
+	waitmovement 0
+	msgbox Route101_Text_1EBE9A, 4
+	closemessage
+	setvar VAR_0x4060, 2
+	releaseall
+	end
+
+Route101_EventScript_1EBD4E:: @ 81EBD4E
+	lockall
+	msgbox Route101_Text_1EBEDF, 4
+	closemessage
+	applymovement 255, Route101_Movement_1EBD90
+	waitmovement 0
+	releaseall
+	end
+
+Route101_EventScript_1EBD64:: @ 81EBD64
+	lockall
+	msgbox Route101_Text_1EBEDF, 4
+	closemessage
+	applymovement 255, Route101_Movement_1EBD92
+	waitmovement 0
+	releaseall
+	end
+
+Route101_EventScript_1EBD7A:: @ 81EBD7A
+	lockall
+	msgbox Route101_Text_1EBEDF, 4
+	closemessage
+	applymovement 255, Route101_Movement_1EBD94
+	waitmovement 0
+	releaseall
+	end
+
+Route101_Movement_1EBD90: @ 81EBD90
+	walk_up
+	step_end
+
+Route101_Movement_1EBD92: @ 81EBD92
+	walk_right
+	step_end
+
+Route101_Movement_1EBD94: @ 81EBD94
+	walk_down
+	step_end
+
+Route101_Movement_1EBD96: @ 81EBD96
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	step_end
+
+Route101_Movement_1EBDB5: @ 81EBDB5
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	step_end
+
+Route101_Movement_1EBDBC: @ 81EBDBC
+	step_end
+
+Route101_Movement_1EBDBD: @ 81EBDBD
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	step_end
+
+Route101_Movement_1EBDC2: @ 81EBDC2
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_in_place_fastest_left
+	step_end
+
+Route101_Movement_1EBDC8: @ 81EBDC8
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	step_end
+
+Route101_Movement_1EBDE7: @ 81EBDE7
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	step_end
+
+Route101_Movement_1EBDEE: @ 81EBDEE
+	step_end
+
+Route101_Movement_1EBDEF: @ 81EBDEF
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	step_end
+
+Route101_Movement_1EBDF4: @ 81EBDF4
+	walk_up
+	walk_up
+	step_end
+
+Route101_Movement_1EBDF7: @ 81EBDF7
+	walk_up
+	walk_left
+	walk_up
+	step_end
+
+Route101_EventScript_1EBDFB:: @ 81EBDFB
+	msgbox Route101_Text_1EBFDD, 2
+	end
+
+Route101_EventScript_1EBE04:: @ 81EBE04
+	msgbox Route101_Text_1EC04A, 2
+	end
+
+Route101_EventScript_1EBE0D:: @ 81EBE0D
+	msgbox Route101_Text_1EC0C8, 3
+	end
+
+Route101_EventScript_1EBE16:: @ 81EBE16
+	lock
+	faceplayer
+	setflag FLAG_SYS_POKEMON_GET
+	setflag FLAG_0x052
+	fadescreen 1
+	removeobject 4
+	setobjectxy 255, 6, 13
+	applymovement 255, Route101_Movement_2725A4
+	waitmovement 0
+	special ChooseStarter
+	waitstate
+	applymovement 2, Route101_Movement_1EBE8D
+	waitmovement 0
+	msgbox Route101_Text_1EBF12, 4
+	special HealPlayerParty
+	setflag FLAG_0x2D0
+	clearflag FLAG_0x2D1
+	setflag FLAG_0x2BC
+	setvar VAR_0x4084, 2
+	setvar VAR_0x4060, 3
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, Route101_EventScript_1EBE85
+	compare VAR_RESULT, 1
+	call_if 1, Route101_EventScript_1EBE89
+	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
+	waitstate
+	release
+	end
+
+Route101_EventScript_1EBE85:: @ 81EBE85
+	setflag FLAG_0x2D2
+	return
+
+Route101_EventScript_1EBE89:: @ 81EBE89
+	setflag FLAG_0x2F8
+	return
+
+Route101_Movement_1EBE8D: @ 81EBE8D
+	walk_right
+	step_end
+
+Route101_Text_1EBE8F: @ 81EBE8F
+	.string "H-help me!$"
+
+Route101_Text_1EBE9A: @ 81EBE9A
+	.string "Hello! You over there!\n"
+	.string "Please! Help!\p"
+	.string "In my BAG!\n"
+	.string "There’s a POKé BALL!$"
+
+Route101_Text_1EBEDF: @ 81EBEDF
+	.string "Wh-Where are you going?!\n"
+	.string "Don’t leave me like this!$"
+
+Route101_Text_1EBF12: @ 81EBF12
+	.string "PROF. BIRCH: Whew…\p"
+	.string "I was in the tall grass studying wild\n"
+	.string "POKéMON when I was jumped.\p"
+	.string "You saved me.\n"
+	.string "Thanks a lot!\p"
+	.string "Oh?\p"
+	.string "Hi, you’re {PLAYER}{KUN}!\p"
+	.string "This is not the place to chat, so come\n"
+	.string "by my POKéMON LAB later, okay?$"
+
+Route101_Text_1EBFDD: @ 81EBFDD
+	.string "If POKéMON get tired, take them to\n"
+	.string "a POKéMON CENTER.\p"
+	.string "There’s a POKéMON CENTER in OLDALE\n"
+	.string "TOWN right close by.$"
+
+Route101_Text_1EC04A: @ 81EC04A
+	.string "Wild POKéMON will jump out at you in\n"
+	.string "tall grass.\p"
+	.string "If you want to catch POKéMON, you have\n"
+	.string "to go into the tall grass and search.$"
+
+Route101_Text_1EC0C8: @ 81EC0C8
+	.string "ROUTE 101\n"
+	.string "{0x79} OLDALE TOWN$"
+
diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc
index 7fa2d516f..419cfeec9 100644
--- a/data/maps/Route102/connections.inc
+++ b/data/maps/Route102/connections.inc
@@ -1,6 +1,6 @@
 Route102_MapConnectionsList: @ 848682C
-	connection left, -10, PETALBURG_CITY, 0
-	connection right, 0, OLDALE_TOWN, 0
+	connection left, -10, MAP_PETALBURG_CITY
+	connection right, 0, MAP_OLDALE_TOWN
 
 Route102_MapConnections: @ 8486844
 	.4byte 0x2
diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc
new file mode 100644
index 000000000..fc30a195c
--- /dev/null
+++ b/data/maps/Route102/events.inc
@@ -0,0 +1,18 @@
+Route102_EventObjects: @ 8527FD8
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0
+	object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, 2, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, 8, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0
+
+Route102_MapBGEvents: @ 85280B0
+	bg_event 17, 2, 0, 0, 0, Route102_EventScript_1EC0F3
+	bg_event 40, 9, 0, 0, 0, Route102_EventScript_1EC0EA
+
+Route102_MapEvents:: @ 85280C8
+	map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents
+
diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc
index 2c06344b0..22da93b7a 100644
--- a/data/maps/Route102/header.inc
+++ b/data/maps/Route102/header.inc
@@ -1,5 +1,5 @@
 Route102: @ 8482694
-	.4byte Route102_MapAttributes
+	.4byte Route102_Layout
 	.4byte Route102_MapEvents
 	.4byte Route102_MapScripts
 	.4byte Route102_MapConnections
diff --git a/data/scripts/maps/Route102.inc b/data/maps/Route102/scripts.inc
index cd817df35..cd817df35 100644
--- a/data/scripts/maps/Route102.inc
+++ b/data/maps/Route102/scripts.inc
diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc
index 10d98cec7..0759d872f 100644
--- a/data/maps/Route103/connections.inc
+++ b/data/maps/Route103/connections.inc
@@ -1,6 +1,6 @@
 Route103_MapConnectionsList: @ 848684C
-	connection down, 0, OLDALE_TOWN, 0
-	connection right, -60, ROUTE_110, 0
+	connection down, 0, MAP_OLDALE_TOWN
+	connection right, -60, MAP_ROUTE110
 
 Route103_MapConnections: @ 8486864
 	.4byte 0x2
diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc
new file mode 100644
index 000000000..e4bf74177
--- /dev/null
+++ b/data/maps/Route103/events.inc
@@ -0,0 +1,31 @@
+Route103_EventObjects: @ 85280DC
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, 26, 0, 1, 1, 3, Route103_EventScript_1EC6D1, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0
+	object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, 2, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0
+	object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, 2, 1, 1, 0, 0, Route103_EventScript_272141, 898
+	object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, 1, 1, 1, 0, 0, Route103_EventScript_290CE5, 1114
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, 1, 1, 1, 0, 0, Route103_EventScript_2906BB, 18
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, 1, 1, 1, 0, 0, Route103_EventScript_2906BB, 19
+	object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, 8, 1, 1, 1, 2, Route103_EventScript_1EC761, 0
+	object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 67, 9, 3, 7, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0
+	object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, 26, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0
+	object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, 25, 1, 3, 1, 5, Route103_EventScript_1EC778, 0
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, 1, 1, 1, 0, 0, Route103_EventScript_290CF2, 1137
+
+Route103_MapWarps: @ 85282BC
+	warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE
+
+Route103_MapBGEvents: @ 85282C4
+	bg_event 11, 9, 0, 0, 0, Route103_EventScript_1EC5EB
+
+Route103_MapEvents:: @ 85282D0
+	map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents
+
diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc
index 6bc4c0070..1a8825bc1 100644
--- a/data/maps/Route103/header.inc
+++ b/data/maps/Route103/header.inc
@@ -1,5 +1,5 @@
 Route103: @ 84826B0
-	.4byte Route103_MapAttributes
+	.4byte Route103_Layout
 	.4byte Route103_MapEvents
 	.4byte Route103_MapScripts
 	.4byte Route103_MapConnections
diff --git a/data/scripts/maps/Route103.inc b/data/maps/Route103/scripts.inc
index 8bf597902..8bf597902 100644
--- a/data/scripts/maps/Route103.inc
+++ b/data/maps/Route103/scripts.inc
diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc
index 0486aba98..ce605c828 100644
--- a/data/maps/Route104/connections.inc
+++ b/data/maps/Route104/connections.inc
@@ -1,7 +1,7 @@
 Route104_MapConnectionsList: @ 848686C
-	connection up, 0, RUSTBORO_CITY, 0
-	connection down, 0, ROUTE_105, 0
-	connection right, 50, PETALBURG_CITY, 0
+	connection up, 0, MAP_RUSTBORO_CITY
+	connection down, 0, MAP_ROUTE105
+	connection right, 50, MAP_PETALBURG_CITY
 
 Route104_MapConnections: @ 8486890
 	.4byte 0x3
diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc
new file mode 100644
index 000000000..315b5614e
--- /dev/null
+++ b/data/maps/Route104/events.inc
@@ -0,0 +1,64 @@
+Route104_EventObjects: @ 85282E4
+	object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, 2, 1, 1, 0, 0, Route104_EventScript_1ED006, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, 3, 0, 1, 0, 0, Route104_EventScript_1ED045, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, 2, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0
+	object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_1ED090, 0
+	object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, 742
+	object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, 738
+	object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, 12, 0, 0, 0, 8, BerryTreeScript, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, 12, 0, 0, 0, 9, BerryTreeScript, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, 12, 0, 0, 0, 10, BerryTreeScript, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, 12, 0, 0, 0, 11, BerryTreeScript, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, 12, 0, 0, 0, 12, BerryTreeScript, 0
+	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, 12, 0, 0, 0, 13, BerryTreeScript, 0
+	object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, 9, 1, 1, 0, 0, Route104_EventScript_1ECF8C, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, 12, 0, 0, 0, 3, BerryTreeScript, 0
+	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, 12, 0, 0, 0, 4, BerryTreeScript, 0
+	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, 12, 0, 0, 0, 75, BerryTreeScript, 0
+	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, 12, 0, 0, 0, 76, BerryTreeScript, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002
+	object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906
+	object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED597, 0
+	object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0
+	object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 21, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0
+	object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 1, 1, 0, 0, Route104_EventScript_290D0C, 1057
+	object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, 46, 5, 6, 1, 2, Route104_EventScript_1ED376, 0
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, 1, 1, 1, 0, 0, Route104_EventScript_290D19, 1115
+	object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, 1, 1, 1, 0, 0, Route104_EventScript_2906BB, 17
+	object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, 1, 1, 1, 0, 0, Route104_EventScript_290D26, 1135
+	object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, 1, 1, 1, 0, 0, Route104_EventScript_1ED057, 0
+	object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, 9, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0
+	object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 17, 50, 0, 1, 1, 1, 0, 0, Route104_EventScript_1ECC9E, 719
+
+Route104_MapWarps: @ 8528614
+	warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE
+	warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP
+	warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS
+	warp_def 11, 30, 3, 1, MAP_PETALBURG_WOODS
+	warp_def 10, 38, 3, 2, MAP_PETALBURG_WOODS
+	warp_def 11, 38, 3, 3, MAP_PETALBURG_WOODS
+	warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS
+	warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS
+
+Route104_MapCoordEvents: @ 8528654
+	coord_event 17, 51, 3, 0, VAR_0x4063, 1, 0, Route104_EventScript_1ECCB3
+
+Route104_MapBGEvents: @ 8528664
+	bg_event 20, 50, 0, 0, 0, Route104_EventScript_1ED018
+	bg_event 27, 66, 0, 0, 0, Route104_EventScript_1ED021
+	bg_event 23, 5, 0, 0, 0, Route104_EventScript_1ED02A
+	bg_event 7, 20, 0, 0, 0, Route104_EventScript_1ED033
+	bg_event 17, 23, 3, 0, 0, Route104_EventScript_1ED03C
+	bg_event 7, 6, 3, 7, 0, ITEM_SUPER_POTION, 44, 0
+	bg_event 3, 9, 3, 7, 0, ITEM_POKE_BALL, 62, 0
+	bg_event 14, 55, 3, 7, 0, ITEM_POTION, 37, 0
+	bg_event 16, 72, 3, 7, 0, ITEM_ANTIDOTE, 85, 0
+	bg_event 16, 64, 3, 7, 0, ITEM_HEART_SCALE, 88, 0
+
+Route104_MapEvents:: @ 85286DC
+	map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents
+
diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc
index 7bcef3b0b..f431118c1 100644
--- a/data/maps/Route104/header.inc
+++ b/data/maps/Route104/header.inc
@@ -1,5 +1,5 @@
 Route104: @ 84826CC
-	.4byte Route104_MapAttributes
+	.4byte Route104_Layout
 	.4byte Route104_MapEvents
 	.4byte Route104_MapScripts
 	.4byte Route104_MapConnections
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
new file mode 100644
index 000000000..83cfe5d92
--- /dev/null
+++ b/data/maps/Route104/scripts.inc
@@ -0,0 +1,1227 @@
+Route104_MapScripts:: @ 81ECC32
+	map_script 2, Route104_MapScript2_1ECC3D
+	map_script 3, Route104_MapScript1_1ECC4E
+	.byte 0
+
+Route104_MapScript2_1ECC3D: @ 81ECC3D
+	map_script_2 VAR_0x408E, 1, Route104_EventScript_1ECC47
+	.2byte 0
+
+Route104_EventScript_1ECC47:: @ 81ECC47
+	lockall
+	goto Route104_EventScript_1ED099
+	end
+
+Route104_MapScript1_1ECC4E: @ 81ECC4E
+	call Route104_EventScript_271ED7
+	call Route104_EventScript_1ECC78
+	call Route104_EventScript_1ECC5E
+	end
+
+Route104_EventScript_1ECC5E:: @ 81ECC5E
+	checkflag FLAG_0x07F
+	goto_if 0, Route104_EventScript_1ECC74
+	checkflag FLAG_BADGE03_GET
+	goto_if 0, Route104_EventScript_1ECC74
+	clearflag FLAG_0x38A
+	return
+
+Route104_EventScript_1ECC74:: @ 81ECC74
+	setflag FLAG_0x38A
+	return
+
+Route104_EventScript_1ECC78:: @ 81ECC78
+	compare VAR_0x408E, 1
+	goto_if 4, Route104_EventScript_1ECC9D
+	checkflag FLAG_0x120
+	goto_eq Route104_EventScript_1ECC9D
+	checkflag FLAG_0x07C
+	goto_if 0, Route104_EventScript_1ECC9D
+	setobjectxyperm 34, 17, 52
+	return
+
+Route104_EventScript_1ECC9D:: @ 81ECC9D
+	return
+
+Route104_EventScript_1ECC9E:: @ 81ECC9E
+	lockall
+	setvar VAR_0x8008, 1
+	applymovement 34, Route104_Movement_27259E
+	waitmovement 0
+	goto Route104_EventScript_1ECD33
+
+Route104_EventScript_1ECCB3:: @ 81ECCB3
+	lockall
+	setflag FLAG_0x32E
+	setvar VAR_0x405A, 8
+	setvar VAR_0x4063, 2
+	applymovement 255, Route104_Movement_2725A6
+	waitmovement 0
+	delay 10
+	addobject 34
+	clearflag FLAG_0x2CF
+	applymovement 255, Route104_Movement_1ECF86
+	waitmovement 0
+	applymovement 34, Route104_Movement_1ECF8A
+	waitmovement 0
+	delay 20
+	setvar VAR_0x8008, 0
+	call Route104_EventScript_1E0DD1
+	playse SE_PIN
+	applymovement 34, Route104_Movement_272598
+	waitmovement 0
+	applymovement 34, Route104_Movement_27259A
+	waitmovement 0
+	goto Route104_EventScript_1ECD33
+
+Route104_EventScript_1ECD11:: @ 81ECD11
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq Route104_EventScript_1ECD29
+	compare VAR_RESULT, 1
+	goto_eq Route104_EventScript_1ECD2E
+	return
+
+Route104_EventScript_1ECD29:: @ 81ECD29
+	playbgm MUS_GIRL_SUP, 1
+	return
+
+Route104_EventScript_1ECD2E:: @ 81ECD2E
+	playbgm MUS_BOY_SUP, 1
+	return
+
+Route104_EventScript_1ECD33:: @ 81ECD33
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq Route104_EventScript_1ECD4B
+	compare VAR_RESULT, 1
+	goto_eq Route104_EventScript_1ECE6F
+	end
+
+Route104_EventScript_1ECD4B:: @ 81ECD4B
+	checkflag FLAG_0x07D
+	goto_eq Route104_EventScript_1ECE1C
+	checkflag FLAG_0x07C
+	goto_eq Route104_EventScript_1ECDD0
+	setflag FLAG_0x07C
+	msgbox Route104_Text_1EDBFF, 4
+	closemessage
+	delay 30
+	playfanfare MUS_ME_TORE_EYE
+	msgbox Route104_Text_1EDC8F, 4
+	waitfanfare
+	closemessage
+	delay 30
+	setflag FLAG_0x0FD
+	applymovement 255, Route104_Movement_1ECDCD
+	applymovement 34, Route104_Movement_1ECDC8
+	msgbox Route104_Text_1EDCB1, 4
+	closemessage
+	waitmovement 0
+	applymovement 34, Route104_Movement_1ECDCA
+	waitmovement 0
+	moveobjectoffscreen 34
+	msgbox Route104_Text_1EDCED, 5
+	compare VAR_RESULT, 1
+	goto_eq Route104_EventScript_1ECDED
+	msgbox Route104_Text_1EDD2A, 4
+	call Route104_EventScript_1ECE31
+	releaseall
+	end
+
+Route104_Movement_1ECDC8: @ 81ECDC8
+	walk_slow_left
+	step_end
+
+Route104_Movement_1ECDCA: @ 81ECDCA
+	walk_down
+	face_right
+	step_end
+
+Route104_Movement_1ECDCD: @ 81ECDCD
+	delay_4
+	walk_in_place_fastest_left
+	step_end
+
+Route104_EventScript_1ECDD0:: @ 81ECDD0
+	msgbox Route104_Text_1EDD9F, 5
+	compare VAR_RESULT, 1
+	goto_eq Route104_EventScript_1ECDED
+	msgbox Route104_Text_1EDD2A, 4
+	releaseall
+	end
+
+Route104_EventScript_1ECDED:: @ 81ECDED
+	msgbox Route104_Text_1EDDDB, 4
+	switch VAR_FIRST_POKE
+	case 0, Route104_EventScript_1ECE36
+	case 1, Route104_EventScript_1ECE49
+	case 2, Route104_EventScript_1ECE5C
+	end
+
+Route104_EventScript_1ECE1C:: @ 81ECE1C
+	msgbox Route104_Text_1EDE3E, 4
+	compare VAR_0x8008, 0
+	call_if 1, Route104_EventScript_1ECE31
+	releaseall
+	end
+
+Route104_EventScript_1ECE31:: @ 81ECE31
+	savebgm MUS_DUMMY
+	fadedefaultbgm
+	return
+
+Route104_EventScript_1ECE36:: @ 81ECE36
+	trainerbattle 3, TRAINER_MAY_14, 0, Route104_Text_1EDE18
+	setflag FLAG_0x07D
+	goto Route104_EventScript_1ECE1C
+	end
+
+Route104_EventScript_1ECE49:: @ 81ECE49
+	trainerbattle 3, TRAINER_MAY_15, 0, Route104_Text_1EDE18
+	setflag FLAG_0x07D
+	goto Route104_EventScript_1ECE1C
+	end
+
+Route104_EventScript_1ECE5C:: @ 81ECE5C
+	trainerbattle 3, TRAINER_MAY_10, 0, Route104_Text_1EDE18
+	setflag FLAG_0x07D
+	goto Route104_EventScript_1ECE1C
+	end
+
+Route104_EventScript_1ECE6F:: @ 81ECE6F
+	checkflag FLAG_0x07D
+	goto_eq Route104_EventScript_1ECF38
+	checkflag FLAG_0x07C
+	goto_eq Route104_EventScript_1ECEEC
+	setflag FLAG_0x07C
+	msgbox Route104_Text_1EDF04, 4
+	closemessage
+	delay 30
+	playfanfare MUS_ME_TORE_EYE
+	msgbox Route104_Text_1EDFA0, 4
+	waitfanfare
+	closemessage
+	delay 30
+	setflag FLAG_0x0FD
+	applymovement 255, Route104_Movement_1ECDCD
+	applymovement 34, Route104_Movement_1ECDC8
+	msgbox Route104_Text_1EDFC6, 4
+	closemessage
+	waitmovement 0
+	applymovement 34, Route104_Movement_1ECDCA
+	waitmovement 0
+	moveobjectoffscreen 34
+	msgbox Route104_Text_1EE009, 5
+	compare VAR_RESULT, 1
+	goto_eq Route104_EventScript_1ECF09
+	msgbox Route104_Text_1EE04D, 4
+	call Route104_EventScript_1ECE31
+	releaseall
+	end
+
+Route104_EventScript_1ECEEC:: @ 81ECEEC
+	msgbox Route104_Text_1EE094, 5
+	compare VAR_RESULT, 1
+	goto_eq Route104_EventScript_1ECF09
+	msgbox Route104_Text_1EE04D, 4
+	releaseall
+	end
+
+Route104_EventScript_1ECF09:: @ 81ECF09
+	msgbox Route104_Text_1EE0C7, 4
+	switch VAR_FIRST_POKE
+	case 0, Route104_EventScript_1ECF4D
+	case 1, Route104_EventScript_1ECF60
+	case 2, Route104_EventScript_1ECF73
+	end
+
+Route104_EventScript_1ECF38:: @ 81ECF38
+	msgbox Route104_Text_1EE120, 4
+	compare VAR_0x8008, 0
+	call_if 1, Route104_EventScript_1ECE31
+	releaseall
+	end
+
+Route104_EventScript_1ECF4D:: @ 81ECF4D
+	trainerbattle 3, TRAINER_BRENDAN_10, 0, Route104_Text_1EE107
+	setflag FLAG_0x07D
+	goto Route104_EventScript_1ECF38
+	end
+
+Route104_EventScript_1ECF60:: @ 81ECF60
+	trainerbattle 3, TRAINER_BRENDAN_12, 0, Route104_Text_1EE107
+	setflag FLAG_0x07D
+	goto Route104_EventScript_1ECF38
+	end
+
+Route104_EventScript_1ECF73:: @ 81ECF73
+	trainerbattle 3, TRAINER_BRENDAN_11, 0, Route104_Text_1EE107
+	setflag FLAG_0x07D
+	goto Route104_EventScript_1ECF38
+	end
+
+Route104_Movement_1ECF86: @ 81ECF86
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
+	step_end
+
+Route104_Movement_1ECF8A: @ 81ECF8A
+	walk_down
+	step_end
+
+Route104_EventScript_1ECF8C:: @ 81ECF8C
+	lock
+	faceplayer
+	checkflag FLAG_0x0F6
+	goto_eq Route104_EventScript_1ECFC3
+	msgbox Route104_Text_2A6D86, 4
+	giveitem_std ITEM_CHESTO_BERRY
+	compare VAR_RESULT, 0
+	goto_eq Route104_EventScript_272054
+	setflag FLAG_0x0F6
+	msgbox Route104_Text_2A6E32, 4
+	release
+	end
+
+Route104_EventScript_1ECFC3:: @ 81ECFC3
+	msgbox Route104_Text_2A6E32, 4
+	release
+	end
+
+Route104_EventScript_1ECFCD:: @ 81ECFCD
+	lock
+	faceplayer
+	checkflag FLAG_0x117
+	goto_eq Route104_EventScript_1ECFFC
+	msgbox Route104_Text_1ED96A, 4
+	giveitem_std ITEM_WHITE_HERB
+	compare VAR_RESULT, 0
+	goto_eq Route104_EventScript_272054
+	setflag FLAG_0x117
+	release
+	end
+
+Route104_EventScript_1ECFFC:: @ 81ECFFC
+	msgbox Route104_Text_1EDA0F, 4
+	release
+	end
+
+Route104_EventScript_1ED006:: @ 81ED006
+	msgbox Route104_Text_1ED5EC, 2
+	end
+
+Route104_EventScript_1ED00F:: @ 81ED00F
+	msgbox Route104_Text_1ED662, 3
+	end
+
+Route104_EventScript_1ED018:: @ 81ED018
+	msgbox Route104_Text_1EDA8C, 3
+	end
+
+Route104_EventScript_1ED021:: @ 81ED021
+	msgbox Route104_Text_1EDAA1, 3
+	end
+
+Route104_EventScript_1ED02A:: @ 81ED02A
+	msgbox Route104_Text_1EDABC, 3
+	end
+
+Route104_EventScript_1ED033:: @ 81ED033
+	msgbox Route104_Text_1EDAD6, 3
+	end
+
+Route104_EventScript_1ED03C:: @ 81ED03C
+	msgbox Route104_Text_1EDAEF, 3
+	end
+
+Route104_EventScript_1ED045:: @ 81ED045
+	msgbox Route104_Text_1ED6A2, 2
+	end
+
+Route104_EventScript_1ED04E:: @ 81ED04E
+	msgbox Route104_Text_1ED735, 2
+	end
+
+Route104_EventScript_1ED057:: @ 81ED057
+	lock
+	faceplayer
+	checkflag FLAG_0x106
+	goto_eq Route104_EventScript_1ED086
+	msgbox Route104_Text_1ED838, 4
+	giveitem_std ITEM_TM09
+	compare VAR_RESULT, 0
+	goto_eq Route104_EventScript_272054
+	setflag FLAG_0x106
+	release
+	end
+
+Route104_EventScript_1ED086:: @ 81ED086
+	msgbox Route104_Text_1ED8E7, 4
+	release
+	end
+
+Route104_EventScript_1ED090:: @ 81ED090
+	msgbox Route104_Text_1ED7A2, 2
+	end
+
+Route104_EventScript_1ED099:: @ 81ED099
+	setobjectpriority 8, MAP_ROUTE104, 0
+	setobjectpriority 255, MAP_ROUTE104, 0
+	applymovement 8, Route104_Movement_1ED359
+	waitmovement 0
+	removeobject 8
+	applymovement 255, Route104_Movement_1ED34F
+	waitmovement 0
+	hideobjectat 255, MAP_ROUTE104
+	call Route104_EventScript_2720A0
+	checkflag FLAG_0x132
+	goto_eq Route104_EventScript_1ED0D9
+	checkflag FLAG_0x132
+	goto_if 0, Route104_EventScript_1ED0EF
+	end
+
+Route104_EventScript_1ED0D9:: @ 81ED0D9
+	applymovement 7, Route104_Movement_1ED28C
+	applymovement 255, Route104_Movement_1ED28C
+	waitmovement 0
+	goto Route104_EventScript_1ED139
+
+Route104_EventScript_1ED0EF:: @ 81ED0EF
+	applymovement 7, Route104_Movement_1ED1C8
+	applymovement 255, Route104_Movement_1ED1C8
+	waitmovement 0
+	pokenavcall Route104_Text_1EE336
+	waitmessage
+	delay 30
+	playfanfare MUS_ME_TORE_EYE
+	msgbox Route104_Text_1EE463, 4
+	waitfanfare
+	closemessage
+	delay 30
+	setflag FLAG_0x132
+	applymovement 255, Route104_Movement_1ED22A
+	applymovement 7, Route104_Movement_1ED22A, MAP_ROUTE104
+	waitmovement 7, MAP_ROUTE104
+	waitmovement 0
+	goto Route104_EventScript_1ED139
+
+Route104_EventScript_1ED139:: @ 81ED139
+	delay 50
+	applymovement 255, Route104_Movement_1ED353
+	waitmovement 0
+	call Route104_EventScript_2720A8
+	showobjectat 255, MAP_DEWFORD_TOWN
+	applymovement 255, Route104_Movement_1ED355
+	waitmovement 0
+	setobjectxyperm 2, 12, 8
+	addobject 2
+	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
+	clearflag FLAG_0x2E4
+	applymovement 2, Route104_Movement_1ED35C
+	waitmovement 0
+	addobject 4
+	clearflag FLAG_0x2E7
+	call Route104_EventScript_2720A8
+	setflag FLAG_0x2E6
+	hideobjectat 7, MAP_ROUTE104
+	copyvar VAR_0x4096, VAR_0x8008
+	resetobjectpriority 255, MAP_ROUTE104
+	resetobjectpriority 2, MAP_DEWFORD_TOWN
+	moveobjectoffscreen 2
+	setvar VAR_0x408E, 0
+	checkflag FLAG_0x0BD
+	goto_if 0, Route104_EventScript_1ED1B4
+	checkflag FLAG_0x0BD
+	goto_eq Route104_EventScript_1ED1BE
+	end
+
+Route104_EventScript_1ED1B4:: @ 81ED1B4
+	msgbox Route104_Text_1E9AAF, 4
+	releaseall
+	end
+
+Route104_EventScript_1ED1BE:: @ 81ED1BE
+	msgbox Route104_Text_1E9C1D, 4
+	releaseall
+	end
+
+Route104_Movement_1ED1C8: @ 81ED1C8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	step_end
+
+Route104_Movement_1ED22A: @ 81ED22A
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_down
+	walk_down
+	step_end
+
+Route104_Movement_1ED28C: @ 81ED28C
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_down
+	walk_down
+	step_end
+
+Route104_Movement_1ED34F: @ 81ED34F
+	walk_left
+	walk_down
+	walk_down
+	step_end
+
+Route104_Movement_1ED353: @ 81ED353
+	walk_down
+	step_end
+
+Route104_Movement_1ED355: @ 81ED355
+	walk_down
+	walk_left
+	walk_in_place_fastest_right
+	step_end
+
+Route104_Movement_1ED359: @ 81ED359
+	walk_down
+	walk_down
+	step_end
+
+Route104_Movement_1ED35C: @ 81ED35C
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+Route104_EventScript_1ED35F:: @ 81ED35F
+	trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_2954BD, Route104_Text_295509
+	msgbox Route104_Text_29554E, 6
+	end
+
+Route104_EventScript_1ED376:: @ 81ED376
+	trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_29558A, Route104_Text_2955B4
+	msgbox Route104_Text_2955E8, 6
+	end
+
+Route104_EventScript_1ED38D:: @ 81ED38D
+	trainerbattle 2, TRAINER_HALEY_1, 0, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route104_EventScript_1ED424
+	setvar VAR_0x8004, 604
+	specialvar VAR_RESULT, sub_813B4E0
+	compare VAR_RESULT, 0
+	goto_eq Route104_EventScript_1ED3F8
+	msgbox Route104_Text_295689, 4
+	release
+	end
+
+Route104_EventScript_1ED3CE:: @ 81ED3CE
+	special sub_80B4808
+	waitmovement 0
+	checkflag FLAG_HAS_MATCH_CALL
+	goto_eq Route104_EventScript_1ED3DF
+	release
+	end
+
+Route104_EventScript_1ED3DF:: @ 81ED3DF
+	msgbox Route104_Text_29576B, 4
+	setvar VAR_0x8004, 604
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 604
+	callstd 8
+	release
+	end
+
+Route104_EventScript_1ED3F8:: @ 81ED3F8
+	checkflag FLAG_HAS_MATCH_CALL
+	goto_eq Route104_EventScript_1ED40B
+	msgbox Route104_Text_295689, 4
+	release
+	end
+
+Route104_EventScript_1ED40B:: @ 81ED40B
+	msgbox Route104_Text_2956FF, 4
+	setvar VAR_0x8004, 604
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 604
+	callstd 8
+	release
+	end
+
+Route104_EventScript_1ED424:: @ 81ED424
+	trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_2957D7, Route104_Text_2957F0
+	msgbox Route104_Text_29580C, 6
+	end
+
+Route104_EventScript_1ED43B:: @ 81ED43B
+	trainerbattle 2, TRAINER_WINSTON_1, 0, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route104_EventScript_1ED4D2
+	setvar VAR_0x8004, 136
+	specialvar VAR_RESULT, sub_813B4E0
+	compare VAR_RESULT, 0
+	goto_eq Route104_EventScript_1ED4A6
+	msgbox Route104_Text_2958C1, 4
+	release
+	end
+
+Route104_EventScript_1ED47C:: @ 81ED47C
+	special sub_80B4808
+	waitmovement 0
+	checkflag FLAG_HAS_MATCH_CALL
+	goto_eq Route104_EventScript_1ED48D
+	release
+	end
+
+Route104_EventScript_1ED48D:: @ 81ED48D
+	msgbox Route104_Text_29595A, 4
+	setvar VAR_0x8004, 136
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 136
+	callstd 8
+	release
+	end
+
+Route104_EventScript_1ED4A6:: @ 81ED4A6
+	checkflag FLAG_HAS_MATCH_CALL
+	goto_eq Route104_EventScript_1ED4B9
+	msgbox Route104_Text_2958C1, 4
+	release
+	end
+
+Route104_EventScript_1ED4B9:: @ 81ED4B9
+	msgbox Route104_Text_2958F8, 4
+	setvar VAR_0x8004, 136
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 136
+	callstd 8
+	release
+	end
+
+Route104_EventScript_1ED4D2:: @ 81ED4D2
+	trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_2959BC, Route104_Text_2959FC
+	msgbox Route104_Text_295A1E, 6
+	end
+
+Route104_EventScript_1ED4E9:: @ 81ED4E9
+	trainerbattle 2, TRAINER_CINDY_1, 0, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route104_EventScript_1ED580
+	setvar VAR_0x8004, 114
+	specialvar VAR_RESULT, sub_813B4E0
+	compare VAR_RESULT, 0
+	goto_eq Route104_EventScript_1ED554
+	msgbox Route104_Text_295AC3, 4
+	release
+	end
+
+Route104_EventScript_1ED52A:: @ 81ED52A
+	special sub_80B4808
+	waitmovement 0
+	checkflag FLAG_HAS_MATCH_CALL
+	goto_eq Route104_EventScript_1ED53B
+	release
+	end
+
+Route104_EventScript_1ED53B:: @ 81ED53B
+	msgbox Route104_Text_295B60, 4
+	setvar VAR_0x8004, 114
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 114
+	callstd 8
+	release
+	end
+
+Route104_EventScript_1ED554:: @ 81ED554
+	checkflag FLAG_HAS_MATCH_CALL
+	goto_eq Route104_EventScript_1ED567
+	msgbox Route104_Text_295AC3, 4
+	release
+	end
+
+Route104_EventScript_1ED567:: @ 81ED567
+	msgbox Route104_Text_295B01, 4
+	setvar VAR_0x8004, 114
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 114
+	callstd 8
+	release
+	end
+
+Route104_EventScript_1ED580:: @ 81ED580
+	trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_295BC8, Route104_Text_295BFA
+	msgbox Route104_Text_295C1F, 6
+	end
+
+Route104_EventScript_1ED597:: @ 81ED597
+	trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330
+	special GetPlayerBigGuyGirlString
+	msgbox Route104_Text_2952FE, 4
+	release
+	end
+
+Route104_EventScript_1ED5B6:: @ 81ED5B6
+	trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449
+	special GetPlayerBigGuyGirlString
+	msgbox Route104_Text_29540D, 4
+	release
+	end
+
+Route104_EventScript_1ED5D5:: @ 81ED5D5
+	trainerbattle 0, TRAINER_DARIAN, 0, Route104_Text_295C5D, Route104_Text_295CC9
+	msgbox Route104_Text_295CD3, 6
+	end
+
+Route104_Text_1ED5EC: @ 81ED5EC
+	.string "That seaside cottage is where\n"
+	.string "MR. BRINEY lives.\p"
+	.string "He was once a mighty sailor who never\n"
+	.string "feared the sea, however stormy.$"
+
+Route104_Text_1ED662: @ 81ED662
+	.string "The sea, huh?\p"
+	.string "I wonder what it’s like at the bottom\n"
+	.string "of the sea?$"
+
+Route104_Text_1ED6A2: @ 81ED6A2
+	.string "If you’re going to throw a POKé BALL,\n"
+	.string "weaken the wild POKéMON first.\p"
+	.string "It will be easier to catch if it’s been\n"
+	.string "poisoned, burned, or lulled to sleep.$"
+
+Route104_Text_1ED735: @ 81ED735
+	.string "You’re a thief if you try to steal\n"
+	.string "someone else’s POKéMON.\p"
+	.string "You should throw POKé BALLS only at\n"
+	.string "wild POKéMON.$"
+
+Route104_Text_1ED7A2: @ 81ED7A2
+	.string "Oh, no, I’m not a TRAINER.\p"
+	.string "But that’s right, if TRAINERS lock eyes,\n"
+	.string "it’s a challenge to battle.\p"
+	.string "If you don’t want to battle, stay out\n"
+	.string "of their sight.$"
+
+Route104_Text_1ED838: @ 81ED838
+	.string "I like filling my mouth with seeds,\n"
+	.string "then spitting them out fast!\p"
+	.string "You can have this, so you try it out!\p"
+	.string "Use it on a POKéMON, and it will learn\n"
+	.string "a move for firing seeds rapidly.$"
+
+Route104_Text_1ED8E7: @ 81ED8E7
+	.string "A word of advice!\p"
+	.string "A TM, TECHNICAL MACHINE, is good only\n"
+	.string "for one-time use.\p"
+	.string "Once you use it, it’s gone.\n"
+	.string "Think twice before using it!$"
+
+Route104_Text_1ED96A: @ 81ED96A
+	.string "This FLOWER SHOP started selling\n"
+	.string "saplings recently.\p"
+	.string "It made me so happy, I went overboard\n"
+	.string "shopping.\p"
+	.string "I don’t need this WHITE HERB anymore.\n"
+	.string "Would you take it, please?$"
+
+Route104_Text_1EDA0F: @ 81EDA0F
+	.string "This FLOWER SHOP started selling\n"
+	.string "saplings recently.\p"
+	.string "It made me so happy, I went overboard\n"
+	.string "shopping. Where should I put them?$"
+
+Route104_Text_1EDA8C: @ 81EDA8C
+	.string "MR. BRINEY’S COTTAGE$"
+
+Route104_Text_1EDAA1: @ 81EDAA1
+	.string "ROUTE 1O4\n"
+	.string "{0x7C} PETALBURG CITY$"
+
+Route104_Text_1EDABC: @ 81EDABC
+	.string "ROUTE 1O4\n"
+	.string "{0x79} RUSTBORO CITY$"
+
+Route104_Text_1EDAD6: @ 81EDAD6
+	.string "PRETTY PETAL FLOWER SHOP$"
+
+Route104_Text_1EDAEF: @ 81EDAEF
+	.string "TRAINER TIPS\p"
+	.string "In the HOENN region there are pairs\n"
+	.string "of TRAINERS who challenge others\l"
+	.string "for 2-on-2 POKéMON battles called\l"
+	.string "DOUBLE BATTLES.\p"
+	.string "In a DOUBLE BATTLE, the TRAINER must\n"
+	.string "send out two POKéMON, the one at the\l"
+	.string "left of the list and the top one.\l"
+	.string "Watch how POKéMON are lined up.$"
+
+Route104_Text_1EDBFF: @ 81EDBFF
+	.string "MAY: Oh, hi, {PLAYER}{KUN}!\p"
+	.string "DEVON upgraded your POKéNAV with\n"
+	.string "the MATCH CALL system, huh?\p"
+	.string "We should register each other so we\n"
+	.string "can get in contact anytime.$"
+
+Route104_Text_1EDC8F: @ 81EDC8F
+	.string "{PLAYER} registered MAY\n"
+	.string "in the POKéNAV.$"
+
+Route104_Text_1EDCB1: @ 81EDCB1
+	.string "MAY: Oh, by the way, {PLAYER}{KUN},\n"
+	.string "how’s your POKéDEX coming along?$"
+
+Route104_Text_1EDCED: @ 81EDCED
+	.string "Mine’s looking pretty decent.\n"
+	.string "So…\l"
+	.string "How about a little battle?$"
+
+Route104_Text_1EDD2A: @ 81EDD2A
+	.string "MAY: Oh, what’s the matter?\p"
+	.string "Haven’t you caught or raised your\n"
+	.string "POKéMON very much?\p"
+	.string "That’s not very good for a TRAINER!$"
+
+Route104_Text_1EDD9F: @ 81EDD9F
+	.string "MAY: So, what do you think?\n"
+	.string "How about a little battle here?$"
+
+Route104_Text_1EDDDB: @ 81EDDDB
+	.string "MAY: You just became a TRAINER,\n"
+	.string "{PLAYER}{KUN}. I’m not going to lose!$"
+
+Route104_Text_1EDE18: @ 81EDE18
+	.string "Yikes!\n"
+	.string "You’re better than I expected!$"
+
+Route104_Text_1EDE3E: @ 81EDE3E
+	.string "MAY: I can tell you’ve gotten pretty\n"
+	.string "good with the way you handle POKéMON.\p"
+	.string "But instead of only making them\n"
+	.string "battle, you should be like MR. BRINEY.\p"
+	.string "It’s important to become friends with\n"
+	.string "POKéMON, too.$"
+
+Route104_Text_1EDF04: @ 81EDF04
+	.string "BRENDAN: Oh, hey, {PLAYER}!\p"
+	.string "Cool, you had DEVON install the MATCH\n"
+	.string "CALL system on your POKéNAV!\p"
+	.string "Let’s register each other in our\n"
+	.string "POKéNAVS so we can keep in touch.$"
+
+Route104_Text_1EDFA0: @ 81EDFA0
+	.string "{PLAYER} registered BRENDAN\n"
+	.string "in the POKéNAV.$"
+
+Route104_Text_1EDFC6: @ 81EDFC6
+	.string "BRENDAN: {PLAYER}, how’s your POKéDEX?\n"
+	.string "Have you filled in any pages yet?$"
+
+Route104_Text_1EE009: @ 81EE009
+	.string "Me, I’m doing great!\p"
+	.string "Want to check out how good I am with\n"
+	.string "a battle?$"
+
+Route104_Text_1EE04D: @ 81EE04D
+	.string "BRENDAN: What’s the matter? Don’t have\n"
+	.string "any confidence in your POKéMON?$"
+
+Route104_Text_1EE094: @ 81EE094
+	.string "BRENDAN: What’s up?\n"
+	.string "Want to have a battle with me?$"
+
+Route104_Text_1EE0C7: @ 81EE0C7
+	.string "BRENDAN: I know you just became\n"
+	.string "a TRAINER, but I won’t go easy!$"
+
+Route104_Text_1EE107: @ 81EE107
+	.string "Hmm…\n"
+	.string "You’re pretty good.$"
+
+Route104_Text_1EE120: @ 81EE120
+	.string "BRENDAN: You’ve gotten pretty decent\n"
+	.string "at handling POKéMON.\p"
+	.string "But, you know, you shouldn’t just be\n"
+	.string "making POKéMON battle.\p"
+	.string "Like MR. BRINEY, it’s important to\n"
+	.string "become friends with your POKéMON.$"
+
diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc
new file mode 100644
index 000000000..9eccc2286
--- /dev/null
+++ b/data/maps/Route104_MrBrineysHouse/events.inc
@@ -0,0 +1,11 @@
+Route104_MrBrineysHouse_EventObjects: @ 8533AD4
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, 50, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739
+	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, 8, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881
+
+Route104_MrBrineysHouse_MapWarps: @ 8533B04
+	warp_def 5, 8, 0, 0, MAP_ROUTE104
+	warp_def 6, 8, 0, 0, MAP_ROUTE104
+
+Route104_MrBrineysHouse_MapEvents:: @ 8533B14
+	map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc
index f285f28ee..c6335b13f 100644
--- a/data/maps/Route104_MrBrineysHouse/header.inc
+++ b/data/maps/Route104_MrBrineysHouse/header.inc
@@ -1,5 +1,5 @@
 Route104_MrBrineysHouse: @ 8483D70
-	.4byte Route104_MrBrineysHouse_MapAttributes
+	.4byte Route104_MrBrineysHouse_Layout
 	.4byte Route104_MrBrineysHouse_MapEvents
 	.4byte Route104_MrBrineysHouse_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc
new file mode 100644
index 000000000..1721fa4a0
--- /dev/null
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
@@ -0,0 +1,166 @@
+Route104_MrBrineysHouse_MapScripts:: @ 8229D2E
+	map_script 3, Route104_MrBrineysHouse_MapScript1_229D34
+	.byte 0
+
+Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34
+	setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
+	compare VAR_0x4090, 1
+	call_if 1, Route104_MrBrineysHouse_EventScript_229D50
+	checkflag FLAG_0x0BC
+	call_if 1, Route104_MrBrineysHouse_EventScript_229D4C
+	end
+
+Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C
+	setflag FLAG_0x32E
+	return
+
+Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50
+	setobjectxyperm 1, 9, 3
+	setobjectmovementtype 1, 50
+	setobjectxyperm 2, 9, 6
+	setobjectmovementtype 2, 51
+	return
+
+Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67
+	lock
+	faceplayer
+	checkflag FLAG_0x093
+	call_if 0, Route104_MrBrineysHouse_EventScript_229D8A
+	checkflag FLAG_0x0BD
+	goto_if 0, Route104_MrBrineysHouse_EventScript_229DE1
+	checkflag FLAG_0x095
+	goto_if 0, Route104_MrBrineysHouse_EventScript_229DFA
+	goto Route104_MrBrineysHouse_EventScript_229DAE
+	end
+
+Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A
+	setflag FLAG_0x093
+	msgbox Route104_MrBrineysHouse_Text_229E70, 4
+	msgbox Route104_MrBrineysHouse_Text_229E9B, 5
+	compare VAR_RESULT, 0
+	goto_eq Route104_MrBrineysHouse_EventScript_229E13
+	goto Route104_MrBrineysHouse_EventScript_229E27
+	end
+
+Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE
+	message Route104_MrBrineysHouse_Text_22A268
+	waitmessage
+	multichoicedefault 20, 8, 14, 1, 0
+	switch VAR_RESULT
+	case 0, Route104_MrBrineysHouse_EventScript_229E27
+	case 1, Route104_MrBrineysHouse_EventScript_229E1D
+	case 127, Route104_MrBrineysHouse_EventScript_229E1D
+	end
+
+Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1
+	msgbox Route104_MrBrineysHouse_Text_22A0AD, 5
+	compare VAR_RESULT, 0
+	goto_eq Route104_MrBrineysHouse_EventScript_229E13
+	goto Route104_MrBrineysHouse_EventScript_229E27
+	end
+
+Route104_MrBrineysHouse_EventScript_229DFA:: @ 8229DFA
+	msgbox Route104_MrBrineysHouse_Text_22A18F, 5
+	compare VAR_RESULT, 0
+	goto_eq Route104_MrBrineysHouse_EventScript_229E13
+	goto Route104_MrBrineysHouse_EventScript_229E27
+	end
+
+Route104_MrBrineysHouse_EventScript_229E13:: @ 8229E13
+	msgbox Route104_MrBrineysHouse_Text_22A041, 4
+	release
+	end
+
+Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D
+	msgbox Route104_MrBrineysHouse_Text_22A2C3, 4
+	release
+	end
+
+Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27
+	msgbox Route104_MrBrineysHouse_Text_229FE9, 4
+	call Route104_MrBrineysHouse_EventScript_271E95
+	setvar VAR_0x408E, 1
+	clearflag FLAG_0x2E2
+	setflag FLAG_0x2E3
+	setflag FLAG_0x371
+	setvar VAR_0x405A, 8
+	setvar VAR_0x4063, 2
+	setflag FLAG_0x32E
+	setflag FLAG_0x2CF
+	warp MAP_ROUTE104, 255, 13, 51
+	waitstate
+	releaseall
+	end
+
+Route104_MrBrineysHouse_EventScript_229E5D:: @ 8229E5D
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_WINGULL, 0
+	msgbox Route104_MrBrineysHouse_Text_22A337, 4
+	waitmoncry
+	release
+	end
+
+Route104_MrBrineysHouse_Text_229E70: @ 8229E70
+	.string "MR. BRINEY: Hold on, lass!\n"
+	.string "Wait up, PEEKO!$"
+
+Route104_MrBrineysHouse_Text_229E9B: @ 8229E9B
+	.string "Hm? You’re {PLAYER}{KUN}!\n"
+	.string "You saved my darling PEEKO!\l"
+	.string "We owe so much to you!\p"
+	.string "What’s that?\n"
+	.string "You want to sail with me?\p"
+	.string "Hmhm…\p"
+	.string "You have a LETTER bound for DEWFORD\n"
+	.string "and a package for SLATEPORT, then?\p"
+	.string "Quite the busy life you must lead!\p"
+	.string "But, certainly, what you’re asking is\n"
+	.string "no problem at all.\p"
+	.string "You’ve come to the right man!\n"
+	.string "We’ll set sail for DEWFORD.$"
+
+Route104_MrBrineysHouse_Text_229FE9: @ 8229FE9
+	.string "MR. BRINEY: DEWFORD it is, then!\p"
+	.string "Anchors aweigh!\n"
+	.string "PEEKO, we’re setting sail, my darling!$"
+
+Route104_MrBrineysHouse_Text_22A041: @ 822A041
+	.string "MR. BRINEY: Is that so?\n"
+	.string "Your deliveries can wait?\p"
+	.string "You just go on and tell me whenever\n"
+	.string "you want to set sail!$"
+
+Route104_MrBrineysHouse_Text_22A0AD: @ 822A0AD
+	.string "MR. BRINEY: Ahoy!\n"
+	.string "I know exactly what you want to say!\p"
+	.string "You’re to deliver a LETTER to DEWFORD\n"
+	.string "and a package to SLATEPORT.\p"
+	.string "What you need me to do is no problem\n"
+	.string "at all--I’m the man for the job!\p"
+	.string "First, we’ll set sail for DEWFORD.$"
+
+Route104_MrBrineysHouse_Text_22A18F: @ 822A18F
+	.string "MR. BRINEY: Ahoy!\n"
+	.string "I know exactly what you want to say!\p"
+	.string "You’re to deliver a package to\n"
+	.string "CAPT. STERN in SLATEPORT.\p"
+	.string "What you need me to do is no problem\n"
+	.string "at all--I’m the man for the job!\p"
+	.string "First, we’ll set sail for DEWFORD.$"
+
+Route104_MrBrineysHouse_Text_22A268: @ 822A268
+	.string "MR. BRINEY: Ahoy!\n"
+	.string "For you, I’ll go out to sea anytime!\p"
+	.string "Now, my friend, where are we bound?$"
+
+Route104_MrBrineysHouse_Text_22A2C3: @ 822A2C3
+	.string "MR. BRINEY: Is that so?\n"
+	.string "Well, PEEKO owes her life to you.\p"
+	.string "You just go on and tell me whenever\n"
+	.string "you want to set sail!$"
+
+Route104_MrBrineysHouse_Text_22A337: @ 822A337
+	.string "PEEKO: Pii piihyoro!$"
+
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc
new file mode 100644
index 000000000..025daad04
--- /dev/null
+++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc
@@ -0,0 +1,12 @@
+Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, 2, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0
+
+Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70
+	warp_def 2, 8, 0, 1, MAP_ROUTE104
+	warp_def 3, 8, 0, 1, MAP_ROUTE104
+
+Route104_PrettyPetalFlowerShop_MapEvents:: @ 8533B80
+	map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
index ceac3651f..e23012fb4 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
@@ -1,5 +1,5 @@
 Route104_PrettyPetalFlowerShop: @ 8483D8C
-	.4byte Route104_PrettyPetalFlowerShop_MapAttributes
+	.4byte Route104_PrettyPetalFlowerShop_Layout
 	.4byte Route104_PrettyPetalFlowerShop_MapEvents
 	.4byte Route104_PrettyPetalFlowerShop_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
index 5142a1282..5142a1282 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/Route104_Prototype/events.inc
index 08976e5a8..08976e5a8 100644
--- a/data/maps/events/Route104_Prototype.inc
+++ b/data/maps/Route104_Prototype/events.inc
diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc
index 9728190a1..50f1b7b08 100644
--- a/data/maps/Route104_Prototype/header.inc
+++ b/data/maps/Route104_Prototype/header.inc
@@ -1,5 +1,5 @@
 Route104_Prototype: @ 8485AF8
-	.4byte Route104_Prototype_MapAttributes
+	.4byte Route104_Prototype_Layout
 	.4byte Route104_Prototype_MapEvents
 	.4byte Route104_Prototype_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/maps/Route104_Prototype/scripts.inc
index d8274fffc..d8274fffc 100644
--- a/data/scripts/maps/Route104_Prototype.inc
+++ b/data/maps/Route104_Prototype/scripts.inc
diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc
index e66b3c841..e66b3c841 100644
--- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
index ac5604d72..61217a576 100644
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
@@ -1,5 +1,5 @@
 Route104_PrototypePrettyPetalFlowerShop: @ 8485B14
-	.4byte Route104_PrototypePrettyPetalFlowerShop_MapAttributes
+	.4byte Route104_PrettyPetalFlowerShop_Layout
 	.4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents
 	.4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc
index bacbad7e9..bacbad7e9 100644
--- a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc
diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc
index 44357db1e..ac03944b7 100644
--- a/data/maps/Route105/connections.inc
+++ b/data/maps/Route105/connections.inc
@@ -1,7 +1,7 @@
 Route105_MapConnectionsList: @ 8486898
-	connection up, 0, ROUTE_104, 0
-	connection down, 0, ROUTE_106, 0
-	connection dive, 0, UNDERWATER_6, 0
+	connection up, 0, MAP_ROUTE104
+	connection down, 0, MAP_ROUTE106
+	connection dive, 0, MAP_UNDERWATER6
 
 Route105_MapConnections: @ 84868BC
 	.4byte 0x3
diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc
new file mode 100644
index 000000000..bbe9cf73b
--- /dev/null
+++ b/data/maps/Route105/events.inc
@@ -0,0 +1,20 @@
+Route105_EventObjects: @ 85286F0
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_1EE261, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, 27, 7, 0, 1, 3, Route105_EventScript_1EE278, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, 25, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, 24, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_290D33, 1003
+	object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, 26, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 54, 3, 8, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0
+	object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, 7, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0
+
+Route105_MapWarps: @ 85287B0
+	warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE
+
+Route105_MapBGEvents: @ 85287B8
+	bg_event 15, 68, 3, 7, 0, ITEM_HEART_SCALE, 89, 0
+	bg_event 5, 56, 3, 7, 0, ITEM_BIG_PEARL, 111, 0
+
+Route105_MapEvents:: @ 85287D0
+	map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
+
diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc
index de48be1a5..f7538b723 100644
--- a/data/maps/Route105/header.inc
+++ b/data/maps/Route105/header.inc
@@ -1,5 +1,5 @@
 Route105: @ 84826E8
-	.4byte Route105_MapAttributes
+	.4byte Route105_Layout
 	.4byte Route105_MapEvents
 	.4byte Route105_MapScripts
 	.4byte Route105_MapConnections
diff --git a/data/scripts/maps/Route105.inc b/data/maps/Route105/scripts.inc
index 3cb6d9ae6..3cb6d9ae6 100644
--- a/data/scripts/maps/Route105.inc
+++ b/data/maps/Route105/scripts.inc
diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc
index a3b16c452..18f181d2b 100644
--- a/data/maps/Route106/connections.inc
+++ b/data/maps/Route106/connections.inc
@@ -1,6 +1,6 @@
 Route106_MapConnectionsList: @ 84868C4
-	connection up, 0, ROUTE_105, 0
-	connection down, 60, DEWFORD_TOWN, 0
+	connection up, 0, MAP_ROUTE105
+	connection down, 60, MAP_DEWFORD_TOWN
 
 Route106_MapConnections: @ 84868DC
 	.4byte 0x2
diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc
new file mode 100644
index 000000000..8fdbaad5f
--- /dev/null
+++ b/data/maps/Route106/events.inc
@@ -0,0 +1,19 @@
+Route106_EventObjects: @ 85287E4
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0
+	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0
+	object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004
+
+Route106_MapWarps: @ 852885C
+	warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F
+
+Route106_MapBGEvents: @ 8528864
+	bg_event 41, 11, 3, 7, 0, ITEM_POKE_BALL, 63, 0
+	bg_event 53, 12, 0, 7, 0, ITEM_STARDUST, 46, 0
+	bg_event 68, 15, 3, 7, 0, ITEM_HEART_SCALE, 47, 0
+	bg_event 59, 13, 3, 0, 0, Route106_EventScript_1EE48A
+
+Route106_MapEvents:: @ 8528894
+	map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents
+
diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc
index 5ee6a3071..93f4bd835 100644
--- a/data/maps/Route106/header.inc
+++ b/data/maps/Route106/header.inc
@@ -1,5 +1,5 @@
 Route106: @ 8482704
-	.4byte Route106_MapAttributes
+	.4byte Route106_Layout
 	.4byte Route106_MapEvents
 	.4byte Route106_MapScripts
 	.4byte Route106_MapConnections
diff --git a/data/scripts/maps/Route106.inc b/data/maps/Route106/scripts.inc
index fdfff0587..fdfff0587 100644
--- a/data/scripts/maps/Route106.inc
+++ b/data/maps/Route106/scripts.inc
diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc
index 2e17530d6..04ad13b07 100644
--- a/data/maps/Route107/connections.inc
+++ b/data/maps/Route107/connections.inc
@@ -1,6 +1,6 @@
 Route107_MapConnectionsList: @ 84868E4
-	connection left, 0, DEWFORD_TOWN, 0
-	connection right, 0, ROUTE_108, 0
+	connection left, 0, MAP_DEWFORD_TOWN
+	connection right, 0, MAP_ROUTE108
 
 Route107_MapConnections: @ 84868FC
 	.4byte 0x2
diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc
new file mode 100644
index 000000000..f748e2ff9
--- /dev/null
+++ b/data/maps/Route107/events.inc
@@ -0,0 +1,12 @@
+Route107_EventObjects: @ 85288A8
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, 24, 1, 1, 1, 3, Route107_EventScript_1EE595, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, 52, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 11, 1, 65, 1, 1, 1, 5, Route107_EventScript_1EE625, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, 8, 1, 1, 1, 1, Route107_EventScript_1EE63C, 0
+	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, 8, 1, 1, 1, 1, Route107_EventScript_1EE657, 0
+	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, 64, 1, 1, 1, 5, Route107_EventScript_1EE672, 0
+
+Route107_MapEvents:: @ 8528950
+	map_events Route107_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc
index d6dffda04..a27885664 100644
--- a/data/maps/Route107/header.inc
+++ b/data/maps/Route107/header.inc
@@ -1,5 +1,5 @@
 Route107: @ 8482720
-	.4byte Route107_MapAttributes
+	.4byte Route107_Layout
 	.4byte Route107_MapEvents
 	.4byte Route107_MapScripts
 	.4byte Route107_MapConnections
diff --git a/data/scripts/maps/Route107.inc b/data/maps/Route107/scripts.inc
index 2c8364592..2c8364592 100644
--- a/data/scripts/maps/Route107.inc
+++ b/data/maps/Route107/scripts.inc
diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc
index 1208a2138..f80d0ade2 100644
--- a/data/maps/Route108/connections.inc
+++ b/data/maps/Route108/connections.inc
@@ -1,6 +1,6 @@
 Route108_MapConnectionsList: @ 8486904
-	connection left, 0, ROUTE_107, 0
-	connection right, -40, ROUTE_109, 0
+	connection left, 0, MAP_ROUTE107
+	connection right, -40, MAP_ROUTE109
 
 Route108_MapConnections: @ 848691C
 	.4byte 0x2
diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc
new file mode 100644
index 000000000..0a0b448c4
--- /dev/null
+++ b/data/maps/Route108/events.inc
@@ -0,0 +1,18 @@
+Route108_EventObjects: @ 8528964
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, 45, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, 13, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 41, 5, 3, 10, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0
+	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, 9, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, 1, 1, 1, 0, 0, Route108_EventScript_290D4D, 1139
+
+Route108_MapWarps: @ 8528A0C
+	warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK
+
+Route108_MapBGEvents: @ 8528A14
+	bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0
+
+Route108_MapEvents:: @ 8528A20
+	map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents
+
diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc
index e0a0c9f42..2c4cea90d 100644
--- a/data/maps/Route108/header.inc
+++ b/data/maps/Route108/header.inc
@@ -1,5 +1,5 @@
 Route108: @ 848273C
-	.4byte Route108_MapAttributes
+	.4byte Route108_Layout
 	.4byte Route108_MapEvents
 	.4byte Route108_MapScripts
 	.4byte Route108_MapConnections
diff --git a/data/scripts/maps/Route108.inc b/data/maps/Route108/scripts.inc
index 25657c5a4..25657c5a4 100644
--- a/data/scripts/maps/Route108.inc
+++ b/data/maps/Route108/scripts.inc
diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc
index 8e1ff175f..25a7a0e91 100644
--- a/data/maps/Route109/connections.inc
+++ b/data/maps/Route109/connections.inc
@@ -1,6 +1,6 @@
 Route109_MapConnectionsList: @ 8486924
-	connection up, 0, SLATEPORT_CITY, 0
-	connection left, 40, ROUTE_108, 0
+	connection up, 0, MAP_SLATEPORT_CITY
+	connection left, 40, MAP_ROUTE108
 
 Route109_MapConnections: @ 848693C
 	.4byte 0x2
diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc
new file mode 100644
index 000000000..1d847897d
--- /dev/null
+++ b/data/maps/Route109/events.inc
@@ -0,0 +1,42 @@
+Route109_EventObjects: @ 8528A34
+	object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, 744
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_1EE910, 741
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, 15, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0
+	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, 8, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0
+	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 24, 13, 3, 9, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0
+	object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, 8, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0
+	object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, 80, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0
+	object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_1EE995, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, 1, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005
+	object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0
+	object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0
+	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, 9, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0
+	object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 18, 3, 10, 1, 1, 0, 0, Route109_EventScript_1EE99E, 0
+	object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 18, 3, 9, 1, 1, 0, 0, Route109_EventScript_1EE9B5, 0
+	object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, 8, 1, 1, 0, 0, Route109_EventScript_1EEA06, 0
+	object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, 8, 1, 1, 1, 1, Route109_EventScript_1EEBBD, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, 8, 1, 1, 1, 1, Route109_EventScript_1EEBA2, 0
+	object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_1EEA0F, 0
+	object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0
+	object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, 80, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0
+	object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, 79, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0
+	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_290D67, 1140
+	object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 17, 56, 3, 80, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0
+
+Route109_MapWarps: @ 8528C74
+	warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE
+
+Route109_MapBGEvents: @ 8528C7C
+	bg_event 15, 5, 0, 0, 0, Route109_EventScript_1EEA2B
+	bg_event 29, 10, 3, 0, 0, Route109_EventScript_1EEA34
+	bg_event 16, 23, 3, 7, 0, ITEM_REVIVE, 50, 0
+	bg_event 33, 5, 3, 7, 0, ITEM_HEART_SCALE, 52, 0
+	bg_event 9, 10, 3, 7, 0, ITEM_GREAT_BALL, 51, 0
+	bg_event 28, 20, 3, 7, 0, ITEM_ETHER, 64, 0
+	bg_event 13, 16, 3, 7, 0, ITEM_HEART_SCALE, 90, 0
+	bg_event 8, 42, 3, 7, 0, ITEM_HEART_SCALE, 91, 0
+
+Route109_MapEvents:: @ 8528CDC
+	map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents
+
diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc
index 532443e1b..c9482cf31 100644
--- a/data/maps/Route109/header.inc
+++ b/data/maps/Route109/header.inc
@@ -1,5 +1,5 @@
 Route109: @ 8482758
-	.4byte Route109_MapAttributes
+	.4byte Route109_Layout
 	.4byte Route109_MapEvents
 	.4byte Route109_MapScripts
 	.4byte Route109_MapConnections
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc
new file mode 100644
index 000000000..84f7b7c34
--- /dev/null
+++ b/data/maps/Route109/scripts.inc
@@ -0,0 +1,573 @@
+Route109_MapScripts:: @ 81EE75F
+	.byte 0
+
+Route109_EventScript_1EE760:: @ 81EE760
+	call Route109_EventScript_271E95
+	setobjectpriority 2, MAP_ROUTE109, 0
+	setobjectpriority 255, MAP_ROUTE109, 0
+	applymovement 2, Route109_Movement_1EE90B
+	waitmovement 0
+	removeobject 2
+	switch VAR_FACING
+	case 1, Route109_EventScript_1EE7A5
+	case 3, Route109_EventScript_1EE7C5
+	case 4, Route109_EventScript_1EE7B5
+	end
+
+Route109_EventScript_1EE7A5:: @ 81EE7A5
+	applymovement 255, Route109_Movement_1EE8FD
+	waitmovement 0
+	goto Route109_EventScript_1EE7D5
+	end
+
+Route109_EventScript_1EE7B5:: @ 81EE7B5
+	applymovement 255, Route109_Movement_1EE905
+	waitmovement 0
+	goto Route109_EventScript_1EE7D5
+	end
+
+Route109_EventScript_1EE7C5:: @ 81EE7C5
+	applymovement 255, Route109_Movement_1EE908
+	waitmovement 0
+	goto Route109_EventScript_1EE7D5
+	end
+
+Route109_EventScript_1EE7D5:: @ 81EE7D5
+	hideobjectat 255, MAP_ROUTE109
+	call Route109_EventScript_2720A0
+	applymovement 1, Route109_Movement_1EE84F
+	applymovement 255, Route109_Movement_1EE84F
+	waitmovement 0
+	delay 50
+	call Route109_EventScript_2720A8
+	showobjectat 255, MAP_DEWFORD_TOWN
+	applymovement 255, Route109_Movement_1EE900
+	waitmovement 0
+	addobject 4
+	clearflag FLAG_0x2E7
+	setobjectxyperm 2, 12, 8
+	addobject 2
+	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
+	applymovement 2, Route109_Movement_1EE90D
+	waitmovement 0
+	clearflag FLAG_0x2E4
+	setflag FLAG_0x2E8
+	hideobjectat 1, MAP_ROUTE109
+	msgbox Route109_Text_1E9C1D, 4
+	closemessage
+	copyvar VAR_0x4096, VAR_0x8008
+	resetobjectpriority 255, MAP_ROUTE109
+	resetobjectpriority 2, MAP_DEWFORD_TOWN
+	moveobjectoffscreen 2
+	release
+	end
+
+Route109_Movement_1EE84F: @ 81EE84F
+	walk_in_place_fastest_down
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	step_end
+
+Route109_Movement_1EE8FD: @ 81EE8FD
+	walk_down
+	walk_down
+	step_end
+
+Route109_Movement_1EE900: @ 81EE900
+	walk_down
+	walk_down
+	walk_left
+	walk_in_place_fastest_right
+	step_end
+
+Route109_Movement_1EE905: @ 81EE905
+	walk_right
+	walk_down
+	step_end
+
+Route109_Movement_1EE908: @ 81EE908
+	walk_left
+	walk_down
+	step_end
+
+Route109_Movement_1EE90B: @ 81EE90B
+	walk_down
+	step_end
+
+Route109_Movement_1EE90D: @ 81EE90D
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+Route109_EventScript_1EE910:: @ 81EE910
+	lock
+	faceplayer
+	checkflag FLAG_0x095
+	goto_if 0, Route109_EventScript_1EE921
+	goto Route109_EventScript_1EE93F
+	end
+
+Route109_EventScript_1EE921:: @ 81EE921
+	message Route109_Text_1EEC96
+	msgbox Route109_Text_1EEC96, 5
+	compare VAR_RESULT, 0
+	goto_eq Route109_EventScript_1EE981
+	goto Route109_EventScript_1EE972
+	end
+
+Route109_EventScript_1EE93F:: @ 81EE93F
+	message Route109_Text_1EEE17
+	waitmessage
+	multichoicedefault 21, 8, 14, 1, 0
+	switch VAR_RESULT
+	case 0, Route109_EventScript_1EE972
+	case 1, Route109_EventScript_1EE98B
+	case 127, Route109_EventScript_1EE98B
+	end
+
+Route109_EventScript_1EE972:: @ 81EE972
+	msgbox Route109_Text_1EED06, 4
+	closemessage
+	goto Route109_EventScript_1EE760
+	end
+
+Route109_EventScript_1EE981:: @ 81EE981
+	msgbox Route109_Text_1EED5E, 4
+	release
+	end
+
+Route109_EventScript_1EE98B:: @ 81EE98B
+	msgbox Route109_Text_1EEE72, 4
+	release
+	end
+
+Route109_EventScript_1EE995:: @ 81EE995
+	msgbox Route109_Text_1EEEB4, 2
+	end
+
+Route109_EventScript_1EE99E:: @ 81EE99E
+	lock
+	faceplayer
+	msgbox Route109_Text_1EEFB0, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, Route109_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+Route109_EventScript_1EE9B5:: @ 81EE9B5
+	lock
+	faceplayer
+	special GetPlayerBigGuyGirlString
+	checkflag FLAG_0x118
+	goto_eq Route109_EventScript_1EE9F2
+	msgbox Route109_Text_1EEFDE, 4
+	giveitem_std ITEM_SOFT_SAND
+	compare VAR_RESULT, 0
+	goto_eq Route109_EventScript_272054
+	closemessage
+	applymovement VAR_LAST_TALKED, Route109_Movement_2725A2
+	waitmovement 0
+	setflag FLAG_0x118
+	release
+	end
+
+Route109_EventScript_1EE9F2:: @ 81EE9F2
+	msgbox Route109_Text_1EEFF1, 4
+	applymovement VAR_LAST_TALKED, Route109_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+Route109_EventScript_1EEA06:: @ 81EEA06
+	msgbox Route109_Text_1EEF08, 2
+	end
+
+Route109_EventScript_1EEA0F:: @ 81EEA0F
+	msgbox Route109_Text_1EF080, 2
+	end
+
+Route109_EventScript_1EEA18:: @ 81EEA18
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_ZIGZAGOON, 0
+	msgbox Route109_Text_1EF173, 4
+	waitmoncry
+	release
+	end
+
+Route109_EventScript_1EEA2B:: @ 81EEA2B
+	msgbox Route109_Text_1EF185, 3
+	end
+
+Route109_EventScript_1EEA34:: @ 81EEA34
+	msgbox Route109_Text_1EF1D5, 3
+	end
+
+Route109_EventScript_1EEA3D:: @ 81EEA3D
+	trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_297140, Route109_Text_29717D
+	msgbox Route109_Text_297191, 6
+	end
+
+Route109_EventScript_1EEA54:: @ 81EEA54
+	trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_2971D1, Route109_Text_2971FD
+	msgbox Route109_Text_29720F, 6
+	end
+
+Route109_EventScript_1EEA6B:: @ 81EEA6B
+	trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_297235, Route109_Text_29727B
+	msgbox Route109_Text_29728C, 6
+	end
+
+Route109_EventScript_1EEA82:: @ 81EEA82
+	trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_2972B3, Route109_Text_2972CE
+	msgbox Route109_Text_2972ED, 6
+	end
+
+Route109_EventScript_1EEA99:: @ 81EEA99
+	trainerbattle 2, TRAINER_RICKY_1, 0, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route109_EventScript_1EEAE4
+	msgbox Route109_Text_297380, 4
+	release
+	end
+
+Route109_EventScript_1EEAC5:: @ 81EEAC5
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route109_Text_2973C1, 4
+	setvar VAR_0x8004, 64
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 64
+	callstd 8
+	release
+	end
+
+Route109_EventScript_1EEAE4:: @ 81EEAE4
+	trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_2973FF, Route109_Text_297437
+	msgbox Route109_Text_297458, 6
+	end
+
+Route109_EventScript_1EEAFB:: @ 81EEAFB
+	trainerbattle 2, TRAINER_LOLA_1, 0, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route109_EventScript_1EEB46
+	msgbox Route109_Text_2974D6, 4
+	release
+	end
+
+Route109_EventScript_1EEB27:: @ 81EEB27
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route109_Text_297520, 4
+	setvar VAR_0x8004, 57
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 57
+	callstd 8
+	release
+	end
+
+Route109_EventScript_1EEB46:: @ 81EEB46
+	trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_297538, Route109_Text_297576
+	msgbox Route109_Text_29757D, 6
+	end
+
+Route109_EventScript_1EEB5D:: @ 81EEB5D
+	trainerbattle 0, TRAINER_AUSTINA, 0, Route109_Text_2975C0, Route109_Text_297601
+	msgbox Route109_Text_29762A, 6
+	end
+
+Route109_EventScript_1EEB74:: @ 81EEB74
+	trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_297667, Route109_Text_297691
+	msgbox Route109_Text_2976A4, 6
+	end
+
+Route109_EventScript_1EEB8B:: @ 81EEB8B
+	trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_2976C5, Route109_Text_2976FC
+	msgbox Route109_Text_297715, 6
+	end
+
+Route109_EventScript_1EEBA2:: @ 81EEBA2
+	trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D
+	msgbox Route109_Text_2977C7, 6
+	end
+
+Route109_EventScript_1EEBBD:: @ 81EEBBD
+	trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E
+	msgbox Route109_Text_2978F1, 6
+	end
+
+Route109_EventScript_1EEBD8:: @ 81EEBD8
+	trainerbattle 0, TRAINER_CHANDLER, 0, Route109_Text_29798A, Route109_Text_2979AE
+	msgbox Route109_Text_2979BF, 6
+	end
+
+Route109_EventScript_1EEBEF:: @ 81EEBEF
+	trainerbattle 0, TRAINER_HAILEY, 0, Route109_Text_2979EC, Route109_Text_297A15
+	msgbox Route109_Text_297A40, 6
+	end
+
+Route109_EventScript_1EEC06:: @ 81EEC06
+	trainerbattle 0, TRAINER_ELIJAH, 0, Route109_Text_297A82, Route109_Text_297AC7
+	msgbox Route109_Text_297AE5, 6
+	end
+
+DewfordTown_Text_1EEC1D: @ 81EEC1D
+	.string "MR. BRINEY: Ahoy!\n"
+	.string "We’ve made land in SLATEPORT!\p"
+	.string "I suppose you’re going to visit CAPT.\n"
+	.string "STERN and deliver the DEVON GOODS?$"
+
+Route109_Text_1EEC96: @ 81EEC96
+	.string "MR. BRINEY: I thought you’re supposed\n"
+	.string "to deliver the DEVON GOODS.\p"
+	.string "Would you like to sail back to\n"
+	.string "DEWFORD, then?$"
+
+Route109_Text_1EED06: @ 81EED06
+	.string "MR. BRINEY: DEWFORD it is, then!\p"
+	.string "Anchors aweigh!\n"
+	.string "PEEKO, we’re setting sail, my darling!$"
+
+Route109_Text_1EED5E: @ 81EED5E
+	.string "MR. BRINEY: Then you go on and deliver\n"
+	.string "the DEVON GOODS. I’ll be waiting.$"
+
+DewfordTown_Text_1EEDA7: @ 81EEDA7
+	.string "MR. BRINEY: Ahoy! We’ve made land in\n"
+	.string "SLATEPORT!\p"
+	.string "You just go on and tell me whenever\n"
+	.string "you want to set sail again!$"
+
+Route109_Text_1EEE17: @ 81EEE17
+	.string "MR. BRINEY: Ahoy!\n"
+	.string "For you, I’ll go out to sea anytime!\p"
+	.string "Now, my friend, where are we bound?$"
+
+Route109_Text_1EEE72: @ 81EEE72
+	.string "MR. BRINEY: You just tell me whenever\n"
+	.string "you need to set sail again!$"
+
+Route109_Text_1EEEB4: @ 81EEEB4
+	.string "Yo, TRAINERS!\n"
+	.string "Whether you’re hot to trot,\l"
+	.string "or cool cat not,\l"
+	.string "chill at my papa’s spot!$"
+
+Route109_Text_1EEF08: @ 81EEF08
+	.string "Little kids can dart around so quickly…\p"
+	.string "You don’t dare take your eyes off them\n"
+	.string "for an instant. It’s very taxing.\p"
+	.string "Mine are with my POKéMON, so they\n"
+	.string "should be okay, but…$"
+
+Route109_Text_1EEFB0: @ 81EEFB0
+	.string "Our sand castle’s taking a long time\n"
+	.string "to make.$"
+
+Route109_Text_1EEFDE: @ 81EEFDE
+	.string "You can have this!$"
+
+Route109_Text_1EEFF1: @ 81EEFF1
+	.string "We’re going to get all the sand from\n"
+	.string "the beach and make a big castle!\p"
+	.string "And then we’re going to be a king and\n"
+	.string "queen.\p"
+	.string "We’ll let you be a servant.$"
+
+Route109_Text_1EF080: @ 81EF080
+	.string "The water around these parts is clean.\p"
+	.string "But, I get my ZIGZAGOON to pick up\n"
+	.string "litter from the shoreline at times.\p"
+	.string "Dirty water becomes rain and joins our\n"
+	.string "rivers, which we drink from…\p"
+	.string "If we pollute the sea, it all comes\n"
+	.string "back to haunt us eventually.$"
+
+Route109_Text_1EF173: @ 81EF173
+	.string "ZIGZAGOON: Guguu?$"
+
+Route109_Text_1EF185: @ 81EF185
+	.string "SEASHORE HOUSE\p"
+	.string "“May hot battles rage on hot sands!\n"
+	.string "The place for hot TRAINERS!”$"
+
+Route109_Text_1EF1D5: @ 81EF1D5
+	.string "TRAINER TIPS\p"
+	.string "POKéMON at the same level may not\n"
+	.string "always have identical stats.\p"
+	.string "POKéMON raised by TRAINERS are said\n"
+	.string "to grow stronger than wild POKéMON.$"
diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc
new file mode 100644
index 000000000..140b92a21
--- /dev/null
+++ b/data/maps/Route109_SeashoreHouse/events.inc
@@ -0,0 +1,13 @@
+Route109_SeashoreHouse_EventObjects: @ 853DDE8
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0
+	object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0
+
+Route109_SeashoreHouse_MapWarps: @ 853DE48
+	warp_def 6, 9, 0, 0, MAP_ROUTE109
+	warp_def 7, 9, 0, 0, MAP_ROUTE109
+
+Route109_SeashoreHouse_MapEvents:: @ 853DE58
+	map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc
index 99c905eaa..cec1ace27 100644
--- a/data/maps/Route109_SeashoreHouse/header.inc
+++ b/data/maps/Route109_SeashoreHouse/header.inc
@@ -1,5 +1,5 @@
 Route109_SeashoreHouse: @ 8485B30
-	.4byte Route109_SeashoreHouse_MapAttributes
+	.4byte Route109_SeashoreHouse_Layout
 	.4byte Route109_SeashoreHouse_MapEvents
 	.4byte Route109_SeashoreHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/scripts.inc
index e70f91ca8..e70f91ca8 100644
--- a/data/scripts/maps/Route109_SeashoreHouse.inc
+++ b/data/maps/Route109_SeashoreHouse/scripts.inc
diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc
index 92a12b42a..22000354f 100644
--- a/data/maps/Route110/connections.inc
+++ b/data/maps/Route110/connections.inc
@@ -1,7 +1,7 @@
 Route110_MapConnectionsList: @ 8486944
-	connection up, 0, MAUVILLE_CITY, 0
-	connection down, 0, SLATEPORT_CITY, 0
-	connection left, 60, ROUTE_103, 0
+	connection up, 0, MAP_MAUVILLE_CITY
+	connection down, 0, MAP_SLATEPORT_CITY
+	connection left, 60, MAP_ROUTE103
 
 Route110_MapConnections: @ 8486968
 	.4byte 0x3
diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc
new file mode 100644
index 000000000..a38375d8e
--- /dev/null
+++ b/data/maps/Route110/events.inc
@@ -0,0 +1,79 @@
+Route110_EventObjects: @ 8528CF0
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF338, 0
+	object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, 3, 0, 1, 0, 0, Route110_EventScript_1EF326, 0
+	object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, 2, 1, 1, 0, 0, Route110_EventScript_1EF314, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, 2, 1, 1, 0, 0, Route110_EventScript_1EF31D, 0
+	object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, 2, 1, 3, 0, 0, Route110_EventScript_1EF30B, 0
+	object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, 2, 1, 1, 0, 0, Route110_EventScript_1EF302, 0
+	object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, 49, 2, 14, 1, 3, Route110_EventScript_1EF529, 0
+	object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, 51, 10, 1, 1, 3, Route110_EventScript_1EF4B0, 0
+	object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, 9, 1, 1, 1, 4, Route110_EventScript_1EF540, 0
+	object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, 45, 4, 4, 1, 3, Route110_EventScript_1EF4C7, 0
+	object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 3, 39, 3, 10, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0
+	object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_1EF409, 0
+	object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 34, 40, 3, 67, 0, 0, 1, 4, Route110_EventScript_1EF420, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_1EF482, 0
+	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, 12, 0, 0, 0, 16, BerryTreeScript, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, 12, 0, 0, 0, 17, BerryTreeScript, 0
+	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, 12, 0, 0, 0, 18, BerryTreeScript, 0
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D81, 1007
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D74, 1006
+	object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0
+	object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900
+	object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900
+	object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900
+	object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900
+	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, 8, 0, 0, 0, 0, 0x0, 900
+	object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, 51, 7, 1, 1, 2, Route110_EventScript_1EF499, 0
+	object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, 919
+	object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, 922
+	object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_1EF604, 0
+	object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 76, 3, 9, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0
+	object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 7, 76, 3, 10, 1, 1, 1, 2, Route110_EventScript_1EF61C, 0
+	object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, 9, 1, 1, 1, 6, Route110_EventScript_1EF64A, 0
+	object_event 34, EVENT_OBJ_GFX_MAN_6, 0, 36, 40, 3, 66, 1, 1, 1, 3, Route110_EventScript_1EF633, 0
+	object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, 1, 1, 1, 0, 0, Route110_EventScript_290D8E, 1141
+	object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, 1, 1, 1, 0, 0, 0x0, 837
+
+Route110_MapWarps: @ 8529050
+	warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE
+	warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
+	warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
+	warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE
+	warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE
+
+Route110_MapCoordEvents: @ 8529080
+	coord_event 28, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661
+	coord_event 29, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661
+	coord_event 33, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF74D
+	coord_event 34, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF758
+	coord_event 35, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF763
+	coord_event 7, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9CB
+	coord_event 8, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9D6
+	coord_event 9, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9E1
+	coord_event 10, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9EC
+
+Route110_MapBGEvents: @ 8529110
+	bg_event 15, 25, 0, 0, 0, Route110_EventScript_1EF353
+	bg_event 9, 51, 0, 0, 0, Route110_EventScript_1EF365
+	bg_event 14, 88, 0, 0, 0, Route110_EventScript_1EF34A
+	bg_event 20, 94, 0, 0, 0, Route110_EventScript_1EF341
+	bg_event 7, 79, 0, 0, 0, Route110_EventScript_1EF35C
+	bg_event 3, 17, 0, 0, 0, Route110_EventScript_1EF36E
+	bg_event 16, 25, 0, 8, 0, ITEM_MACHO_BRACE, 0, 0
+	bg_event 17, 25, 0, 8, 0, ITEM_SOUL_DEW, 0, 0
+	bg_event 33, 39, 3, 0, 0, Route110_EventScript_1EF377
+	bg_event 37, 70, 3, 0, 0, Route110_EventScript_1EF380
+	bg_event 8, 67, 0, 0, 0, Route110_EventScript_1EF389
+	bg_event 32, 93, 0, 0, 0, Route110_EventScript_1EF392
+	bg_event 35, 39, 3, 7, 0, ITEM_REVIVE, 54, 0
+	bg_event 33, 45, 3, 7, 0, ITEM_GREAT_BALL, 53, 0
+	bg_event 4, 35, 3, 7, 0, ITEM_POKE_BALL, 65, 0
+	bg_event 37, 67, 3, 7, 0, ITEM_FULL_HEAL, 55, 0
+	bg_event 13, 16, 0, 0, 0, Route110_EventScript_1EF34A
+
+Route110_MapEvents:: @ 85291DC
+	map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents
+
diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc
index 5a74c1d6c..d6d394209 100644
--- a/data/maps/Route110/header.inc
+++ b/data/maps/Route110/header.inc
@@ -1,5 +1,5 @@
 Route110: @ 8482774
-	.4byte Route110_MapAttributes
+	.4byte Route110_Layout
 	.4byte Route110_MapEvents
 	.4byte Route110_MapScripts
 	.4byte Route110_MapConnections
diff --git a/data/scripts/maps/Route110.inc b/data/maps/Route110/scripts.inc
index 40d6a2e69..40d6a2e69 100644
--- a/data/scripts/maps/Route110.inc
+++ b/data/maps/Route110/scripts.inc
diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc
deleted file mode 100644
index 433849c14..000000000
--- a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_SeasideCyclingRoadEntrance1: @ 8485C80
-	.4byte Route110_SeasideCyclingRoadEntrance1_MapAttributes
-	.4byte Route110_SeasideCyclingRoadEntrance1_MapEvents
-	.4byte Route110_SeasideCyclingRoadEntrance1_MapScripts
-	.4byte 0x0
-	.2byte MUS_FINECITY
-	.2byte 256
-	.byte 25
-	.byte 0
-	.byte 0
-	.byte 8
-	.2byte 0
-	.byte 1
-	.byte 0
-
diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc
deleted file mode 100644
index 755b6a5ff..000000000
--- a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_SeasideCyclingRoadEntrance2: @ 8485C9C
-	.4byte Route110_SeasideCyclingRoadEntrance2_MapAttributes
-	.4byte Route110_SeasideCyclingRoadEntrance2_MapEvents
-	.4byte Route110_SeasideCyclingRoadEntrance2_MapScripts
-	.4byte 0x0
-	.2byte MUS_FINECITY
-	.2byte 256
-	.byte 25
-	.byte 0
-	.byte 0
-	.byte 8
-	.2byte 0
-	.byte 1
-	.byte 0
-
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc
new file mode 100644
index 000000000..adb59f580
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc
@@ -0,0 +1,16 @@
+Route110_SeasideCyclingRoadNorthEntrance_EventObjects: @ 853E9A0
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78, 0
+
+Route110_SeasideCyclingRoadNorthEntrance_MapWarps: @ 853E9B8
+	warp_def 1, 5, 0, 4, MAP_ROUTE110
+	warp_def 2, 5, 0, 4, MAP_ROUTE110
+	warp_def 12, 5, 0, 5, MAP_ROUTE110
+	warp_def 13, 5, 0, 5, MAP_ROUTE110
+
+Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents: @ 853E9D8
+	coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84
+	coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6
+
+Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 853E9F8
+	map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0
+
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
new file mode 100644
index 000000000..35a466e1e
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
@@ -0,0 +1,15 @@
+Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80
+	.4byte Route110_SeasideCyclingRoadEntrance_Layout
+	.4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents
+	.4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts
+	.4byte 0x0
+	.2byte MUS_FINECITY
+	.2byte 256
+	.byte 25
+	.byte 0
+	.byte 0
+	.byte 8
+	.2byte 0
+	.byte 1
+	.byte 0
+
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
new file mode 100644
index 000000000..cbb5070a2
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
@@ -0,0 +1,50 @@
+Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 826EA77
+	.byte 0
+
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78:: @ 826EA78
+	lock
+	faceplayer
+	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1, 4
+	release
+	end
+
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84:: @ 826EA84
+	lockall
+	specialvar VAR_RESULT, GetPlayerAvatarBike
+	compare VAR_RESULT, 0
+	goto_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F
+	setflag FLAG_SYS_CYCLING_ROAD
+	setvar VAR_TEMP_1, 1
+	releaseall
+	end
+
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F:: @ 826EA9F
+	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, 4
+	closemessage
+	applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4
+	waitmovement 0
+	releaseall
+	end
+
+Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4: @ 826EAB4
+	walk_left
+	step_end
+
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6:: @ 826EAB6
+	lockall
+	clearflag FLAG_SYS_CYCLING_ROAD
+	setvar VAR_TEMP_1, 0
+	releaseall
+	end
+
+Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1: @ 826EAC1
+	.string "On CYCLING ROAD, you can go all out\n"
+	.string "and cycle as fast as you’d like.\p"
+	.string "It feels great to go that fast, but try\n"
+	.string "not to crash into anyone!$"
+
+Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48: @ 826EB48
+	.string "Sorry, you can’t walk on CYCLING\n"
+	.string "ROAD. It’s too dangerous.\p"
+	.string "Please come back with a BIKE.$"
+
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc
new file mode 100644
index 000000000..5def6e102
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc
@@ -0,0 +1,16 @@
+Route110_SeasideCyclingRoadSouthEntrance_EventObjects: @ 853EA0C
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4, 0
+
+Route110_SeasideCyclingRoadSouthEntrance_MapWarps: @ 853EA24
+	warp_def 1, 5, 0, 2, MAP_ROUTE110
+	warp_def 2, 5, 0, 2, MAP_ROUTE110
+	warp_def 12, 5, 0, 3, MAP_ROUTE110
+	warp_def 13, 5, 0, 3, MAP_ROUTE110
+
+Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents: @ 853EA44
+	coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0
+	coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13
+
+Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 853EA64
+	map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0
+
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
new file mode 100644
index 000000000..2529d7366
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
@@ -0,0 +1,15 @@
+Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C
+	.4byte Route110_SeasideCyclingRoadEntrance_Layout
+	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents
+	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts
+	.4byte 0x0
+	.2byte MUS_FINECITY
+	.2byte 256
+	.byte 25
+	.byte 0
+	.byte 0
+	.byte 8
+	.2byte 0
+	.byte 1
+	.byte 0
+
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
new file mode 100644
index 000000000..9f99cf44f
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
@@ -0,0 +1,69 @@
+Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1
+	map_script 3, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7
+	.byte 0
+
+Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7
+	compare VAR_0x40A9, 3
+	call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE
+	compare VAR_0x40A9, 2
+	call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE
+	end
+
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE
+	setvar VAR_0x40A9, 1
+	return
+
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4
+	lock
+	faceplayer
+	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23, 4
+	release
+	end
+
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0:: @ 826EBD0
+	lockall
+	specialvar VAR_RESULT, GetPlayerAvatarBike
+	compare VAR_RESULT, 2
+	call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6
+	compare VAR_RESULT, 0
+	goto_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC
+	setflag FLAG_SYS_CYCLING_ROAD
+	setvar VAR_TEMP_1, 1
+	releaseall
+	end
+
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6
+	setvar VAR_0x40A9, 1
+	return
+
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC
+	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, 4
+	closemessage
+	applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11
+	waitmovement 0
+	releaseall
+	end
+
+Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11: @ 826EC11
+	walk_left
+	step_end
+
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13
+	lockall
+	setvar VAR_0x40A9, 0
+	clearflag FLAG_SYS_CYCLING_ROAD
+	setvar VAR_TEMP_1, 0
+	releaseall
+	end
+
+Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23: @ 826EC23
+	.string "On CYCLING ROAD, you can go all out\n"
+	.string "and cycle as fast as you’d like.\p"
+	.string "It feels great to go that fast, but try\n"
+	.string "not to crash into anyone!$"
+
+Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA: @ 826ECAA
+	.string "Sorry, you can’t walk on CYCLING\n"
+	.string "ROAD. It’s too dangerous.\p"
+	.string "Please come back with a BIKE.$"
+
diff --git a/data/maps/Route110_TrickHouseCorridor/events.inc b/data/maps/Route110_TrickHouseCorridor/events.inc
new file mode 100644
index 000000000..e9d84d56b
--- /dev/null
+++ b/data/maps/Route110_TrickHouseCorridor/events.inc
@@ -0,0 +1,9 @@
+Route110_TrickHouseCorridor_MapWarps: @ 853DF54
+	warp_def 13, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END
+	warp_def 14, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END
+	warp_def 4, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 5, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+
+Route110_TrickHouseCorridor_MapEvents:: @ 853DF74
+	map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc
index b8f569c6a..99a4a694a 100644
--- a/data/maps/Route110_TrickHouseCorridor/header.inc
+++ b/data/maps/Route110_TrickHouseCorridor/header.inc
@@ -1,5 +1,5 @@
 Route110_TrickHouseCorridor: @ 8485B84
-	.4byte Route110_TrickHouseCorridor_MapAttributes
+	.4byte Route110_TrickHouseCorridor_Layout
 	.4byte Route110_TrickHouseCorridor_MapEvents
 	.4byte Route110_TrickHouseCorridor_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc
index cf520c81f..cf520c81f 100644
--- a/data/scripts/maps/Route110_TrickHouseCorridor.inc
+++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc
diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc
new file mode 100644
index 000000000..12659457a
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEnd/events.inc
@@ -0,0 +1,16 @@
+Route110_TrickHouseEnd_EventObjects: @ 853DEFC
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899
+
+Route110_TrickHouseEnd_MapWarps: @ 853DF14
+	warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1
+	warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR
+
+Route110_TrickHouseEnd_MapCoordEvents: @ 853DF24
+	coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_26B041
+
+Route110_TrickHouseEnd_MapBGEvents: @ 853DF34
+	bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0
+
+Route110_TrickHouseEnd_MapEvents:: @ 853DF40
+	map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents
+
diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc
index 7f69874d1..0b38de121 100644
--- a/data/maps/Route110_TrickHouseEnd/header.inc
+++ b/data/maps/Route110_TrickHouseEnd/header.inc
@@ -1,5 +1,5 @@
 Route110_TrickHouseEnd: @ 8485B68
-	.4byte Route110_TrickHouseEnd_MapAttributes
+	.4byte Route110_TrickHouseEnd_Layout
 	.4byte Route110_TrickHouseEnd_MapEvents
 	.4byte Route110_TrickHouseEnd_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
new file mode 100644
index 000000000..4e15ddbe7
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
@@ -0,0 +1,369 @@
+Route110_TrickHouseEnd_MapScripts:: @ 826ACAF
+	map_script 5, Route110_TrickHouseEnd_MapScript1_26ACC4
+	map_script 3, Route110_TrickHouseEnd_MapScript1_26ACD0
+	map_script 2, Route110_TrickHouseEnd_MapScript2_26ACF5
+	map_script 4, Route110_TrickHouseEnd_MapScript2_26ACDE
+	.byte 0
+
+Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4
+	compare VAR_TEMP_1, 1
+	call_if 1, Route110_TrickHouseEnd_EventScript_26AD0D
+	end
+
+Route110_TrickHouseEnd_MapScript1_26ACD0: @ 826ACD0
+	setvar VAR_TEMP_1, 0
+	setvar VAR_TEMP_2, 0
+	special SetTrickHouseEndRoomFlag
+	end
+
+Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE
+	map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26ACE8
+	.2byte 0
+
+Route110_TrickHouseEnd_EventScript_26ACE8:: @ 826ACE8
+	addobject 1
+	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END
+	turnobject 1, 4
+	end
+
+Route110_TrickHouseEnd_MapScript2_26ACF5: @ 826ACF5
+	map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_26ACFF
+	.2byte 0
+
+Route110_TrickHouseEnd_EventScript_26ACFF:: @ 826ACFF
+	setvar VAR_TEMP_1, 1
+	call Route110_TrickHouseEnd_EventScript_26AD0D
+	special DrawWholeMapView
+	end
+
+Route110_TrickHouseEnd_EventScript_26AD0D:: @ 826AD0D
+	setmetatile 10, 1, 539, 1
+	return
+
+Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17
+	lock
+	faceplayer
+	msgbox Route110_TrickHouseEnd_Text_26B08D, 4
+	setvar VAR_TEMP_2, 1
+	switch VAR_0x4044
+	case 0, Route110_TrickHouseEnd_EventScript_26AD84
+	case 1, Route110_TrickHouseEnd_EventScript_26ADC0
+	case 2, Route110_TrickHouseEnd_EventScript_26ADFC
+	case 3, Route110_TrickHouseEnd_EventScript_26AE38
+	case 4, Route110_TrickHouseEnd_EventScript_26AE74
+	case 5, Route110_TrickHouseEnd_EventScript_26AEB0
+	case 6, Route110_TrickHouseEnd_EventScript_26AEEC
+	case 7, Route110_TrickHouseEnd_EventScript_26AF28
+	end
+
+Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84
+	msgbox Route110_TrickHouseEnd_Text_26B0BC, 4
+	msgbox Route110_TrickHouseEnd_Text_26B73D, 4
+	setvar VAR_0x40C1, 0
+	giveitem_std ITEM_RARE_CANDY
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
+	msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
+	closemessage
+	call Route110_TrickHouseEnd_EventScript_26AFCF
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0
+	msgbox Route110_TrickHouseEnd_Text_26B13B, 4
+	msgbox Route110_TrickHouseEnd_Text_26B73D, 4
+	setvar VAR_0x40C1, 0
+	giveitem_std ITEM_TIMER_BALL
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
+	msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
+	closemessage
+	call Route110_TrickHouseEnd_EventScript_26AFCF
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC
+	msgbox Route110_TrickHouseEnd_Text_26B1AD, 4
+	msgbox Route110_TrickHouseEnd_Text_26B73D, 4
+	setvar VAR_0x40C1, 0
+	giveitem_std ITEM_HARD_STONE
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
+	msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
+	closemessage
+	call Route110_TrickHouseEnd_EventScript_26AFCF
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38
+	msgbox Route110_TrickHouseEnd_Text_26B223, 4
+	msgbox Route110_TrickHouseEnd_Text_26B73D, 4
+	setvar VAR_0x40C1, 0
+	giveitem_std ITEM_SMOKE_BALL
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
+	msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
+	closemessage
+	call Route110_TrickHouseEnd_EventScript_26AFCF
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74
+	msgbox Route110_TrickHouseEnd_Text_26B293, 4
+	msgbox Route110_TrickHouseEnd_Text_26B73D, 4
+	setvar VAR_0x40C1, 0
+	giveitem_std ITEM_TM12
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
+	msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
+	closemessage
+	call Route110_TrickHouseEnd_EventScript_26AFCF
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0
+	msgbox Route110_TrickHouseEnd_Text_26B315, 4
+	msgbox Route110_TrickHouseEnd_Text_26B73D, 4
+	setvar VAR_0x40C1, 0
+	giveitem_std ITEM_MAGNET
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
+	msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
+	closemessage
+	call Route110_TrickHouseEnd_EventScript_26AFCF
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC
+	msgbox Route110_TrickHouseEnd_Text_26B365, 4
+	msgbox Route110_TrickHouseEnd_Text_26B73D, 4
+	setvar VAR_0x40C1, 0
+	giveitem_std ITEM_PP_MAX
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
+	msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
+	closemessage
+	call Route110_TrickHouseEnd_EventScript_26AFCF
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28
+	msgbox Route110_TrickHouseEnd_Text_26B3AB, 4
+	closemessage
+	compare VAR_FACING, 1
+	call_if 1, Route110_TrickHouseEnd_EventScript_26B015
+	compare VAR_FACING, 2
+	call_if 1, Route110_TrickHouseEnd_EventScript_26B020
+	compare VAR_FACING, 3
+	call_if 1, Route110_TrickHouseEnd_EventScript_26B02B
+	compare VAR_FACING, 4
+	call_if 1, Route110_TrickHouseEnd_EventScript_26B036
+	delay 30
+	msgbox Route110_TrickHouseEnd_Text_26B3FA, 4
+	closemessage
+	applymovement 1, Route110_TrickHouseEnd_Movement_27259E
+	waitmovement 0
+	delay 30
+	msgbox Route110_TrickHouseEnd_Text_26B485, 4
+	setvar VAR_0x40C1, 0
+	call Route110_TrickHouseEnd_EventScript_26AFA5
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEnd_EventScript_26B002
+	msgbox Route110_TrickHouseEnd_Text_26B69A, 4
+	call Route110_TrickHouseEnd_EventScript_26AFCF
+	special ResetTrickHouseEndRoomFlag
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_26AFA5:: @ 826AFA5
+	multichoice 0, 0, 88, 1
+	switch VAR_RESULT
+	case 0, Route110_TrickHouseEnd_EventScript_26AFBF
+	goto Route110_TrickHouseEnd_EventScript_26AFC7
+
+Route110_TrickHouseEnd_EventScript_26AFBF:: @ 826AFBF
+	givedecoration_std 31
+	return
+
+Route110_TrickHouseEnd_EventScript_26AFC7:: @ 826AFC7
+	givedecoration_std 32
+	return
+
+Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF
+	applymovement 1, Route110_TrickHouseEnd_Movement_269E36
+	waitmovement 0
+	playse SE_W153
+	applymovement 1, Route110_TrickHouseEnd_Movement_269E3F
+	waitmovement 0
+	removeobject 1
+	addvar VAR_0x4044, 1
+	return
+
+Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF
+	call Route110_TrickHouseEnd_EventScript_27205E
+	msgbox Route110_TrickHouseEnd_Text_26B760, 4
+	setvar VAR_0x40C1, 1
+	return
+
+Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002
+	call Route110_TrickHouseEnd_EventScript_272071
+	msgbox Route110_TrickHouseEnd_Text_26B615, 4
+	setvar VAR_0x40C1, 1
+	return
+
+Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015
+	applymovement 1, Route110_TrickHouseEnd_Movement_2725AA
+	waitmovement 0
+	return
+
+Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020
+	applymovement 1, Route110_TrickHouseEnd_Movement_2725A6
+	waitmovement 0
+	return
+
+Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B
+	applymovement 1, Route110_TrickHouseEnd_Movement_2725A4
+	waitmovement 0
+	return
+
+Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036
+	applymovement 1, Route110_TrickHouseEnd_Movement_2725A8
+	waitmovement 0
+	return
+
+Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041
+	lockall
+	turnobject 1, 3
+	playse SE_PIN
+	applymovement 1, Route110_TrickHouseEnd_Movement_272598
+	waitmovement 0
+	delay 20
+	applymovement 1, Route110_TrickHouseEnd_Movement_26B08B
+	waitmovement 0
+	playse SE_W153
+	applymovement 255, Route110_TrickHouseEnd_Movement_2725AA
+	waitmovement 0
+	msgbox Route110_TrickHouseEnd_Text_26B8BD, 4
+	closemessage
+	applymovement 255, Route110_TrickHouseEnd_Movement_26B089
+	waitmovement 0
+	delay 4
+	turnobject 1, 4
+	releaseall
+	end
+
+Route110_TrickHouseEnd_Movement_26B089: @ 826B089
+	walk_down
+	step_end
+
+Route110_TrickHouseEnd_Movement_26B08B: @ 826B08B
+	jump_in_place_left
+	step_end
+
+Route110_TrickHouseEnd_Text_26B08D: @ 826B08D
+	.string "Aak!\n"
+	.string "You’ve made it to me?\l"
+	.string "Hmmm… You’re sharp!$"
+
+Route110_TrickHouseEnd_Text_26B0BC: @ 826B0BC
+	.string "It took me all night to plant all those\n"
+	.string "trees…\p"
+	.string "You’re almost my equal in greatness by\n"
+	.string "one, two, three, four, five, six places!$"
+
+Route110_TrickHouseEnd_Text_26B13B: @ 826B13B
+	.string "It took me all night to make the maze…\p"
+	.string "You’re almost my equal in greatness by\n"
+	.string "one, two, three, four, five places!$"
+
+Route110_TrickHouseEnd_Text_26B1AD: @ 826B1AD
+	.string "It took me all night to prepare\n"
+	.string "the wall panels…\p"
+	.string "You’re almost my equal in greatness by\n"
+	.string "one, two, three, four places!$"
+
+Route110_TrickHouseEnd_Text_26B223: @ 826B223
+	.string "It took me all night to shove in those\n"
+	.string "boulders…\p"
+	.string "You’re almost my equal in greatness by\n"
+	.string "one, two, three places!$"
+
+Route110_TrickHouseEnd_Text_26B293: @ 826B293
+	.string "It took me all night to make MECHADOLLS\n"
+	.string "and another to think up the quiz…\p"
+	.string "You’re almost my equal in greatness by\n"
+	.string "one, two places!$"
+
+Route110_TrickHouseEnd_Text_26B315: @ 826B315
+	.string "It took me all night to install\n"
+	.string "the doors…\p"
+	.string "You’re almost my equal in greatness!$"
+
+Route110_TrickHouseEnd_Text_26B365: @ 826B365
+	.string "It took me all night setting up arrows…\p"
+	.string "You’re my equal in greatness!$"
+
+Route110_TrickHouseEnd_Text_26B3AB: @ 826B3AB
+	.string "It took me all night polishing floors…\p"
+	.string "You’re above me in greatness!\n"
+	.string "Possibly…$"
+
+Route110_TrickHouseEnd_Text_26B3FA: @ 826B3FA
+	.string "Wh-what should I do?\n"
+	.string "My fountain of ideas for tricks has\l"
+	.string "run dry…\p"
+	.string "Perhaps it is time I toured the country\n"
+	.string "on a quest to devise new tricks…$"
+
+Route110_TrickHouseEnd_Text_26B485: @ 826B485
+	.string "I hate to admit defeat, but you have\n"
+	.string "bested me!\p"
+	.string "Still, you must have been reeled in by\n"
+	.string "my charisma for you to visit me again\l"
+	.string "and again. Yes, you must have!\p"
+	.string "But that has nothing to do with my\n"
+	.string "losing!\p"
+	.string "In recognition of the friendship\n"
+	.string "between you, the driven, and the genius\l"
+	.string "that is myself, I demand that you take\l"
+	.string "this keepsake!\p"
+	.string "Actually there are two--\n"
+	.string "a RED TENT and a BLUE TENT.\l"
+	.string "Which do you prefer?$"
+
+Route110_TrickHouseEnd_Text_26B615: @ 826B615
+	.string "What? No room in your PC?\n"
+	.string "What am I to make of that?\p"
+	.string "I wish I could say that, but I am much\n"
+	.string "too kind and caring, so come back later!$"
+
+Route110_TrickHouseEnd_Text_26B69A: @ 826B69A
+	.string "… … … … … …\p"
+	.string "I am leaving on a journey of discovery.\n"
+	.string "A quest in search of new tricks.\p"
+	.string "I wish that you will one day visit and\n"
+	.string "entertain me again.\p"
+	.string "And now, farewell!$"
+
+Route110_TrickHouseEnd_Text_26B73D: @ 826B73D
+	.string "Fine!\n"
+	.string "You have earned this reward!$"
+
+Route110_TrickHouseEnd_Text_26B760: @ 826B760
+	.string "What? Have you no room for this?\n"
+	.string "What manner of items do you carry?\p"
+	.string "But fine, since you’ve reached me,\n"
+	.string "your reward will be with me till later.$"
+
+Route110_TrickHouseEnd_Text_26B7EF: @ 826B7EF
+	.string "Scrub that smug smirk from your face!\n"
+	.string "It’s much too early to think you’ve won!\p"
+	.string "I’ll make new tricks to stump you, I will.\n"
+	.string "You may mock me only when you’re done.\p"
+	.string "Come back for the next exciting\n"
+	.string "installment!$"
+
+Route110_TrickHouseEnd_Text_26B8BD: @ 826B8BD
+	.string "Now, now! You’re ignoring me now?\n"
+	.string "Now that, I consider heartbreaking!$"
+
diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc
new file mode 100644
index 000000000..30a6892df
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEntrance/events.inc
@@ -0,0 +1,20 @@
+Route110_TrickHouseEntrance_EventObjects: @ 853DE6C
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872
+
+Route110_TrickHouseEntrance_MapWarps: @ 853DE84
+	warp_def 5, 7, 3, 1, MAP_ROUTE110
+	warp_def 6, 7, 3, 1, MAP_ROUTE110
+	warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1
+
+Route110_TrickHouseEntrance_MapCoordEvents: @ 853DE9C
+	coord_event 4, 7, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
+	coord_event 5, 6, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
+	coord_event 6, 6, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
+	coord_event 7, 7, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
+
+Route110_TrickHouseEntrance_MapBGEvents: @ 853DEDC
+	bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_26A0D3
+
+Route110_TrickHouseEntrance_MapEvents:: @ 853DEE8
+	map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents
+
diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc
index f3aa39cc5..842b2f32d 100644
--- a/data/maps/Route110_TrickHouseEntrance/header.inc
+++ b/data/maps/Route110_TrickHouseEntrance/header.inc
@@ -1,5 +1,5 @@
 Route110_TrickHouseEntrance: @ 8485B4C
-	.4byte Route110_TrickHouseEntrance_MapAttributes
+	.4byte Route110_TrickHouseEntrance_Layout
 	.4byte Route110_TrickHouseEntrance_MapEvents
 	.4byte Route110_TrickHouseEntrance_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
new file mode 100644
index 000000000..859a28d6a
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -0,0 +1,901 @@
+Route110_TrickHouseEntrance_MapScripts:: @ 8269A50
+	map_script 3, Route110_TrickHouseEntrance_MapScript1_269A60
+	map_script 2, Route110_TrickHouseEntrance_MapScript2_269CEE
+	map_script 4, Route110_TrickHouseEntrance_MapScript2_269BD3
+	.byte 0
+
+Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60
+	setflag FLAG_LANDMARK_TRICK_HOUSE
+	compare VAR_0x40B5, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_269AF3
+	compare VAR_0x40C1, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_269AD7
+	compare VAR_0x40A6, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_269BB3
+	compare VAR_0x40A7, 5
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269B03
+	compare VAR_0x40A7, 3
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269B03
+	compare VAR_0x40A7, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269B03
+	switch VAR_0x40A7
+	case 0, Route110_TrickHouseEntrance_EventScript_269BBB
+	case 1, Route110_TrickHouseEntrance_EventScript_269BC1
+	case 3, Route110_TrickHouseEntrance_EventScript_269BC7
+	case 4, Route110_TrickHouseEntrance_EventScript_269BCD
+	end
+
+Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7
+	setvar VAR_0x40A5, 1
+	compare VAR_0x4044, 8
+	goto_eq Route110_TrickHouseEntrance_EventScript_269AED
+	setvar VAR_0x40A7, 2
+	end
+
+Route110_TrickHouseEntrance_EventScript_269AED:: @ 8269AED
+	setvar VAR_0x40A7, 6
+	end
+
+Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3
+	setvar VAR_0x40B5, 0
+	setvar VAR_0x40A7, 5
+	setvar VAR_0x40A5, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03
+	setvar VAR_0x40A7, 0
+	compare VAR_0x4044, 1
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269B61
+	compare VAR_0x4044, 2
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269B6B
+	compare VAR_0x4044, 3
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269B75
+	compare VAR_0x4044, 4
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269B7F
+	compare VAR_0x4044, 5
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269B89
+	compare VAR_0x4044, 6
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269B93
+	compare VAR_0x4044, 7
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269B9D
+	compare VAR_0x4044, 8
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269BA7
+	return
+
+Route110_TrickHouseEntrance_EventScript_269B61:: @ 8269B61
+	checkflag FLAG_BADGE03_GET
+	call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD
+	return
+
+Route110_TrickHouseEntrance_EventScript_269B6B:: @ 8269B6B
+	checkflag FLAG_BADGE04_GET
+	call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD
+	return
+
+Route110_TrickHouseEntrance_EventScript_269B75:: @ 8269B75
+	checkflag FLAG_BADGE05_GET
+	call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD
+	return
+
+Route110_TrickHouseEntrance_EventScript_269B7F:: @ 8269B7F
+	checkflag FLAG_BADGE06_GET
+	call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD
+	return
+
+Route110_TrickHouseEntrance_EventScript_269B89:: @ 8269B89
+	checkflag FLAG_BADGE07_GET
+	call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD
+	return
+
+Route110_TrickHouseEntrance_EventScript_269B93:: @ 8269B93
+	checkflag FLAG_BADGE08_GET
+	call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD
+	return
+
+Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D
+	checkflag FLAG_SYS_GAME_CLEAR
+	call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD
+	return
+
+Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7
+	setvar VAR_0x40A7, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_269BAD:: @ 8269BAD
+	setvar VAR_0x40A7, 3
+	return
+
+Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3
+	setobjectxyperm 1, 5, 2
+	end
+
+Route110_TrickHouseEntrance_EventScript_269BBB:: @ 8269BBB
+	setvar VAR_0x40A5, 0
+	end
+
+Route110_TrickHouseEntrance_EventScript_269BC1:: @ 8269BC1
+	setvar VAR_0x40A5, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_269BC7:: @ 8269BC7
+	setvar VAR_0x40A5, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_269BCD:: @ 8269BCD
+	setvar VAR_0x40A5, 1
+	end
+
+Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3
+	map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269C15
+	map_script_2 VAR_0x40A7, 0, Route110_TrickHouseEntrance_EventScript_269C26
+	map_script_2 VAR_0x40A7, 1, Route110_TrickHouseEntrance_EventScript_269CCC
+	map_script_2 VAR_0x40A7, 2, Route110_TrickHouseEntrance_EventScript_269CD0
+	map_script_2 VAR_0x40A7, 3, Route110_TrickHouseEntrance_EventScript_269CD0
+	map_script_2 VAR_0x40A7, 4, Route110_TrickHouseEntrance_EventScript_269CCC
+	map_script_2 VAR_0x40A7, 5, Route110_TrickHouseEntrance_EventScript_269CCC
+	map_script_2 VAR_0x40A7, 6, Route110_TrickHouseEntrance_EventScript_269CDF
+	.2byte 0
+
+Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15
+	addobject 1
+	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	turnobject 1, 4
+	turnobject 255, 3
+	end
+
+Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26
+	addobject 1
+	hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	switch VAR_0x4044
+	case 0, Route110_TrickHouseEntrance_EventScript_269C8C
+	case 1, Route110_TrickHouseEntrance_EventScript_269C94
+	case 2, Route110_TrickHouseEntrance_EventScript_269C9C
+	case 3, Route110_TrickHouseEntrance_EventScript_269CA4
+	case 4, Route110_TrickHouseEntrance_EventScript_269CAC
+	case 5, Route110_TrickHouseEntrance_EventScript_269CB4
+	case 6, Route110_TrickHouseEntrance_EventScript_269CBC
+	case 7, Route110_TrickHouseEntrance_EventScript_269CC4
+	end
+
+Route110_TrickHouseEntrance_EventScript_269C8C:: @ 8269C8C
+	setobjectxy 1, 6, 3
+	end
+
+Route110_TrickHouseEntrance_EventScript_269C94:: @ 8269C94
+	setobjectxy 1, 11, 5
+	end
+
+Route110_TrickHouseEntrance_EventScript_269C9C:: @ 8269C9C
+	setobjectxy 1, 9, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_269CA4:: @ 8269CA4
+	setobjectxy 1, 3, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_269CAC:: @ 8269CAC
+	setobjectxy 1, 0, 5
+	end
+
+Route110_TrickHouseEntrance_EventScript_269CB4:: @ 8269CB4
+	setobjectxy 1, 11, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_269CBC:: @ 8269CBC
+	setobjectxy 1, 8, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_269CC4:: @ 8269CC4
+	setobjectxy 1, 4, 4
+	end
+
+Route110_TrickHouseEntrance_EventScript_269CCC:: @ 8269CCC
+	removeobject 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_269CD0:: @ 8269CD0
+	addobject 1
+	setobjectxy 1, 5, 2
+	turnobject 1, 2
+	end
+
+Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF
+	addobject 1
+	setobjectxy 1, 5, 2
+	turnobject 1, 1
+	end
+
+Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE
+	map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269CF8
+	.2byte 0
+
+Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8
+	lockall
+	delay 20
+	compare VAR_0x4044, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269E48
+	msgbox Route110_TrickHouseEntrance_Text_26A78C, 4
+	closemessage
+	delay 20
+	applymovement 1, Route110_TrickHouseEntrance_Movement_269E36
+	waitmovement 0
+	playse SE_W153
+	applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
+	waitmovement 0
+	removeobject 1
+	setvar VAR_0x40A7, 1
+	setvar VAR_0x40A6, 0
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269D39:: @ 8269D39
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B
+	lockall
+	switch VAR_0x40A7
+	case 0, Route110_TrickHouseEntrance_EventScript_269D6E
+	case 2, Route110_TrickHouseEntrance_EventScript_269E8F
+	case 3, Route110_TrickHouseEntrance_EventScript_269E51
+	case 6, Route110_TrickHouseEntrance_EventScript_26A039
+	end
+
+Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E
+	playse SE_PIN
+	applymovement 255, Route110_TrickHouseEntrance_Movement_272598
+	waitmovement 0
+	applymovement 255, Route110_TrickHouseEntrance_Movement_27259A
+	waitmovement 0
+	compare VAR_0x4044, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269DEE
+	compare VAR_0x4044, 1
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269DF7
+	compare VAR_0x4044, 2
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269E00
+	compare VAR_0x4044, 3
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269E09
+	compare VAR_0x4044, 4
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269E12
+	compare VAR_0x4044, 5
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269E1B
+	compare VAR_0x4044, 6
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269E24
+	compare VAR_0x4044, 7
+	call_if 1, Route110_TrickHouseEntrance_EventScript_269E2D
+	closemessage
+	setvar VAR_0x40A6, 1
+	warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269DEE:: @ 8269DEE
+	msgbox Route110_TrickHouseEntrance_Text_26A48A, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_269DF7:: @ 8269DF7
+	msgbox Route110_TrickHouseEntrance_Text_26A4DA, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_269E00:: @ 8269E00
+	msgbox Route110_TrickHouseEntrance_Text_26A529, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_269E09:: @ 8269E09
+	msgbox Route110_TrickHouseEntrance_Text_26A577, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_269E12:: @ 8269E12
+	msgbox Route110_TrickHouseEntrance_Text_26A5C8, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_269E1B:: @ 8269E1B
+	msgbox Route110_TrickHouseEntrance_Text_26A616, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_269E24:: @ 8269E24
+	msgbox Route110_TrickHouseEntrance_Text_26A665, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D
+	msgbox Route110_TrickHouseEntrance_Text_26A6B6, 4
+	return
+
+Route110_TrickHouseEnd_Movement_269E36: @ 8269E36
+Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36
+	face_up
+	delay_4
+	face_left
+	delay_4
+	face_down
+	delay_4
+	face_right
+	delay_4
+	step_end
+
+Route110_TrickHouseEnd_Movement_269E3F: @ 8269E3F
+Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F
+	face_up
+	disable_anim
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	step_end
+
+Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48
+	msgbox Route110_TrickHouseEntrance_Text_26A709, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51
+	msgbox Route110_TrickHouseEntrance_Text_26A921, 4
+	closemessage
+	applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, Route110_TrickHouseEntrance_Movement_272598
+	waitmovement 0
+	applymovement 1, Route110_TrickHouseEntrance_Movement_27259A
+	waitmovement 0
+	msgbox Route110_TrickHouseEntrance_Text_26A9AF, 4
+	applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6
+	waitmovement 0
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F
+	applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
+	waitmovement 0
+	msgbox Route110_TrickHouseEntrance_Text_26AA82, 4
+	compare VAR_0x4044, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_269EEF
+	compare VAR_0x4044, 2
+	goto_eq Route110_TrickHouseEntrance_EventScript_269F1B
+	compare VAR_0x4044, 3
+	goto_eq Route110_TrickHouseEntrance_EventScript_269F47
+	compare VAR_0x4044, 4
+	goto_eq Route110_TrickHouseEntrance_EventScript_269F73
+	compare VAR_0x4044, 5
+	goto_eq Route110_TrickHouseEntrance_EventScript_269F9F
+	compare VAR_0x4044, 6
+	goto_eq Route110_TrickHouseEntrance_EventScript_269FCB
+	compare VAR_0x4044, 7
+	goto_eq Route110_TrickHouseEntrance_EventScript_269FF7
+	end
+
+Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF
+	giveitem_std ITEM_RARE_CANDY
+	compare VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
+	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B
+	giveitem_std ITEM_TIMER_BALL
+	compare VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
+	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47
+	giveitem_std ITEM_HARD_STONE
+	compare VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
+	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73
+	giveitem_std ITEM_SMOKE_BALL
+	compare VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
+	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F
+	giveitem_std ITEM_TM12
+	compare VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
+	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB
+	giveitem_std ITEM_MAGNET
+	compare VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
+	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7
+	giveitem_std ITEM_PP_MAX
+	compare VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
+	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023
+	setvar VAR_0x40C1, 0
+	setvar VAR_0x40A7, 3
+	applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6
+	waitmovement 0
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039
+	applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
+	waitmovement 0
+	msgbox Route110_TrickHouseEntrance_Text_26AB2C, 4
+	call Route110_TrickHouseEntrance_EventScript_26A070
+	compare VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A09A
+	compare VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_272071
+	msgbox Route110_TrickHouseEntrance_Text_26ABBD, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A070:: @ 826A070
+	multichoice 0, 0, 88, 1
+	switch VAR_RESULT
+	case 0, Route110_TrickHouseEntrance_EventScript_26A08A
+	goto Route110_TrickHouseEntrance_EventScript_26A092
+
+Route110_TrickHouseEntrance_EventScript_26A08A:: @ 826A08A
+	givedecoration_std 31
+	return
+
+Route110_TrickHouseEntrance_EventScript_26A092:: @ 826A092
+	givedecoration_std 32
+	return
+
+Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A
+	msgbox Route110_TrickHouseEntrance_Text_26ABAE, 4
+	closemessage
+	applymovement 1, Route110_TrickHouseEntrance_Movement_26D632
+	waitmovement 0
+	applymovement 1, Route110_TrickHouseEntrance_Movement_269E36
+	waitmovement 0
+	playse SE_W153
+	applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
+	waitmovement 0
+	removeobject 1
+	setvar VAR_0x40C1, 0
+	setvar VAR_0x40A7, 5
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3
+	lockall
+	switch VAR_0x40A7
+	case 0, Route110_TrickHouseEntrance_EventScript_26A106
+	case 1, Route110_TrickHouseEntrance_EventScript_26A110
+	case 4, Route110_TrickHouseEntrance_EventScript_26A201
+	case 5, Route110_TrickHouseEntrance_EventScript_26A20B
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A106:: @ 826A106
+	msgbox Route110_TrickHouseEntrance_Text_26A878, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110
+	msgbox Route110_TrickHouseEntrance_Text_26A887, 5
+	closemessage
+	compare VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A126
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126
+	setmetatile 5, 1, 537, 0
+	special DrawWholeMapView
+	delay 20
+	applymovement 255, Route110_TrickHouseEntrance_Movement_2725C9
+	waitmovement 0
+	applymovement 255, Route110_TrickHouseEntrance_Movement_26A1A7
+	waitmovement 0
+	switch VAR_0x4044
+	case 0, Route110_TrickHouseEntrance_EventScript_26A1A9
+	case 1, Route110_TrickHouseEntrance_EventScript_26A1B4
+	case 2, Route110_TrickHouseEntrance_EventScript_26A1BF
+	case 3, Route110_TrickHouseEntrance_EventScript_26A1CA
+	case 4, Route110_TrickHouseEntrance_EventScript_26A1D5
+	case 5, Route110_TrickHouseEntrance_EventScript_26A1E0
+	case 6, Route110_TrickHouseEntrance_EventScript_26A1EB
+	case 7, Route110_TrickHouseEntrance_EventScript_26A1F6
+	end
+
+Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7
+	set_invisible
+	step_end
+
+Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A1B4:: @ 826A1B4
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A1BF:: @ 826A1BF
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A1CA:: @ 826A1CA
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A1D5:: @ 826A1D5
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A1E0:: @ 826A1E0
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A1EB:: @ 826A1EB
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A1F6:: @ 826A1F6
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201
+	msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B
+	compare VAR_0x4044, 8
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A220
+	msgbox Route110_TrickHouseEntrance_Text_26A878, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220
+	msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A
+	lockall
+	switch VAR_0x4044
+	case 0, Route110_TrickHouseEntrance_EventScript_26A289
+	case 1, Route110_TrickHouseEntrance_EventScript_26A2B2
+	case 2, Route110_TrickHouseEntrance_EventScript_26A2DB
+	case 3, Route110_TrickHouseEntrance_EventScript_26A304
+	case 4, Route110_TrickHouseEntrance_EventScript_26A32D
+	case 5, Route110_TrickHouseEntrance_EventScript_26A356
+	case 6, Route110_TrickHouseEntrance_EventScript_26A37F
+	case 7, Route110_TrickHouseEntrance_EventScript_26A3A8
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289
+	compare VAR_0x40AB, 0
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
+	msgbox Route110_TrickHousePuzzle1_Text_26B98D, 4
+	playse SE_PIN
+	setvar VAR_0x40AB, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2
+	compare VAR_0x40AC, 0
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
+	msgbox Route110_TrickHousePuzzle2_Text_26BCBA, 4
+	playse SE_PIN
+	setvar VAR_0x40AC, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB
+	compare VAR_0x40AD, 0
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
+	msgbox Route110_TrickHousePuzzle3_Text_26C609, 4
+	playse SE_PIN
+	setvar VAR_0x40AD, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304
+	compare VAR_0x40AE, 0
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
+	msgbox Route110_TrickHousePuzzle4_Text_26C8C3, 4
+	playse SE_PIN
+	setvar VAR_0x40AE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D
+	compare VAR_0x40AF, 0
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
+	msgbox Route110_TrickHousePuzzle5_Text_26D660, 4
+	playse SE_PIN
+	setvar VAR_0x40AF, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356
+	compare VAR_0x40B0, 0
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
+	msgbox Route110_TrickHousePuzzle6_Text_26DE26, 4
+	playse SE_PIN
+	setvar VAR_0x40B0, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F
+	compare VAR_0x40B1, 0
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
+	msgbox Route110_TrickHousePuzzle7_EventScript_26E413, 4
+	playse SE_PIN
+	setvar VAR_0x40B1, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8
+	compare VAR_0x40B2, 0
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
+	msgbox Route110_TrickHousePuzzle8_EventScript_26E864, 4
+	playse SE_PIN
+	setvar VAR_0x40B2, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A3D1:: @ 826A3D1
+	msgbox Route110_TrickHouseEntrance_Text_26AC4F, 4
+	releaseall
+	end
+
+Route110_TrickHousePuzzle1_EventScript_26A3DB:: @ 826A3DB
+Route110_TrickHousePuzzle2_EventScript_26A3DB:: @ 826A3DB
+Route110_TrickHousePuzzle3_EventScript_26A3DB:: @ 826A3DB
+Route110_TrickHousePuzzle4_EventScript_26A3DB:: @ 826A3DB
+Route110_TrickHousePuzzle5_EventScript_26A3DB:: @ 826A3DB
+Route110_TrickHousePuzzle6_EventScript_26A3DB:: @ 826A3DB
+Route110_TrickHousePuzzle7_EventScript_26A3DB:: @ 826A3DB
+Route110_TrickHousePuzzle8_EventScript_26A3DB:: @ 826A3DB
+	msgbox Route110_TrickHousePuzzle1_Text_26AC2F, 4
+	releaseall
+	end
+
+Route110_TrickHousePuzzle1_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle2_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle3_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle4_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle5_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle6_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle7_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle8_EventScript_26A3E5:: @ 826A3E5
+	playfanfare MUS_FANFA4
+	message Route110_TrickHousePuzzle1_Text_26ABE8
+	waitfanfare
+	msgbox Route110_TrickHousePuzzle1_Text_26ABFB, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8
+	lockall
+	msgbox Route110_TrickHouseEntrance_Text_26A474, 4
+	releaseall
+	compare VAR_0x4044, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_26A429
+	compare VAR_0x4044, 1
+	call_if 1, Route110_TrickHouseEntrance_EventScript_26A439
+	compare VAR_0x4044, 2
+	call_if 1, Route110_TrickHouseEntrance_EventScript_26A449
+	setvar VAR_0x40A5, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A429:: @ 826A429
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 3
+	call Route110_TrickHouseEntrance_EventScript_26A459
+	return
+
+Route110_TrickHouseEntrance_EventScript_26A439:: @ 826A439
+	setvar VAR_0x8004, 11
+	setvar VAR_0x8005, 5
+	call Route110_TrickHouseEntrance_EventScript_26A459
+	return
+
+Route110_TrickHouseEntrance_EventScript_26A449:: @ 826A449
+	setvar VAR_0x8004, 9
+	setvar VAR_0x8005, 2
+	call Route110_TrickHouseEntrance_EventScript_26A459
+	return
+
+Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459
+	setvar VAR_0x8006, 0
+	setfieldeffectargument 0, VAR_0x8004
+	setfieldeffectargument 1, VAR_0x8005
+	setfieldeffectargument 2, VAR_0x8006
+	dofieldeffect 54
+	waitfieldeffect 54
+	delay 10
+	return
+
+Route110_TrickHouseEntrance_Text_26A474: @ 826A474
+	.string "You’re being watched…$"
+
+Route110_TrickHouseEntrance_Text_26A48A: @ 826A48A
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "beneath this desk? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A4DA: @ 826A4DA
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "behind this tree? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A529: @ 826A529
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "in this dresser? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A577: @ 826A577
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "beyond this window? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A5C8: @ 826A5C8
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "in this planter? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A616: @ 826A616
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "in this cupboard? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A665: @ 826A665
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "behind this window? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A6B6: @ 826A6B6
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "beneath this cushion? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A709: @ 826A709
+	.string "Behold!\p"
+	.string "For I am the greatest living mystery\n"
+	.string "of a man in all of HOENN!\l"
+	.string "They call me…\p"
+	.string "The TRICK MASTER!\n"
+	.string "Wahahaha! Glad to meet you!$"
+
+Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C
+	.string "You, you’ve come to challenge\n"
+	.string "my TRICK HOUSE, haven’t you?\p"
+	.string "That’s why you’re here, isn’t it?\n"
+	.string "Yes, it is!\p"
+	.string "Consider your challenge accepted!\p"
+	.string "Enter through the scroll there,\n"
+	.string "and let your challenge commence!\p"
+	.string "I shall be waiting in the back!$"
+
+Route110_TrickHouseEntrance_Text_26A878: @ 826A878
+	.string "It’s a scroll.$"
+
+Route110_TrickHouseEntrance_Text_26A887: @ 826A887
+	.string "There is a big hole behind the scroll!\p"
+	.string "Want to go in?$"
+
+Route110_TrickHouseEntrance_Text_26A8BD: @ 826A8BD
+	.string "There is a note affixed to the scroll…\p"
+	.string "“I am leaving on a journey.\n"
+	.string "Don’t look for me. TRICK MASTER”$"
+
+Route110_TrickHouseEntrance_Text_26A921: @ 826A921
+	.string "For the next time, I’ll use this trick,\n"
+	.string "and that scheme, and those ruses…\p"
+	.string "Mufufufu… If I may say so, it’s\n"
+	.string "brilliantly difficult, even for me!$"
+
+Route110_TrickHouseEntrance_Text_26A9AF: @ 826A9AF
+	.string "Hah? What?!\n"
+	.string "Oh, it’s you!\p"
+	.string "I’m in the midst of devising new tricky\n"
+	.string "challenges!\p"
+	.string "It’s not too much to ask for a bit more\n"
+	.string "time for me to think, is it now?\l"
+	.string "You wouldn’t begrudge me that?\l"
+	.string "Come back in a little while!$"
+
+Route110_TrickHouseEntrance_Text_26AA82: @ 826AA82
+	.string "Ah, it’s you! You’re here to accept the\n"
+	.string "reward from before, isn’t that right?\l"
+	.string "Yes, right I am!\p"
+	.string "Here!\n"
+	.string "I’ll give it to you now!$"
+
+Route110_TrickHouseEntrance_Text_26AB00: @ 826AB00
+	.string "Hah?\n"
+	.string "Did you not come to claim your reward?$"
+
+Route110_TrickHouseEntrance_Text_26AB2C: @ 826AB2C
+	.string "MECHADOLL 5 I AM!\n"
+	.string "IF REWARD IS NOT TAKEN BY YOU,\l"
+	.string "THEN TRICK MASTER YOU CANNOT FOLLOW.\p"
+	.string "RED TENT OR BLUE TENT,\n"
+	.string "WHICH DO YOU PREFER?$"
+
+Route110_TrickHouseEntrance_Text_26ABAE: @ 826ABAE
+	.string "THEN FAREWELL.$"
+
+Route110_TrickHouseEntrance_Text_26ABBD: @ 826ABBD
+	.string "YOUR PC STATUS: FULL AGAIN.\n"
+	.string "MEAN, YOU ARE.$"
+
+Route110_TrickHousePuzzle1_Text_26ABE8: @ 826ABE8
+	.string "{PLAYER} found a scroll.$"
+
+Route110_TrickHousePuzzle1_Text_26ABFB: @ 826ABFB
+	.string "{PLAYER} memorized the secret code\n"
+	.string "written on the scroll.$"
+
+Route110_TrickHousePuzzle1_Text_26AC2F: @ 826AC2F
+	.string "A secret code is written on it.$"
+
+Route110_TrickHouseEntrance_Text_26AC4F: @ 826AC4F
+	.string "The door is locked.\p"
+	.string "…On closer inspection, this is written\n"
+	.string "on it: “Write the secret code here.”$"
diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc
new file mode 100644
index 000000000..05824aa38
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle1/events.inc
@@ -0,0 +1,28 @@
+Route110_TrickHousePuzzle1_EventObjects: @ 853DF88
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, 9, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0
+	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19
+	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18
+	object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20
+	object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23
+	object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22
+	object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21
+	object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25
+	object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30
+
+Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle1_MapBGEvents: @ 853E108
+	bg_event 3, 16, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_26B92B
+
+Route110_TrickHousePuzzle1_MapEvents:: @ 853E114
+	map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents
+
diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc
index ff78e3652..ef5388364 100644
--- a/data/maps/Route110_TrickHousePuzzle1/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/header.inc
@@ -1,5 +1,5 @@
 Route110_TrickHousePuzzle1: @ 8485BA0
-	.4byte Route110_TrickHousePuzzle1_MapAttributes
+	.4byte Route110_TrickHousePuzzle1_Layout
 	.4byte Route110_TrickHousePuzzle1_MapEvents
 	.4byte Route110_TrickHousePuzzle1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
index 340a7e03c..340a7e03c 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc
new file mode 100644
index 000000000..a7259e3b3
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle2/events.inc
@@ -0,0 +1,24 @@
+Route110_TrickHousePuzzle2_EventObjects: @ 853E128
+	object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, 8, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061
+
+Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle2_MapCoordEvents: @ 853E1B8
+	coord_event 11, 12, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD
+	coord_event 0, 4, 0, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0
+	coord_event 14, 5, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BC03
+	coord_event 7, 11, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BC16
+
+Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8
+	bg_event 14, 14, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBC0
+
+Route110_TrickHousePuzzle2_MapEvents:: @ 853E204
+	map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents
+
diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc
index 25aa8b8dc..d54eb7752 100644
--- a/data/maps/Route110_TrickHousePuzzle2/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/header.inc
@@ -1,5 +1,5 @@
 Route110_TrickHousePuzzle2: @ 8485BBC
-	.4byte Route110_TrickHousePuzzle2_MapAttributes
+	.4byte Route110_TrickHousePuzzle2_Layout
 	.4byte Route110_TrickHousePuzzle2_MapEvents
 	.4byte Route110_TrickHousePuzzle2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
index b724b986d..b724b986d 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc
new file mode 100644
index 000000000..2f95cf052
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle3/events.inc
@@ -0,0 +1,26 @@
+Route110_TrickHousePuzzle3_EventObjects: @ 853E218
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0
+	object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0
+	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, 1, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, 1, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22
+
+Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle3_MapCoordEvents: @ 853E2D8
+	coord_event 4, 14, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD
+	coord_event 3, 11, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9
+	coord_event 12, 5, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5
+	coord_event 8, 2, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1
+
+Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318
+	bg_event 0, 14, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C5A7
+
+Route110_TrickHousePuzzle3_MapEvents:: @ 853E324
+	map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents
+
diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc
index 9cd8c45be..3bcf40de1 100644
--- a/data/maps/Route110_TrickHousePuzzle3/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/header.inc
@@ -1,5 +1,5 @@
 Route110_TrickHousePuzzle3: @ 8485BD8
-	.4byte Route110_TrickHousePuzzle3_MapAttributes
+	.4byte Route110_TrickHousePuzzle3_Layout
 	.4byte Route110_TrickHousePuzzle3_MapEvents
 	.4byte Route110_TrickHousePuzzle3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
index 9956f9889..9956f9889 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc
new file mode 100644
index 000000000..b0dd3abf6
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle4/events.inc
@@ -0,0 +1,27 @@
+Route110_TrickHousePuzzle4_EventObjects: @ 853E338
+	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21
+	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22
+	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23
+	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24
+	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25
+	object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26
+
+Route110_TrickHousePuzzle4_MapWarps: @ 853E488
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle4_MapBGEvents: @ 853E4A0
+	bg_event 14, 13, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_26C861
+
+Route110_TrickHousePuzzle4_MapEvents:: @ 853E4AC
+	map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents
+
diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc
index c928f08f3..85df95a1a 100644
--- a/data/maps/Route110_TrickHousePuzzle4/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/header.inc
@@ -1,5 +1,5 @@
 Route110_TrickHousePuzzle4: @ 8485BF4
-	.4byte Route110_TrickHousePuzzle4_MapAttributes
+	.4byte Route110_TrickHousePuzzle4_Layout
 	.4byte Route110_TrickHousePuzzle4_MapEvents
 	.4byte Route110_TrickHousePuzzle4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
index 56b4b02fb..56b4b02fb 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc
new file mode 100644
index 000000000..8da7daf11
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle5/events.inc
@@ -0,0 +1,42 @@
+Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 17, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0
+
+Route110_TrickHousePuzzle5_MapWarps: @ 853E538
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle5_MapCoordEvents: @ 853E550
+	coord_event 5, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7
+	coord_event 4, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3
+	coord_event 3, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF
+	coord_event 2, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBFB
+	coord_event 1, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC13
+	coord_event 2, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC1F
+	coord_event 13, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC5B
+	coord_event 12, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC67
+	coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC73
+	coord_event 13, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC97
+	coord_event 12, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCA3
+	coord_event 11, 4, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCDF
+	coord_event 1, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC07
+	coord_event 3, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC2B
+	coord_event 4, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC37
+	coord_event 5, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC43
+	coord_event 6, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC4F
+	coord_event 10, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC7F
+	coord_event 9, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC8B
+	coord_event 11, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCAF
+	coord_event 10, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB
+	coord_event 9, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7
+
+Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0
+	bg_event 11, 21, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB15
+
+Route110_TrickHousePuzzle5_MapEvents:: @ 853E6BC
+	map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents
+
diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc
index d8b57d744..2402f4cc5 100644
--- a/data/maps/Route110_TrickHousePuzzle5/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/header.inc
@@ -1,5 +1,5 @@
 Route110_TrickHousePuzzle5: @ 8485C10
-	.4byte Route110_TrickHousePuzzle5_MapAttributes
+	.4byte Route110_TrickHousePuzzle5_Layout
 	.4byte Route110_TrickHousePuzzle5_MapEvents
 	.4byte Route110_TrickHousePuzzle5_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
new file mode 100644
index 000000000..5afce1c88
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
@@ -0,0 +1,1091 @@
+Route110_TrickHousePuzzle5_MapScripts:: @ 826CAF0
+	map_script 3, Route110_TrickHousePuzzle5_MapScript1_26CAF6
+	.byte 0
+
+Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6
+	setvar VAR_TEMP_1, 0
+	setvar VAR_TEMP_2, 0
+	setvar VAR_TEMP_3, 0
+	setvar VAR_TEMP_4, 0
+	setvar VAR_TEMP_5, 0
+	setvar VAR_TEMP_8, 0
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15
+	lockall
+	compare VAR_0x40AF, 0
+	goto_eq Route110_TrickHousePuzzle5_EventScript_26CB27
+	goto Route110_TrickHousePuzzle5_EventScript_26A3DB
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27
+	setvar VAR_0x40AF, 1
+	goto Route110_TrickHousePuzzle5_EventScript_26A3E5
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32
+	lockall
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E
+	waitmovement 0
+	compare VAR_TEMP_1, 1
+	goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53
+	lockall
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E
+	waitmovement 0
+	compare VAR_TEMP_2, 1
+	goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74
+	lockall
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E
+	waitmovement 0
+	compare VAR_TEMP_3, 1
+	goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95
+	lockall
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E
+	waitmovement 0
+	compare VAR_TEMP_4, 1
+	goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6
+	lockall
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E
+	waitmovement 0
+	compare VAR_TEMP_5, 1
+	goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_26CEF2
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CBD7:: @ 826CBD7
+	lockall
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CBE3:: @ 826CBE3
+	lockall
+	setvar VAR_TEMP_9, 1
+	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CBEF:: @ 826CBEF
+	lockall
+	setvar VAR_TEMP_9, 2
+	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CBFB:: @ 826CBFB
+	lockall
+	setvar VAR_TEMP_9, 3
+	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CC07:: @ 826CC07
+	lockall
+	setvar VAR_TEMP_9, 4
+	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CC13:: @ 826CC13
+	lockall
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CC1F:: @ 826CC1F
+	lockall
+	setvar VAR_TEMP_9, 1
+	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CC2B:: @ 826CC2B
+	lockall
+	setvar VAR_TEMP_9, 2
+	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CC37:: @ 826CC37
+	lockall
+	setvar VAR_TEMP_9, 3
+	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CC43:: @ 826CC43
+	lockall
+	setvar VAR_TEMP_9, 4
+	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CC4F:: @ 826CC4F
+	lockall
+	setvar VAR_TEMP_9, 5
+	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CC5B:: @ 826CC5B
+	lockall
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CC67:: @ 826CC67
+	lockall
+	setvar VAR_TEMP_9, 1
+	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CC73:: @ 826CC73
+	lockall
+	setvar VAR_TEMP_9, 2
+	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CC7F:: @ 826CC7F
+	lockall
+	setvar VAR_TEMP_9, 3
+	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CC8B:: @ 826CC8B
+	lockall
+	setvar VAR_TEMP_9, 4
+	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CC97:: @ 826CC97
+	lockall
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CCA3:: @ 826CCA3
+	lockall
+	setvar VAR_TEMP_9, 1
+	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CCAF:: @ 826CCAF
+	lockall
+	setvar VAR_TEMP_9, 2
+	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CCBB:: @ 826CCBB
+	lockall
+	setvar VAR_TEMP_9, 3
+	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CCC7:: @ 826CCC7
+	lockall
+	setvar VAR_TEMP_9, 4
+	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CCD3:: @ 826CCD3
+	lockall
+	setvar VAR_TEMP_9, 5
+	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CCDF:: @ 826CCDF
+	lockall
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_26CEF2
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB
+	setvar VAR_TEMP_1, 1
+	setvar VAR_TEMP_8, 1
+	playse SE_PIN
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_272598
+	waitmovement 0
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A
+	waitmovement 0
+	compare VAR_TEMP_9, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4
+	compare VAR_TEMP_9, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC
+	compare VAR_TEMP_9, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224
+	compare VAR_TEMP_9, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C
+	msgbox Route110_TrickHousePuzzle5_Text_26D6CE, 4
+	random 3
+	switch VAR_RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_26CF45
+	case 1, Route110_TrickHousePuzzle5_EventScript_26CF68
+	case 2, Route110_TrickHousePuzzle5_EventScript_26CF8B
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A
+	setvar VAR_TEMP_2, 1
+	setvar VAR_TEMP_8, 2
+	playse SE_PIN
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_272598
+	waitmovement 0
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A
+	waitmovement 0
+	compare VAR_TEMP_9, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D2CC
+	compare VAR_TEMP_9, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D304
+	compare VAR_TEMP_9, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D33C
+	compare VAR_TEMP_9, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D374
+	compare VAR_TEMP_9, 5
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3AC
+	msgbox Route110_TrickHousePuzzle5_Text_26D8EA, 4
+	random 3
+	switch VAR_RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_26CFAE
+	case 1, Route110_TrickHousePuzzle5_EventScript_26CFD1
+	case 2, Route110_TrickHousePuzzle5_EventScript_26CFF4
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4
+	setvar VAR_TEMP_3, 1
+	setvar VAR_TEMP_8, 3
+	playse SE_PIN
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_272598
+	waitmovement 0
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A
+	waitmovement 0
+	compare VAR_TEMP_9, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4
+	compare VAR_TEMP_9, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC
+	compare VAR_TEMP_9, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224
+	compare VAR_TEMP_9, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C
+	msgbox Route110_TrickHousePuzzle5_Text_26DA1E, 4
+	random 3
+	switch VAR_RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_26D017
+	case 1, Route110_TrickHousePuzzle5_EventScript_26D03A
+	case 2, Route110_TrickHousePuzzle5_EventScript_26D05D
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73
+	setvar VAR_TEMP_4, 1
+	setvar VAR_TEMP_8, 4
+	playse SE_PIN
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_272598
+	waitmovement 0
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A
+	waitmovement 0
+	compare VAR_TEMP_9, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4
+	compare VAR_TEMP_9, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC
+	compare VAR_TEMP_9, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224
+	compare VAR_TEMP_9, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C
+	msgbox Route110_TrickHousePuzzle5_Text_26DB4C, 4
+	random 3
+	switch VAR_RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_26D080
+	case 1, Route110_TrickHousePuzzle5_EventScript_26D0A3
+	case 2, Route110_TrickHousePuzzle5_EventScript_26D0C6
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2
+	setvar VAR_TEMP_5, 1
+	setvar VAR_TEMP_8, 5
+	playse SE_PIN
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_272598
+	waitmovement 0
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_27259A
+	waitmovement 0
+	msgbox Route110_TrickHousePuzzle5_Text_26DC78, 4
+	random 3
+	switch VAR_RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_26D0E9
+	case 1, Route110_TrickHousePuzzle5_EventScript_26D10C
+	case 2, Route110_TrickHousePuzzle5_EventScript_26D12F
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45
+	msgbox Route110_TrickHousePuzzle5_Text_26D757, 4
+	multichoice 0, 0, 25, 1
+	switch VAR_RESULT
+	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68
+	msgbox Route110_TrickHousePuzzle5_Text_26D7AA, 4
+	multichoice 0, 0, 26, 1
+	switch VAR_RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B
+	msgbox Route110_TrickHousePuzzle5_Text_26D7FC, 4
+	multichoice 0, 0, 27, 1
+	switch VAR_RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE
+	msgbox Route110_TrickHousePuzzle5_Text_26D940, 4
+	multichoice 0, 0, 28, 1
+	switch VAR_RESULT
+	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1
+	msgbox Route110_TrickHousePuzzle5_Text_26D98C, 4
+	multichoice 0, 0, 29, 1
+	switch VAR_RESULT
+	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4
+	msgbox Route110_TrickHousePuzzle5_Text_26D9CE, 4
+	multichoice 0, 0, 30, 1
+	switch VAR_RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017
+	msgbox Route110_TrickHousePuzzle5_Text_26DA64, 4
+	multichoice 0, 0, 31, 1
+	switch VAR_RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A
+	msgbox Route110_TrickHousePuzzle5_Text_26DAAD, 4
+	multichoice 0, 0, 32, 1
+	switch VAR_RESULT
+	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D
+	msgbox Route110_TrickHousePuzzle5_Text_26DAFF, 4
+	multichoice 0, 0, 33, 1
+	switch VAR_RESULT
+	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080
+	msgbox Route110_TrickHousePuzzle5_Text_26DB94, 4
+	multichoice 0, 0, 34, 1
+	switch VAR_RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3
+	msgbox Route110_TrickHousePuzzle5_Text_26DBD7, 4
+	multichoice 0, 0, 35, 1
+	switch VAR_RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6
+	msgbox Route110_TrickHousePuzzle5_Text_26DC2A, 4
+	multichoice 0, 0, 36, 1
+	switch VAR_RESULT
+	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9
+	msgbox Route110_TrickHousePuzzle5_Text_26DCCB, 4
+	multichoice 0, 0, 37, 1
+	switch VAR_RESULT
+	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C
+	msgbox Route110_TrickHousePuzzle5_Text_26DD1B, 4
+	multichoice 0, 0, 38, 1
+	switch VAR_RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F
+	msgbox Route110_TrickHousePuzzle5_Text_26DD5F, 4
+	multichoice 0, 0, 39, 1
+	switch VAR_RESULT
+	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
+	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26D152:: @ 826D152
+	waitse
+	playse SE_HAZURE
+	msgbox Route110_TrickHousePuzzle5_Text_26D883, 4
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D632
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D632
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D632
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D632
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D632
+	msgbox Route110_TrickHousePuzzle5_Text_26D8A1, 4
+	waitmovement 0
+	msgbox Route110_TrickHousePuzzle5_Text_26D8C9, 4
+	closemessage
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26D1A0:: @ 826D1A0
+	waitse
+	playse SE_SEIKAI
+	goto Route110_TrickHousePuzzle5_EventScript_26D1AA
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA
+	msgbox Route110_TrickHousePuzzle5_Text_26D84D, 4
+	releaseall
+	end
+
+Route110_TrickHousePuzzle5_EventScript_26D1B4:: @ 826D1B4
+	compare VAR_TEMP_8, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3E4
+	compare VAR_TEMP_8, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3EF
+	compare VAR_TEMP_8, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3FA
+	compare VAR_TEMP_8, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D405
+	compare VAR_TEMP_8, 5
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D410
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D1EC:: @ 826D1EC
+	compare VAR_TEMP_8, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D41B
+	compare VAR_TEMP_8, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D426
+	compare VAR_TEMP_8, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D431
+	compare VAR_TEMP_8, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D43C
+	compare VAR_TEMP_8, 5
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D447
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D224:: @ 826D224
+	compare VAR_TEMP_8, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D452
+	compare VAR_TEMP_8, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D45D
+	compare VAR_TEMP_8, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D468
+	compare VAR_TEMP_8, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D473
+	compare VAR_TEMP_8, 5
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D47E
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D25C:: @ 826D25C
+	compare VAR_TEMP_8, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D489
+	compare VAR_TEMP_8, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D494
+	compare VAR_TEMP_8, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D49F
+	compare VAR_TEMP_8, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4AA
+	compare VAR_TEMP_8, 5
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4B5
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D294:: @ 826D294
+	compare VAR_TEMP_8, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4C0
+	compare VAR_TEMP_8, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4CB
+	compare VAR_TEMP_8, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4D6
+	compare VAR_TEMP_8, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4E1
+	compare VAR_TEMP_8, 5
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4EC
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D2CC:: @ 826D2CC
+	compare VAR_TEMP_8, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4F7
+	compare VAR_TEMP_8, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D502
+	compare VAR_TEMP_8, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D50D
+	compare VAR_TEMP_8, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D518
+	compare VAR_TEMP_8, 5
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D523
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D304:: @ 826D304
+	compare VAR_TEMP_8, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D52E
+	compare VAR_TEMP_8, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D539
+	compare VAR_TEMP_8, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D544
+	compare VAR_TEMP_8, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D54F
+	compare VAR_TEMP_8, 5
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D55A
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D33C:: @ 826D33C
+	compare VAR_TEMP_8, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D565
+	compare VAR_TEMP_8, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D570
+	compare VAR_TEMP_8, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D57B
+	compare VAR_TEMP_8, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D586
+	compare VAR_TEMP_8, 5
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D591
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D374:: @ 826D374
+	compare VAR_TEMP_8, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D59C
+	compare VAR_TEMP_8, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5A7
+	compare VAR_TEMP_8, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5B2
+	compare VAR_TEMP_8, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5BD
+	compare VAR_TEMP_8, 5
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5C8
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D3AC:: @ 826D3AC
+	compare VAR_TEMP_8, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5D3
+	compare VAR_TEMP_8, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5DE
+	compare VAR_TEMP_8, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5E9
+	compare VAR_TEMP_8, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5F4
+	compare VAR_TEMP_8, 5
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5FF
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D3E4:: @ 826D3E4
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60A
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D3EF:: @ 826D3EF
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60A
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D3FA:: @ 826D3FA
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60A
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D405:: @ 826D405
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60A
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D410:: @ 826D410
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60A
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D41B:: @ 826D41B
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60C
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D426:: @ 826D426
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60C
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D431:: @ 826D431
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60C
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D43C:: @ 826D43C
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60C
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D447:: @ 826D447
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60C
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D452:: @ 826D452
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60F
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D45D:: @ 826D45D
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60F
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D468:: @ 826D468
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60F
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D473:: @ 826D473
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60F
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D47E:: @ 826D47E
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60F
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D489:: @ 826D489
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D613
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D494:: @ 826D494
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D613
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D49F:: @ 826D49F
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D613
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D4AA:: @ 826D4AA
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D613
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D4B5:: @ 826D4B5
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D613
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D4C0:: @ 826D4C0
+	applymovement 1, Movement_26D618
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D4CB:: @ 826D4CB
+	applymovement 2, Movement_26D618
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D4D6:: @ 826D4D6
+	applymovement 3, Movement_26D618
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D4E1:: @ 826D4E1
+	applymovement 4, Movement_26D618
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D4EC:: @ 826D4EC
+	applymovement 5, Movement_26D618
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D4F7:: @ 826D4F7
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D61E
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D502:: @ 826D502
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D61E
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D50D:: @ 826D50D
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D61E
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D518:: @ 826D518
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D61E
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D523:: @ 826D523
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D61E
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D52E:: @ 826D52E
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D620
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D539:: @ 826D539
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D620
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D544:: @ 826D544
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D620
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D54F:: @ 826D54F
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D620
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D55A:: @ 826D55A
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D620
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D565:: @ 826D565
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D623
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D570:: @ 826D570
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D623
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D57B:: @ 826D57B
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D623
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D586:: @ 826D586
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D623
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D591:: @ 826D591
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D623
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D59C:: @ 826D59C
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D627
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D5A7:: @ 826D5A7
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D627
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D5B2:: @ 826D5B2
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D627
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D5BD:: @ 826D5BD
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D627
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D5C8:: @ 826D5C8
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D627
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D5D3:: @ 826D5D3
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D62C
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D5DE:: @ 826D5DE
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D62C
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D5E9:: @ 826D5E9
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D62C
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D5F4:: @ 826D5F4
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D62C
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D5FF:: @ 826D5FF
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D62C
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_Movement_26D60A: @ 826D60A
+	walk_left
+	step_end
+
+Route110_TrickHousePuzzle5_Movement_26D60C: @ 826D60C
+	walk_left
+	walk_left
+	step_end
+
+Route110_TrickHousePuzzle5_Movement_26D60F: @ 826D60F
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+Route110_TrickHousePuzzle5_Movement_26D613: @ 826D613
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+
+Movement_26D618: @ 826D618
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+Route110_TrickHousePuzzle5_Movement_26D61E: @ 826D61E
+	walk_right
+	step_end
+
+Route110_TrickHousePuzzle5_Movement_26D620: @ 826D620
+	walk_right
+	walk_right
+	step_end
+
+Route110_TrickHousePuzzle5_Movement_26D623: @ 826D623
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+Route110_TrickHousePuzzle5_Movement_26D627: @ 826D627
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+Route110_TrickHouseEntrance_Movement_26D632: @ 826D632
+Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_down
+	step_end
+
+Route110_TrickHousePuzzle5_Text_26D660: @ 826D660
+	.string "{PLAYER} wrote down the secret code\n"
+	.string "on the door.\p"
+	.string "“TRICK MASTER is a genius.”\n"
+	.string "… … … … … … … …\p"
+	.string "The lock clicked open!$"
+
+Route110_TrickHousePuzzle5_Text_26D6CE: @ 826D6CE
+	.string "CLICKETY-CLACK…\n"
+	.string "MECHADOLL 1 AM I!\p"
+	.string "IF YOU ANSWER QUIZZES CORRECTLY,\n"
+	.string "THEN YOU WILL GO TO MECHADOLL 5.\l"
+	.string "THEN YOU CAN OBTAIN THE SECRET CODE.$"
+
+Route110_TrickHousePuzzle5_Text_26D757: @ 826D757
+	.string "MECHADOLL 1 QUIZ.\p"
+	.string "One of these POKéMON is not found\n"
+	.string "on ROUTE 110. Which one is it?$"
+
+Route110_TrickHousePuzzle5_Text_26D7AA: @ 826D7AA
+	.string "MECHADOLL 1 QUIZ.\p"
+	.string "One of these POKéMON is not of the\n"
+	.string "WATER type. Which one is it?$"
+
+Route110_TrickHousePuzzle5_Text_26D7FC: @ 826D7FC
+	.string "MECHADOLL 1 QUIZ.\p"
+	.string "One of these POKéMON does not use\n"
+	.string "LEECH LIFE. Which one is it?$"
+
+Route110_TrickHousePuzzle5_Text_26D84D: @ 826D84D
+	.string "CONGRATULATIONS. CORRECT YOU ARE.\n"
+	.string "GO THROUGH. PLEASE.$"
+
+Route110_TrickHousePuzzle5_Text_26D883: @ 826D883
+	.string "BZZZT. DISAPPOINTMENT.\n"
+	.string "ERROR.$"
+
+Route110_TrickHousePuzzle5_Text_26D8A1: @ 826D8A1
+	.string "WAHAHAHAHA! WAHAHAHAHA!\n"
+	.string "CLICKETY-CLACK!$"
+
+Route110_TrickHousePuzzle5_Text_26D8C9: @ 826D8C9
+	.string "YOUR NEXT CHALLENGE WE WAIT FOR.$"
+
+Route110_TrickHousePuzzle5_Text_26D8EA: @ 826D8EA
+	.string "CLICKETY-CLACK…\n"
+	.string "MECHADOLL 2 AM I!\p"
+	.string "MECHADOLL 1’S QUIZ DIFFICULTY LEVEL\n"
+	.string "IS SET TOO LOW.$"
+
+Route110_TrickHousePuzzle5_Text_26D940: @ 826D940
+	.string "MECHADOLL 2 QUIZ.\p"
+	.string "Which of these POKéMON did WALLY\n"
+	.string "borrow from your father?$"
+
+Route110_TrickHousePuzzle5_Text_26D98C: @ 826D98C
+	.string "MECHADOLL 2 QUIZ.\p"
+	.string "Which of these POKéMON was chasing\n"
+	.string "PROF. BIRCH?$"
+
+Route110_TrickHousePuzzle5_Text_26D9CE: @ 826D9CE
+	.string "MECHADOLL 2 QUIZ.\p"
+	.string "Which of these POKéMON did TEAM AQUA\n"
+	.string "use in PETALBURG FOREST?$"
+
+Route110_TrickHousePuzzle5_Text_26DA1E: @ 826DA1E
+	.string "CLICKETY-CLACK…\n"
+	.string "MECHADOLL 3 AM I!\p"
+	.string "MATTERS OF MONEY ARE MY SOLE FOCUS.$"
+
+Route110_TrickHousePuzzle5_Text_26DA64: @ 826DA64
+	.string "MECHADOLL 3 QUIZ.\p"
+	.string "Which costs more?\n"
+	.string "Three HARBOR MAILS or one BURN HEAL?$"
+
+Route110_TrickHousePuzzle5_Text_26DAAD: @ 826DAAD
+	.string "MECHADOLL 3 QUIZ.\p"
+	.string "Sell one GREAT BALL and buy\n"
+	.string "one POTION. How much money remains?$"
+
+Route110_TrickHousePuzzle5_Text_26DAFF: @ 826DAFF
+	.string "MECHADOLL 3 QUIZ.\p"
+	.string "Do one REPEL and SODA POP cost\n"
+	.string "more than one SUPER POTION?$"
+
+Route110_TrickHousePuzzle5_Text_26DB4C: @ 826DB4C
+	.string "CLICKETY-CLACK…\n"
+	.string "MECHADOLL 4 THAT IS ME!\p"
+	.string "MY QUIZ IS AN OBJECT OF BEAUTY.$"
+
+Route110_TrickHousePuzzle5_Text_26DB94: @ 826DB94
+	.string "MECHADOLL 4 QUIZ.\p"
+	.string "In SEASHORE HOUSE, were there more men\n"
+	.string "or women?$"
+
+Route110_TrickHousePuzzle5_Text_26DBD7: @ 826DBD7
+	.string "MECHADOLL 4 QUIZ.\p"
+	.string "In LAVARIDGE TOWN, were there more\n"
+	.string "elderly men or elderly women?$"
+
+Route110_TrickHousePuzzle5_Text_26DC2A: @ 826DC2A
+	.string "MECHADOLL 4 QUIZ.\p"
+	.string "In the TRAINER’S SCHOOL, how many\n"
+	.string "girl students were there?$"
+
+Route110_TrickHousePuzzle5_Text_26DC78: @ 826DC78
+	.string "CLICKETY-CLACK…\n"
+	.string "MECHADOLL 5 AM I!\p"
+	.string "THE MASTER’S BEST AND PROUDEST\n"
+	.string "ACHIEVEMENT AM I.$"
+
+Route110_TrickHousePuzzle5_Text_26DCCB: @ 826DCCB
+	.string "MECHADOLL 5 QUIZ.\p"
+	.string "In SLATEPORT’s POKéMON FAN CLUB,\n"
+	.string "how many POKéMON were there?$"
+
+Route110_TrickHousePuzzle5_Text_26DD1B: @ 826DD1B
+	.string "MECHADOLL 5 QUIZ.\p"
+	.string "In FORTREE CITY, how many\n"
+	.string "tree houses were there?$"
+
+Route110_TrickHousePuzzle5_Text_26DD5F: @ 826DD5F
+	.string "MECHADOLL 5 QUIZ.\p"
+	.string "On the CYCLING ROAD, how many\n"
+	.string "TRIATHLETES were there?$"
diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc
new file mode 100644
index 000000000..7fc098f2c
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle6/events.inc
@@ -0,0 +1,17 @@
+Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0
+	object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 11, 10, 3, 10, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067
+
+Route110_TrickHousePuzzle6_MapWarps: @ 853E730
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle6_MapBGEvents: @ 853E748
+	bg_event 0, 10, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_26DDC4
+
+Route110_TrickHousePuzzle6_MapEvents:: @ 853E754
+	map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents
+
diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc
index 5864cdd59..946ad91f4 100644
--- a/data/maps/Route110_TrickHousePuzzle6/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/header.inc
@@ -1,5 +1,5 @@
 Route110_TrickHousePuzzle6: @ 8485C2C
-	.4byte Route110_TrickHousePuzzle6_MapAttributes
+	.4byte Route110_TrickHousePuzzle6_Layout
 	.4byte Route110_TrickHousePuzzle6_MapEvents
 	.4byte Route110_TrickHousePuzzle6_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
index 0f20aac1f..0f20aac1f 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc
new file mode 100644
index 000000000..e72aa929a
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle7/events.inc
@@ -0,0 +1,38 @@
+Route110_TrickHousePuzzle7_EventObjects: @ 853E768
+	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0
+	object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068
+	object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 2, 3, 8, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0
+	object_event 6, EVENT_OBJ_GFX_LASS, 0, 8, 13, 3, 7, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0
+	object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 12, 3, 9, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0
+	object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, 1, 1, 1, 0, 0, 0x0, 0
+
+Route110_TrickHousePuzzle7_MapWarps: @ 853E840
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
+	warp_def 13, 4, 0, 4, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
+	warp_def 7, 3, 0, 3, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
+	warp_def 13, 11, 0, 6, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
+	warp_def 4, 3, 0, 5, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
+	warp_def 1, 17, 0, 8, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
+	warp_def 0, 11, 0, 7, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
+	warp_def 2, 3, 0, 10, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
+	warp_def 4, 13, 0, 9, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
+	warp_def 1, 3, 0, 12, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
+	warp_def 8, 12, 0, 11, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7
+
+Route110_TrickHousePuzzle7_MapCoordEvents: @ 853E8A8
+	coord_event 8, 19, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E31B
+	coord_event 0, 14, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E331
+	coord_event 6, 6, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E347
+	coord_event 9, 7, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E35D
+
+Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8
+	bg_event 6, 17, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E1D0
+
+Route110_TrickHousePuzzle7_MapEvents:: @ 853E8F4
+	map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents
+
diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc
index e9217f7e2..5de9d6400 100644
--- a/data/maps/Route110_TrickHousePuzzle7/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/header.inc
@@ -1,5 +1,5 @@
 Route110_TrickHousePuzzle7: @ 8485C48
-	.4byte Route110_TrickHousePuzzle7_MapAttributes
+	.4byte Route110_TrickHousePuzzle7_Layout
 	.4byte Route110_TrickHousePuzzle7_MapEvents
 	.4byte Route110_TrickHousePuzzle7_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
new file mode 100644
index 000000000..fdf734423
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
@@ -0,0 +1,411 @@
+Route110_TrickHousePuzzle7_MapScripts:: @ 826E091
+	map_script 5, Route110_TrickHousePuzzle7_MapScript1_26E0A6
+	map_script 3, Route110_TrickHousePuzzle7_MapScript1_26E198
+	map_script 1, Route110_TrickHousePuzzle7_MapScript1_26E1B4
+	map_script 2, Route110_TrickHousePuzzle7_MapScript2_26E1C0
+	.byte 0
+
+Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6
+	call Route110_TrickHousePuzzle7_EventScript_26E0AC
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E0AC:: @ 826E0AC
+	checkflag FLAG_0x0C2
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0DA
+	checkflag FLAG_0x0C3
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0ED
+	checkflag FLAG_0x0C4
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E100
+	checkflag FLAG_0x0C5
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E113
+	checkflag FLAG_0x0C6
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E126
+	return
+
+Route110_TrickHousePuzzle7_EventScript_26E0DA:: @ 826E0DA
+	setmetatile 13, 17, 610, 0
+	setmetatile 12, 16, 575, 1
+	return
+
+Route110_TrickHousePuzzle7_EventScript_26E0ED:: @ 826E0ED
+	setmetatile 12, 13, 610, 0
+	setmetatile 12, 11, 575, 1
+	return
+
+Route110_TrickHousePuzzle7_EventScript_26E100:: @ 826E100
+	setmetatile 7, 12, 610, 0
+	setmetatile 5, 10, 575, 1
+	return
+
+Route110_TrickHousePuzzle7_EventScript_26E113:: @ 826E113
+	setmetatile 6, 6, 636, 0
+	setmetatile 4, 4, 575, 1
+	return
+
+Route110_TrickHousePuzzle7_EventScript_26E126:: @ 826E126
+	setmetatile 8, 4, 609, 0
+	setmetatile 7, 5, 575, 1
+	return
+
+Route110_TrickHousePuzzle7_EventScript_26E139:: @ 826E139
+	setmetatile 13, 17, 611, 0
+	setmetatile 12, 16, 574, 1
+	return
+
+Route110_TrickHousePuzzle7_EventScript_26E14C:: @ 826E14C
+	setmetatile 12, 13, 609, 0
+	setmetatile 12, 11, 574, 1
+	return
+
+Route110_TrickHousePuzzle7_EventScript_26E15F:: @ 826E15F
+	setmetatile 7, 12, 611, 0
+	setmetatile 5, 10, 574, 1
+	return
+
+Route110_TrickHousePuzzle7_EventScript_26E172:: @ 826E172
+	setmetatile 6, 6, 635, 0
+	setmetatile 4, 4, 574, 1
+	return
+
+Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185
+	setmetatile 8, 4, 608, 0
+	setmetatile 7, 5, 574, 1
+	return
+
+Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198
+	compare VAR_0x40B6, 1
+	goto_eq Route110_TrickHousePuzzle7_EventScript_26E1B3
+	clearflag FLAG_0x0C2
+	clearflag FLAG_0x0C3
+	clearflag FLAG_0x0C4
+	clearflag FLAG_0x0C5
+	clearflag FLAG_0x0C6
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3
+	end
+
+Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4
+	compare VAR_0x40B6, 1
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0AC
+	end
+
+Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0
+	map_script_2 VAR_0x40B6, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA
+	.2byte 0
+
+Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA
+	setvar VAR_0x40B6, 0
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0
+	lockall
+	compare VAR_0x40B1, 0
+	goto_eq Route110_TrickHousePuzzle7_EventScript_26E1E2
+	goto Route110_TrickHousePuzzle7_EventScript_26A3DB
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2
+	setvar VAR_0x40B1, 1
+	goto Route110_TrickHousePuzzle7_EventScript_26A3E5
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED
+	lockall
+	setvar VAR_0x40B6, 1
+	warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E1FE:: @ 826E1FE
+	lockall
+	delay 32
+	checkflag FLAG_0x0C2
+	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E0DA
+	checkflag FLAG_0x0C2
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E139
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	checkflag FLAG_0x0C2
+	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2E9
+	checkflag FLAG_0x0C2
+	goto_eq Route110_TrickHousePuzzle7_EventScript_26E2EE
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D
+	lockall
+	delay 32
+	checkflag FLAG_0x0C3
+	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E0ED
+	checkflag FLAG_0x0C3
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E14C
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	checkflag FLAG_0x0C3
+	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2F3
+	checkflag FLAG_0x0C3
+	goto_eq Route110_TrickHousePuzzle7_EventScript_26E2F8
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C
+	lockall
+	delay 32
+	checkflag FLAG_0x0C4
+	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E100
+	checkflag FLAG_0x0C4
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E15F
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	checkflag FLAG_0x0C4
+	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2FD
+	checkflag FLAG_0x0C4
+	goto_eq Route110_TrickHousePuzzle7_EventScript_26E302
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B
+	lockall
+	delay 32
+	checkflag FLAG_0x0C5
+	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E113
+	checkflag FLAG_0x0C5
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E172
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	checkflag FLAG_0x0C5
+	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E307
+	checkflag FLAG_0x0C5
+	goto_eq Route110_TrickHousePuzzle7_EventScript_26E30C
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA
+	lockall
+	delay 32
+	checkflag FLAG_0x0C6
+	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E126
+	checkflag FLAG_0x0C6
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E185
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	checkflag FLAG_0x0C6
+	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E311
+	checkflag FLAG_0x0C6
+	goto_eq Route110_TrickHousePuzzle7_EventScript_26E316
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E2E9:: @ 826E2E9
+	setflag FLAG_0x0C2
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E2EE:: @ 826E2EE
+	clearflag FLAG_0x0C2
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E2F3:: @ 826E2F3
+	setflag FLAG_0x0C3
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E2F8:: @ 826E2F8
+	clearflag FLAG_0x0C3
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E2FD:: @ 826E2FD
+	setflag FLAG_0x0C4
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E302:: @ 826E302
+	clearflag FLAG_0x0C4
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E307:: @ 826E307
+	setflag FLAG_0x0C5
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E30C:: @ 826E30C
+	clearflag FLAG_0x0C5
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E311:: @ 826E311
+	setflag FLAG_0x0C6
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E316:: @ 826E316
+	clearflag FLAG_0x0C6
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B
+	playse SE_MU_PACHI
+	waitse
+	playse SE_TU_SAA
+	mossdeepgym3 1
+	mossdeepgym1 0
+	waitmovement 0
+	mossdeepgym2
+	waitmovement 0
+	mossdeepgym4
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331
+	playse SE_MU_PACHI
+	waitse
+	playse SE_TU_SAA
+	mossdeepgym3 1
+	mossdeepgym1 1
+	waitmovement 0
+	mossdeepgym2
+	waitmovement 0
+	mossdeepgym4
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347
+	playse SE_MU_PACHI
+	waitse
+	playse SE_TU_SAA
+	mossdeepgym3 1
+	mossdeepgym1 2
+	waitmovement 0
+	mossdeepgym2
+	waitmovement 0
+	mossdeepgym4
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D
+	playse SE_MU_PACHI
+	waitse
+	playse SE_TU_SAA
+	mossdeepgym3 1
+	mossdeepgym1 3
+	waitmovement 0
+	mossdeepgym2
+	waitmovement 0
+	mossdeepgym4
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373
+	playse SE_MU_PACHI
+	waitse
+	playse SE_TU_SAA
+	mossdeepgym3 1
+	mossdeepgym1 4
+	waitmovement 0
+	mossdeepgym2
+	waitmovement 0
+	mossdeepgym4
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389
+	trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1
+	msgbox Route110_TrickHousePuzzle7_Text_26E4F4, 6
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E3A0:: @ 826E3A0
+	trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564
+	msgbox Route110_TrickHousePuzzle7_Text_26E57F, 6
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E3B7:: @ 826E3B7
+	trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604
+	msgbox Route110_TrickHousePuzzle7_Text_26E61E, 6
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E3CE:: @ 826E3CE
+	trainerbattle 0, TRAINER_MARIELA, 0, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C
+	msgbox Route110_TrickHousePuzzle7_Text_26E6BC, 6
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E3E5:: @ 826E3E5
+	trainerbattle 0, TRAINER_ALVARO, 0, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700
+	msgbox Route110_TrickHousePuzzle7_Text_26E722, 6
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E3FC:: @ 826E3FC
+	trainerbattle 0, TRAINER_EVERETT, 0, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB
+	msgbox Route110_TrickHousePuzzle7_Text_26E7C4, 6
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E413:: @ 826E413
+	.string "{PLAYER} wrote down the secret code\n"
+	.string "on the door.\p"
+	.string "“TRICK MASTER is huggable.”\n"
+	.string "… … … … … … … …\p"
+	.string "The lock clicked open!$"
+
+Route110_TrickHousePuzzle7_Text_26E481: @ 826E481
+	.string "The TRICK MASTER always vanishes\n"
+	.string "like smoke. How does he do it?$"
+
+Route110_TrickHousePuzzle7_Text_26E4C1: @ 826E4C1
+	.string "Aiyeeeh! You’re much too strong!\n"
+	.string "How do you do it?$"
+
+Route110_TrickHousePuzzle7_Text_26E4F4: @ 826E4F4
+	.string "I wish I could appear and disappear as\n"
+	.string "if I were smoke, too.$"
+
+Route110_TrickHousePuzzle7_Text_26E531: @ 826E531
+	.string "Going around the same spot…\n"
+	.string "It begets ill fortune…$"
+
+Route110_TrickHousePuzzle7_Text_26E564: @ 826E564
+	.string "Defeated!\n"
+	.string "It’s a bad sign…$"
+
+Route110_TrickHousePuzzle7_Text_26E57F: @ 826E57F
+	.string "I’ve circled the same spot over ten\n"
+	.string "times now… It’s ill fortune…$"
+
+Route110_TrickHousePuzzle7_Text_26E5C0: @ 826E5C0
+	.string "Whoever wins will get through here\n"
+	.string "first. That’s the feeling I get.$"
+
+Route110_TrickHousePuzzle7_Text_26E604: @ 826E604
+	.string "Oh!\n"
+	.string "Well, go ahead, then!$"
+
+Route110_TrickHousePuzzle7_Text_26E61E: @ 826E61E
+	.string "You’re solving all the puzzles in the\n"
+	.string "TRICK HOUSE. That’s the feeling I get.$"
+
+Route110_TrickHousePuzzle7_Text_26E66B: @ 826E66B
+	.string "Nufufufu, here at last!\n"
+	.string "Let’s get right with it!$"
+
+Route110_TrickHousePuzzle7_Text_26E69C: @ 826E69C
+	.string "You’re so casual about winning!$"
+
+Route110_TrickHousePuzzle7_Text_26E6BC: @ 826E6BC
+	.string "Humph! I’m not upset!\n"
+	.string "Not me!$"
+
+Route110_TrickHousePuzzle7_Text_26E6DA: @ 826E6DA
+	.string "I ever so closely watched you coming!$"
+
+Route110_TrickHousePuzzle7_Text_26E700: @ 826E700
+	.string "This outcome I didn’t see coming…$"
+
+Route110_TrickHousePuzzle7_Text_26E722: @ 826E722
+	.string "Well, anyway, we both picked a weird\n"
+	.string "place to get acquainted.\p"
+	.string "As one weirdo to another,\n"
+	.string "let’s do our best!$"
+
+Route110_TrickHousePuzzle7_Text_26E78D: @ 826E78D
+	.string "It’s awfully cramped in here…$"
+
+Route110_TrickHousePuzzle7_Text_26E7AB: @ 826E7AB
+	.string "Oh, yes, strong you are.$"
+
+Route110_TrickHousePuzzle7_Text_26E7C4: @ 826E7C4
+	.string "I was hoping to switch places with you\n"
+	.string "when I beat you, but…$"
+
diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc
new file mode 100644
index 000000000..eacc9e940
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle8/events.inc
@@ -0,0 +1,17 @@
+Route110_TrickHousePuzzle8_EventObjects: @ 853E908
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 10, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 17, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069
+
+Route110_TrickHousePuzzle8_MapWarps: @ 853E968
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle8_MapBGEvents: @ 853E980
+	bg_event 3, 21, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_26E802
+
+Route110_TrickHousePuzzle8_MapEvents:: @ 853E98C
+	map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents
+
diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc
index d9fce791e..750270dea 100644
--- a/data/maps/Route110_TrickHousePuzzle8/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/header.inc
@@ -1,5 +1,5 @@
 Route110_TrickHousePuzzle8: @ 8485C64
-	.4byte Route110_TrickHousePuzzle8_MapAttributes
+	.4byte Route110_TrickHousePuzzle8_Layout
 	.4byte Route110_TrickHousePuzzle8_MapEvents
 	.4byte Route110_TrickHousePuzzle8_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
index 369bc59a7..369bc59a7 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc
index 8133a0b78..6a57d275e 100644
--- a/data/maps/Route111/connections.inc
+++ b/data/maps/Route111/connections.inc
@@ -1,7 +1,7 @@
 Route111_MapConnectionsList: @ 8486970
-	connection down, 0, MAUVILLE_CITY, 0
-	connection left, 0, ROUTE_113, 0
-	connection left, 20, ROUTE_112, 0
+	connection down, 0, MAP_MAUVILLE_CITY
+	connection left, 0, MAP_ROUTE113
+	connection left, 20, MAP_ROUTE112
 
 Route111_MapConnections: @ 8486994
 	.4byte 0x3
diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc
new file mode 100644
index 000000000..cea2db8d5
--- /dev/null
+++ b/data/maps/Route111/events.inc
@@ -0,0 +1,114 @@
+Route111_EventObjects: @ 85291F0
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 769
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, 770
+	object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 771
+	object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F121B, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, 12, 0, 0, 0, 19, BerryTreeScript, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, 12, 0, 0, 0, 20, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, 2, 1, 1, 0, 0, Route111_EventScript_1F1189, 0
+	object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 29, 37, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1204, 0
+	object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, 50, 2, 2, 1, 2, Route111_EventScript_1F1260, 0
+	object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1F1232, 0
+	object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 66, 3, 24, 0, 0, 1, 3, Route111_EventScript_1F1249, 0
+	object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796
+	object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796
+	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 17
+	object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 18
+	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, 1, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008
+	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 80, BerryTreeScript, 0
+	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, 12, 0, 0, 0, 81, BerryTreeScript, 0
+	object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CE96, 799
+	object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799
+	object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF16, 903
+	object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF36, 903
+	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009
+	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010
+	object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, 1, 0, 0, 0, 0, Route111_EventScript_2906BB, 19
+	object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0
+	object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0
+	object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0
+	object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 11, 3, 7, 4, 0, 1, 4, Route111_EventScript_1F1369, 0
+	object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1307, 0
+	object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, 7, 1, 1, 0, 0, Route111_EventScript_2765FF, 960
+	object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, 2, 1, 1, 0, 0, Route111_EventScript_1F1192, 0
+	object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, 9, 1, 1, 1, 5, Route111_EventScript_1F13F9, 0
+	object_event 36, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 132, 3, 10, 1, 1, 1, 5, Route111_EventScript_1F1410, 0
+	object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 19, 121, 3, 7, 1, 1, 1, 2, Route111_EventScript_1F13E2, 0
+	object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 16, 119, 3, 10, 1, 1, 1, 3, Route111_EventScript_1F13CB, 0
+	object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, 14, 1, 1, 1, 7, Route111_EventScript_1F143E, 0
+	object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, 10, 1, 1, 1, 6, Route111_EventScript_1F1427, 0
+	object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, 9, 1, 1, 1, 7, Route111_EventScript_1F1455, 0
+	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, 1, 1, 1, 0, 0, Route111_EventScript_290DC2, 1142
+	object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, 16, 1, 1, 0, 0, Route111_EventScript_1F119B, 0
+	object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, 8, 1, 1, 0, 0, 0x0, 876
+	object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, 8, 1, 1, 0, 0, 0x0, 875
+	object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, 7, 1, 1, 0, 0, Route111_EventScript_1F11E4, 843
+
+Route111_MapWarps: @ 8529640
+	warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE
+	warp_def 29, 87, 0, 0, MAP_DESERT_RUINS
+	warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP
+	warp_def 19, 58, 0, 0, MAP_MIRAGE_TOWER_1F
+	warp_def 31, 113, 0, 0, MAP_TRAINER_HILL_ENTRANCE
+
+Route111_MapCoordEvents: @ 8529668
+	coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 11, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A
+	coord_event 12, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A
+	coord_event 13, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A
+	coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 12, 44, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16
+	coord_event 13, 43, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16
+	coord_event 14, 42, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16
+	coord_event 16, 40, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16
+	coord_event 14, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A
+	coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 17, 39, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16
+	coord_event 18, 38, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16
+	coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 11, 66, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 12, 67, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 13, 68, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 14, 69, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 10, 61, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 11, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 13, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 14, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 17, 38, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 16, 39, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 15, 40, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 14, 41, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 13, 42, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 12, 43, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+
+Route111_MapBGEvents: @ 8529888
+	bg_event 16, 114, 0, 0, 0, Route111_EventScript_1F115C
+	bg_event 24, 126, 0, 0, 0, Route111_EventScript_1F1153
+	bg_event 7, 66, 0, 0, 0, Route111_EventScript_1F1165
+	bg_event 13, 6, 0, 0, 0, Route111_EventScript_1F116E
+	bg_event 24, 36, 0, 8, 0, ITEM_FAB_MAIL, 0, 0
+	bg_event 34, 50, 0, 8, 0, ITEM_LUM_BERRY, 0, 0
+	bg_event 33, 34, 0, 8, 0, ITEM_ORANGE_MAIL, 0, 0
+	bg_event 25, 19, 0, 0, 0, Route111_EventScript_1F1177
+	bg_event 35, 1, 0, 8, 0, ITEM_POTION, 0, 0
+	bg_event 35, 31, 0, 8, 0, ITEM_POMEG_BERRY, 0, 0
+	bg_event 26, 70, 0, 7, 0, ITEM_STARDUST, 2, 0
+	bg_event 27, 27, 3, 8, 0, ITEM_REVIVAL_HERB, 0, 0
+	bg_event 7, 84, 3, 0, 0, Route111_EventScript_1F1180
+	bg_event 14, 19, 0, 8, 0, ITEM_PAMTRE_BERRY, 0, 0
+	bg_event 13, 19, 0, 8, 0, ITEM_RABUTA_BERRY, 0, 0
+	bg_event 19, 55, 0, 7, 0, ITEM_PROTEIN, 56, 0
+	bg_event 35, 66, 0, 7, 0, ITEM_RARE_CANDY, 57, 0
+	bg_event 24, 116, 0, 0, 0, Route111_EventScript_1F146C
+
+Route111_MapEvents:: @ 8529960
+	map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents
+
diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc
index 804a36387..89feae870 100644
--- a/data/maps/Route111/header.inc
+++ b/data/maps/Route111/header.inc
@@ -1,5 +1,5 @@
 Route111: @ 8482790
-	.4byte Route111_MapAttributes
+	.4byte Route111_Layout
 	.4byte Route111_MapEvents
 	.4byte Route111_MapScripts
 	.4byte Route111_MapConnections
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
new file mode 100644
index 000000000..fcbf32c91
--- /dev/null
+++ b/data/maps/Route111/scripts.inc
@@ -0,0 +1,756 @@
+Route111_MapScripts:: @ 81F0CA7
+	map_script 1, Route111_MapScript1_1F0CBC
+	map_script 3, Route111_MapScript1_1F0D87
+	map_script 4, Route111_MapScript2_1F0E46
+	map_script 2, Route111_MapScript2_1F0E56
+	.byte 0
+
+Route111_MapScript1_1F0CBC: @ 81F0CBC
+	checkflag FLAG_0x0E4
+	call_if 0, Route111_EventScript_1F0CD1
+	compare VAR_0x40CB, 1
+	call_if 1, Route111_EventScript_1F0CE4
+	end
+
+Route111_EventScript_1F0CD1:: @ 81F0CD1
+	setmetatile 29, 86, 124, 1
+	setmetatile 29, 87, 145, 1
+	return
+
+Route111_EventScript_1F0CE4:: @ 81F0CE4
+	setmetatile 18, 53, 984, 0
+	setmetatile 19, 53, 985, 0
+	setmetatile 20, 53, 986, 0
+	setmetatile 18, 54, 992, 0
+	setmetatile 19, 54, 993, 0
+	setmetatile 20, 54, 994, 0
+	setmetatile 18, 55, 1000, 0
+	setmetatile 19, 55, 1001, 0
+	setmetatile 20, 55, 1002, 0
+	setmetatile 18, 56, 1008, 0
+	setmetatile 19, 56, 1009, 0
+	setmetatile 20, 56, 1010, 0
+	setmetatile 18, 57, 987, 0
+	setmetatile 19, 57, 988, 0
+	setmetatile 20, 57, 989, 0
+	setmetatile 18, 58, 995, 0
+	setmetatile 19, 58, 996, 0
+	setmetatile 20, 58, 997, 0
+	return
+
+Route111_MapScript1_1F0D87: @ 81F0D87
+	setvar VAR_0x40D6, 0
+	special sub_81BE79C
+	checkflag FLAG_0x14E
+	call_if 0, Route111_EventScript_1F0E3C
+	compare VAR_0x40CB, 1
+	call_if 1, Route111_EventScript_1F0DC2
+	compare VAR_0x40CB, 2
+	call_if 1, Route111_EventScript_1F0E40
+	call Route111_EventScript_1F0DE6
+	call Route111_EventScript_28CCC7
+	checktrainerflag TRAINER_VICKY
+	goto_if 0, Route111_EventScript_1F0E26
+	end
+
+Route111_EventScript_1F0DC2:: @ 81F0DC2
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq Route111_EventScript_1F0DDA
+	compare VAR_RESULT, 1
+	goto_eq Route111_EventScript_1F0DE0
+	return
+
+Route111_EventScript_1F0DDA:: @ 81F0DDA
+	setvar VAR_OBJ_GFX_ID_0, 100
+	return
+
+Route111_EventScript_1F0DE0:: @ 81F0DE0
+	setvar VAR_OBJ_GFX_ID_0, 105
+	return
+
+Route111_EventScript_1F0DE6:: @ 81F0DE6
+	getplayerxy VAR_TEMP_0, VAR_TEMP_1
+	compare VAR_TEMP_1, 34
+	goto_if 0, Route111_EventScript_1F0E25
+	compare VAR_TEMP_1, 107
+	goto_if 2, Route111_EventScript_1F0E25
+	compare VAR_TEMP_1, 72
+	goto_if 2, Route111_EventScript_1F0E22
+	compare VAR_TEMP_0, 2000
+	goto_if 2, Route111_EventScript_1F0E25
+	compare VAR_TEMP_0, 8
+	goto_if 0, Route111_EventScript_1F0E25
+
+Route111_EventScript_1F0E22:: @ 81F0E22
+	setweather 8
+
+Route111_EventScript_1F0E25:: @ 81F0E25
+	return
+
+Route111_EventScript_1F0E26:: @ 81F0E26
+	clearflag FLAG_0x300
+	setflag FLAG_0x301
+	setflag FLAG_0x302
+	setflag FLAG_0x303
+	cleartrainerflag TRAINER_VICTOR
+	cleartrainerflag TRAINER_VICTORIA
+	cleartrainerflag TRAINER_VIVI
+	end
+
+Route111_EventScript_1F0E3C:: @ 81F0E3C
+	setmaplayoutindex 392
+	return
+
+Route111_EventScript_1F0E40:: @ 81F0E40
+	setvar VAR_0x40CB, 3
+	return
+
+Route111_MapScript2_1F0E46: @ 81F0E46
+	map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E50
+	.2byte 0
+
+Route111_EventScript_1F0E50:: @ 81F0E50
+	hideobjectat 255, MAP_LITTLEROOT_TOWN
+	end
+
+Route111_MapScript2_1F0E56: @ 81F0E56
+	map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E60
+	.2byte 0
+
+Route111_EventScript_1F0E60:: @ 81F0E60
+	lockall
+	special sub_81BEB68
+	waitstate
+	delay 24
+	playse SE_RU_HYUU
+	addobject 45
+	special sub_81BE7F4
+	waitstate
+	showobjectat 255, MAP_LITTLEROOT_TOWN
+	removeobject 45
+	delay 16
+	turnobject 255, 2
+	delay 16
+	special sub_81BEB54
+	waitstate
+	special sub_81BEB7C
+	waitstate
+	setvar VAR_0x40CB, 2
+	clearflag FLAG_0x36A
+	checkflag FLAG_0x150
+	goto_eq Route111_EventScript_1F0EA7
+	msgbox Route111_Text_1F1C74, 4
+	releaseall
+	end
+
+Route111_EventScript_1F0EA7:: @ 81F0EA7
+	msgbox Route111_Text_1F1C9F, 4
+	releaseall
+	end
+
+Route111_Movement_1F0EB1:: @ 81F0EB1
+	store_lock_anim
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	step_end
+
+Route111_EventScript_1F0EB9:: @ 81F0EB9
+	lock
+	faceplayer
+	dodailyevents
+	checkflag FLAG_0x92C
+	goto_eq Route111_EventScript_1F0EF4
+	msgbox Route111_Text_2A6EBD, 4
+	giveitem_std ITEM_RAZZ_BERRY
+	compare VAR_RESULT, 0
+	goto_eq Route111_EventScript_272054
+	setflag FLAG_0x92C
+	special GetPlayerBigGuyGirlString
+	msgbox Route111_Text_2A6F3D, 4
+	release
+	end
+
+Route111_EventScript_1F0EF4:: @ 81F0EF4
+	msgbox Route111_Text_2A6F9A, 4
+	release
+	end
+
+Route111_EventScript_1F0EFE:: @ 81F0EFE
+	lockall
+	setvar VAR_0x8004, 0
+	goto Route111_EventScript_1F0F2E
+	end
+
+Route111_EventScript_1F0F0A:: @ 81F0F0A
+	lockall
+	setvar VAR_0x8004, 1
+	goto Route111_EventScript_1F0F2E
+	end
+
+Route111_EventScript_1F0F16:: @ 81F0F16
+	lockall
+	setvar VAR_0x8004, 2
+	goto Route111_EventScript_1F0F2E
+	end
+
+Route111_EventScript_1F0F22:: @ 81F0F22
+	lockall
+	setvar VAR_0x8004, 3
+	goto Route111_EventScript_1F0F2E
+	end
+
+Route111_EventScript_1F0F2E:: @ 81F0F2E
+	checkitem ITEM_GO_GOGGLES, 1
+	compare VAR_RESULT, 0
+	goto_eq Route111_EventScript_1F0F45
+	setvar VAR_TEMP_3, 1
+	releaseall
+	end
+
+Route111_EventScript_1F0F45:: @ 81F0F45
+	msgbox gUnknown_08272C5F, 4
+	closemessage
+	compare VAR_0x8004, 0
+	call_if 1, Route111_EventScript_1F0F7C
+	compare VAR_0x8004, 1
+	call_if 1, Route111_EventScript_1F0F87
+	compare VAR_0x8004, 2
+	call_if 1, Route111_EventScript_1F0F92
+	compare VAR_0x8004, 3
+	call_if 1, Route111_EventScript_1F0F9D
+	releaseall
+	end
+
+Route111_EventScript_1F0F7C:: @ 81F0F7C
+	applymovement 255, Route111_Movement_1F0FA8
+	waitmovement 0
+	return
+
+Route111_EventScript_1F0F87:: @ 81F0F87
+	applymovement 255, Route111_Movement_1F0FAA
+	waitmovement 0
+	return
+
+Route111_EventScript_1F0F92:: @ 81F0F92
+	applymovement 255, Route111_Movement_1F0FAC
+	waitmovement 0
+	return
+
+Route111_EventScript_1F0F9D:: @ 81F0F9D
+	applymovement 255, Route111_Movement_1F0FAE
+	waitmovement 0
+	return
+
+Route111_Movement_1F0FA8: @ 81F0FA8
+	walk_up
+	step_end
+
+Route111_Movement_1F0FAA: @ 81F0FAA
+	walk_down
+	step_end
+
+Route111_Movement_1F0FAC: @ 81F0FAC
+	walk_left
+	step_end
+
+Route111_Movement_1F0FAE: @ 81F0FAE
+	walk_right
+	step_end
+
+Route111_EventScript_1F0FB0:: @ 81F0FB0
+	setweather 2
+	fadenewbgm MUS_DOORO_X1
+	doweather
+	setvar VAR_TEMP_3, 0
+	end
+
+Route111_EventScript_1F0FBD:: @ 81F0FBD
+	setweather 8
+	fadenewbgm MUS_ASHROAD
+	doweather
+	end
+
+Route111_EventScript_1F0FC5:: @ 81F0FC5
+	lock
+	faceplayer
+	setflag FLAG_LANDMARK_WINSTRATE_FAMILY
+	msgbox Route111_Text_1F1475, 5
+	compare VAR_RESULT, 1
+	goto_eq Route111_EventScript_1F0FE7
+	msgbox Route111_Text_1F14F5, 4
+	release
+	end
+
+Route111_EventScript_1F0FE7:: @ 81F0FE7
+	msgbox Route111_Text_1F1523, 4
+	trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_1F1542
+	applymovement 1, Route111_Movement_2725A6
+	waitmovement 0
+	call Route111_EventScript_1F113C
+	msgbox Route111_Text_1F156F, 4
+	closemessage
+	applymovement 1, Route111_Movement_1F114A
+	waitmovement 0
+	removeobject 1
+	call Route111_EventScript_1F1143
+	applymovement 255, Route111_Movement_1F114F
+	waitmovement 0
+	call Route111_EventScript_1F113C
+	addobject 2
+	applymovement 2, Route111_Movement_1F114D
+	waitmovement 0
+	call Route111_EventScript_1F1143
+	msgbox Route111_Text_1F159D, 4
+	trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_1F1616
+	applymovement 2, Route111_Movement_2725A6
+	waitmovement 0
+	call Route111_EventScript_1F113C
+	msgbox Route111_Text_1F1645, 4
+	closemessage
+	applymovement 2, Route111_Movement_1F114A
+	waitmovement 0
+	removeobject 2
+	call Route111_EventScript_1F1143
+	applymovement 255, Route111_Movement_1F114F
+	waitmovement 0
+	call Route111_EventScript_1F113C
+	addobject 3
+	applymovement 3, Route111_Movement_1F114D
+	waitmovement 0
+	call Route111_EventScript_1F1143
+	msgbox Route111_Text_1F167E, 4
+	trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_1F16C6
+	applymovement 3, Route111_Movement_2725A6
+	waitmovement 0
+	call Route111_EventScript_1F113C
+	msgbox Route111_Text_1F16DC, 4
+	closemessage
+	applymovement 3, Route111_Movement_1F114A
+	waitmovement 0
+	removeobject 3
+	call Route111_EventScript_1F1143
+	applymovement 255, Route111_Movement_1F114F
+	waitmovement 0
+	call Route111_EventScript_1F113C
+	addobject 4
+	applymovement 4, Route111_Movement_1F114D
+	waitmovement 0
+	call Route111_EventScript_1F1143
+	msgbox Route111_Text_1F16FB, 4
+	trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_1F1756
+	msgbox Route111_Text_1F1788, 4
+	closemessage
+	applymovement 4, Route111_Movement_2725A6
+	waitmovement 0
+	call Route111_EventScript_1F113C
+	applymovement 4, Route111_Movement_1F114A
+	waitmovement 0
+	removeobject 4
+	call Route111_EventScript_1F1143
+	release
+	end
+
+Route111_EventScript_1F113C:: @ 81F113C
+	opendoor 13, 113
+	waitdooranim
+	return
+
+Route111_EventScript_1F1143:: @ 81F1143
+	closedoor 13, 113
+	waitdooranim
+	return
+
+Route111_Movement_1F114A: @ 81F114A
+	walk_in_place_fastest_up
+	walk_up
+	step_end
+
+Route111_Movement_1F114D: @ 81F114D
+	walk_down
+	step_end
+
+Route111_Movement_1F114F: @ 81F114F
+	delay_16
+	delay_16
+	delay_16
+	step_end
+
+Route111_EventScript_1F1153:: @ 81F1153
+	msgbox Route111_Text_1F18CE, 3
+	end
+
+Route111_EventScript_1F115C:: @ 81F115C
+	msgbox Route111_Text_1F18E8, 3
+	end
+
+Route111_EventScript_1F1165:: @ 81F1165
+	msgbox Route111_Text_1F1921, 3
+	end
+
+Route111_EventScript_1F116E:: @ 81F116E
+	msgbox Route111_Text_1F1937, 3
+	end
+
+Route111_EventScript_1F1177:: @ 81F1177
+	msgbox Route111_Text_1F194D, 3
+	end
+
+Route111_EventScript_1F1180:: @ 81F1180
+	msgbox Route111_Text_1F1987, 3
+	end
+
+Route111_EventScript_1F1189:: @ 81F1189
+	msgbox Route111_Text_1F17BA, 2
+	end
+
+Route111_EventScript_1F1192:: @ 81F1192
+	msgbox Route111_Text_1F186E, 2
+	end
+
+Route111_EventScript_1F119B:: @ 81F119B
+	lock
+	faceplayer
+	compare VAR_0x40CB, 3
+	goto_eq Route111_EventScript_1F11C6
+	compare VAR_0x40CB, 2
+	goto_eq Route111_EventScript_1F11D0
+	checkflag FLAG_0x14E
+	goto_eq Route111_EventScript_1F11DA
+	msgbox Route111_Text_1F1A22, 4
+	release
+	end
+
+Route111_EventScript_1F11C6:: @ 81F11C6
+	msgbox Route111_Text_1F1C12, 4
+	release
+	end
+
+Route111_EventScript_1F11D0:: @ 81F11D0
+	msgbox Route111_Text_1F1B92, 4
+	release
+	end
+
+Route111_EventScript_1F11DA:: @ 81F11DA
+	msgbox Route111_Text_1F1AC7, 4
+	release
+	end
+
+Route111_EventScript_1F11E4:: @ 81F11E4
+	lockall
+	applymovement 46, Route111_Movement_27259E
+	waitmovement 0
+	msgbox Route111_Text_1F1CCA, 4
+	closemessage
+	applymovement 46, Route111_Movement_2725A2
+	waitmovement 0
+	releaseall
+	end
+
+Route111_EventScript_1F1204:: @ 81F1204
+	trainerbattle 0, TRAINER_DREW, 0, Route111_Text_29878E, Route111_Text_29880A
+	msgbox Route111_Text_298853, 6
+	end
+
+Route111_EventScript_1F121B:: @ 81F121B
+	trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_2988A3, Route111_Text_298908
+	msgbox Route111_Text_29891B, 6
+	end
+
+Route111_EventScript_1F1232:: @ 81F1232
+	trainerbattle 0, TRAINER_BEAU, 0, Route111_Text_29898E, Route111_Text_2989E6
+	msgbox Route111_Text_298A03, 6
+	end
+
+Route111_EventScript_1F1249:: @ 81F1249
+	trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_298A65, Route111_Text_298AAF
+	msgbox Route111_Text_298AC0, 6
+	end
+
+Route111_EventScript_1F1260:: @ 81F1260
+	trainerbattle 2, TRAINER_DUSTY_1, 0, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route111_EventScript_1F12AB
+	msgbox Route111_Text_298B9A, 4
+	release
+	end
+
+Route111_EventScript_1F128C:: @ 81F128C
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route111_Text_298C00, 4
+	setvar VAR_0x8004, 44
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 44
+	callstd 8
+	release
+	end
+
+Route111_EventScript_1F12AB:: @ 81F12AB
+	trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_298C5F, Route111_Text_298CD2
+	msgbox Route111_Text_298D0C, 6
+	end
+
+Route111_EventScript_1F12C2:: @ 81F12C2
+	trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_298DA9, Route111_Text_298DD8
+	msgbox Route111_Text_298DF1, 6
+	end
+
+Route111_EventScript_1F12D9:: @ 81F12D9
+	trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_298E2F, Route111_Text_298E6E
+	msgbox Route111_Text_298E8C, 6
+	end
+
+Route111_EventScript_1F12F0:: @ 81F12F0
+	trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_298EE6, Route111_Text_298F14
+	msgbox Route111_Text_298F26, 6
+	end
+
+Route111_EventScript_1F1307:: @ 81F1307
+	trainerbattle 2, TRAINER_WILTON_1, 0, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route111_EventScript_1F1352
+	msgbox Route111_Text_298FD4, 4
+	release
+	end
+
+Route111_EventScript_1F1333:: @ 81F1333
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route111_Text_29903D, 4
+	setvar VAR_0x8004, 78
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 78
+	callstd 8
+	release
+	end
+
+Route111_EventScript_1F1352:: @ 81F1352
+	trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_29909B, Route111_Text_2990EE
+	msgbox Route111_Text_299102, 6
+	end
+
+Route111_EventScript_1F1369:: @ 81F1369
+	trainerbattle 2, TRAINER_BROOKE_1, 0, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route111_EventScript_1F13B4
+	msgbox Route111_Text_2991C2, 4
+	release
+	end
+
+Route111_EventScript_1F1395:: @ 81F1395
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route111_Text_29921D, 4
+	setvar VAR_0x8004, 94
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 94
+	callstd 8
+	release
+	end
+
+Route111_EventScript_1F13B4:: @ 81F13B4
+	trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_29925D, Route111_Text_2992D6
+	msgbox Route111_Text_2992F5, 6
+	end
+
+Route111_EventScript_1F13CB:: @ 81F13CB
+	trainerbattle 0, TRAINER_HAYDEN, 0, Route111_Text_299682, Route111_Text_2996BE
+	msgbox Route111_Text_2996C5, 6
+	end
+
+Route111_EventScript_1F13E2:: @ 81F13E2
+	trainerbattle 0, TRAINER_BIANCA, 0, Route111_Text_2996FE, Route111_Text_29973D
+	msgbox Route111_Text_29975D, 6
+	end
+
+Route111_EventScript_1F13F9:: @ 81F13F9
+	trainerbattle 0, TRAINER_TYRON, 0, Route111_Text_299524, Route111_Text_299549
+	msgbox Route111_Text_299576, 6
+	end
+
+Route111_EventScript_1F1410:: @ 81F1410
+	trainerbattle 0, TRAINER_CELINA, 0, Route111_Text_2995F0, Route111_Text_299625
+	msgbox Route111_Text_29964B, 6
+	end
+
+Route111_EventScript_1F1427:: @ 81F1427
+	trainerbattle 0, TRAINER_CELIA, 0, Route111_Text_29934B, Route111_Text_299384
+	msgbox Route111_Text_2993A7, 6
+	end
+
+Route111_EventScript_1F143E:: @ 81F143E
+	trainerbattle 0, TRAINER_BRYAN, 0, Route111_Text_299401, Route111_Text_299431
+	msgbox Route111_Text_29945F, 6
+	end
+
+Route111_EventScript_1F1455:: @ 81F1455
+	trainerbattle 0, TRAINER_BRANDEN, 0, Route111_Text_299493, Route111_Text_2994C5
+	msgbox Route111_Text_2994FB, 6
+	end
+
+Route111_EventScript_1F146C:: @ 81F146C
+	msgbox Route111_Text_1F1D61, 3
+	end
+
+Route111_Text_1F1475: @ 81F1475
+	.string "Hello! I take it you’re a traveler.\p"
+	.string "How’s this? What do you say to taking\n"
+	.string "on our family of four in a series of\l"
+	.string "POKéMON battles?$"
+
+Route111_Text_1F14F5: @ 81F14F5
+	.string "Is that so?\n"
+	.string "Drop in, if you change your mind!$"
+
+Route111_Text_1F1523: @ 81F1523
+	.string "That’s the spirit! I like you!$"
+
+Route111_Text_1F1542: @ 81F1542
+	.string "Aiyah!\n"
+	.string "You’re a lot tougher than I expected!$"
+
+Route111_Text_1F156F: @ 81F156F
+	.string "Hey, all!\n"
+	.string "I’ve found a pretty strong TRAINER!$"
+
+Route111_Text_1F159D: @ 81F159D
+	.string "Oh, my goodness! Aren’t you young?\p"
+	.string "You must be quite the TRAINER to beat\n"
+	.string "my husband, though.\p"
+	.string "It’s my turn to battle now!$"
+
+Route111_Text_1F1616: @ 81F1616
+	.string "Oh, gosh!\n"
+	.string "I can’t get over how strong you are!$"
+
+Route111_Text_1F1645: @ 81F1645
+	.string "There’s a strong TRAINER here!\n"
+	.string "This one’s really strong!$"
+
+Route111_Text_1F167E: @ 81F167E
+	.string "You’re stronger than Mommy? Wow!\p"
+	.string "But I’m strong, too!\n"
+	.string "Really! Honestly!$"
+
+Route111_Text_1F16C6: @ 81F16C6
+	.string "Huh? Did I just lose?$"
+
+Route111_Text_1F16DC: @ 81F16DC
+	.string "This stinks…\p"
+	.string "…Snivel… Grandma!$"
+
+Route111_Text_1F16FB: @ 81F16FB
+	.string "How dare you make my granddaughter\n"
+	.string "cry!\p"
+	.string "For that, I’m going to smack you!\n"
+	.string "Prepare to lose!$"
+
+Route111_Text_1F1756: @ 81F1756
+	.string "Kwah! You are strong…\n"
+	.string "My granddaughter was right…$"
+
+Route111_Text_1F1788: @ 81F1788
+	.string "If you’re not in any hurry,\n"
+	.string "visit with us awhile.$"
+
+Route111_Text_1F17BA: @ 81F17BA
+	.string "If you don’t raise your POKéMON some\n"
+	.string "more, it could be tough to keep winning\l"
+	.string "up through the ranks.\p"
+	.string "I’ve heard the POKéMON LEAGUE’s\n"
+	.string "ELITE FOUR are far stronger than\l"
+	.string "any GYM LEADER.$"
+
+Route111_Text_1F186E: @ 81F186E
+	.string "I challenged the WINSTRATE family,\n"
+	.string "but four matches in a row is tough\l"
+	.string "going… They destroyed me.$"
+
+Route111_Text_1F18CE: @ 81F18CE
+	.string "ROUTE 111\n"
+	.string "{0x7A} MAUVILLE CITY$"
+
+Route111_Text_1F18E8: @ 81F18E8
+	.string "“Our family’s hearts beat as one!”\n"
+	.string "THE WINSTRATE’S HOUSE$"
+
+Route111_Text_1F1921: @ 81F1921
+	.string "ROUTE 111\n"
+	.string "{0x7B} ROUTE 112$"
+
+Route111_Text_1F1937: @ 81F1937
+	.string "ROUTE 111\n"
+	.string "{0x7B} ROUTE 113$"
+
+Route111_Text_1F194D: @ 81F194D
+	.string "OLD LADY’S REST STOP\n"
+	.string "“Come in and rest your tired bones.”$"
+
+Route111_Text_1F1987: @ 81F1987
+	.string "TRAINER TIPS\p"
+	.string "One of the indicators of a POKéMON’s\n"
+	.string "powerfulness is SP. ATK. It stands for\l"
+	.string "“SPECIAL ATTACK.”\p"
+	.string "Likewise, SP. DEF stands for “SPECIAL\n"
+	.string "DEFENSE.”$"
+
+Route111_Text_1F1A22: @ 81F1A22
+	.string "There should be a tower made of sand\n"
+	.string "around here somewhere.\p"
+	.string "But for some reason, it can be seen\n"
+	.string "sometimes, and sometimes not.\p"
+	.string "That’s why I call it the MIRAGE TOWER.$"
+
+Route111_Text_1F1AC7: @ 81F1AC7
+	.string "I see it!\n"
+	.string "The tower of sand!\p"
+	.string "The sand tower they called a mirage\n"
+	.string "is clearly visible!\p"
+	.string "But it looks so fragile…\n"
+	.string "It could crumble away anytime…\p"
+	.string "I want to go inside it, but I can’t\n"
+	.string "get my courage up for it…$"
+
+Route111_Text_1F1B92: @ 81F1B92
+	.string "Whoa…\n"
+	.string "That was shocking.\p"
+	.string "Sand rained down in chunks all of\n"
+	.string "a sudden.\p"
+	.string "What was it like inside?\n"
+	.string "Were there sandy ghosts and such?$"
+
+Route111_Text_1F1C12: @ 81F1C12
+	.string "Since I spoke to you, the tower of sand\n"
+	.string "hasn’t been seen.\p"
+	.string "Perhaps it really was\n"
+	.string "the MIRAGE TOWER…$"
+
+Route111_Text_1F1C74: @ 81F1C74
+	.string "The CLAW FOSSIL disappeared into\n"
+	.string "the sand…$"
+
+Route111_Text_1F1C9F: @ 81F1C9F
+	.string "The ROOT FOSSIL disappeared into\n"
+	.string "the sand…$"
+
+Route111_Text_1F1CCA: @ 81F1CCA
+	.string "Oh, no!\p"
+	.string "My uncle in MAUVILLE told me to take\n"
+	.string "ROCK SMASH with me if I was going to\l"
+	.string "ROUTE 111!\p"
+	.string "My uncle? He lives across from\n"
+	.string "the bike shop in MAUVILLE.$"
+
+Route111_Text_1F1D61: @ 81F1D61
+	.string "{0x7C} TRAINER HILL ENTRANCE\p"
+	.string "“Scale the heights, you hot-blooded\n"
+	.string "TRAINERS!”$"
+
diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc
new file mode 100644
index 000000000..5ade76ba3
--- /dev/null
+++ b/data/maps/Route111_OldLadysRestStop/events.inc
@@ -0,0 +1,10 @@
+Route111_OldLadysRestStop_EventObjects: @ 8533C18
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0
+
+Route111_OldLadysRestStop_MapWarps: @ 8533C30
+	warp_def 3, 7, 0, 2, MAP_ROUTE111
+	warp_def 4, 7, 0, 2, MAP_ROUTE111
+
+Route111_OldLadysRestStop_MapEvents:: @ 8533C40
+	map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc
index 8de668c4b..c2c055af6 100644
--- a/data/maps/Route111_OldLadysRestStop/header.inc
+++ b/data/maps/Route111_OldLadysRestStop/header.inc
@@ -1,5 +1,5 @@
 Route111_OldLadysRestStop: @ 8483DC4
-	.4byte Route111_OldLadysRestStop_MapAttributes
+	.4byte House3_Layout
 	.4byte Route111_OldLadysRestStop_MapEvents
 	.4byte Route111_OldLadysRestStop_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc
index 015a584f4..015a584f4 100644
--- a/data/scripts/maps/Route111_OldLadysRestStop.inc
+++ b/data/maps/Route111_OldLadysRestStop/scripts.inc
diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc
new file mode 100644
index 000000000..0fe5b5df4
--- /dev/null
+++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc
@@ -0,0 +1,13 @@
+Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0
+
+Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4
+	warp_def 3, 7, 0, 0, MAP_ROUTE111
+	warp_def 4, 7, 0, 0, MAP_ROUTE111
+
+Route111_WinstrateFamilysHouse_MapEvents:: @ 8533C04
+	map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc
index 86a766b6d..4cf6ca023 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/header.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc
@@ -1,5 +1,5 @@
 Route111_WinstrateFamilysHouse: @ 8483DA8
-	.4byte Route111_WinstrateFamilysHouse_MapAttributes
+	.4byte House2_Layout
 	.4byte Route111_WinstrateFamilysHouse_MapEvents
 	.4byte Route111_WinstrateFamilysHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
index 847119d2e..847119d2e 100644
--- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc
index a8d94d710..132c4ff76 100644
--- a/data/maps/Route112/connections.inc
+++ b/data/maps/Route112/connections.inc
@@ -1,7 +1,7 @@
 Route112_MapConnectionsList: @ 848699C
-	connection up, -60, ROUTE_113, 0
-	connection left, 40, LAVARIDGE_TOWN, 0
-	connection right, -20, ROUTE_111, 0
+	connection up, -60, MAP_ROUTE113
+	connection left, 40, MAP_LAVARIDGE_TOWN
+	connection right, -20, MAP_ROUTE111
 
 Route112_MapConnections: @ 84869C0
 	.4byte 0x3
diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc
new file mode 100644
index 000000000..0e218cd78
--- /dev/null
+++ b/data/maps/Route112/events.inc
@@ -0,0 +1,32 @@
+Route112_EventObjects: @ 8529974
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, 7, 1, 1, 0, 0, Route112_EventScript_1F1DB7, 819
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0
+	object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0
+	object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, 26, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011
+	object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 31, 7, 3, 18, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, 15, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0
+
+Route112_MapWarps: @ 8529AC4
+	warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION
+	warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION
+	warp_def 6, 46, 3, 0, MAP_JAGGED_PASS
+	warp_def 7, 46, 3, 1, MAP_JAGGED_PASS
+	warp_def 11, 36, 0, 0, MAP_FIERY_PATH
+	warp_def 22, 10, 0, 1, MAP_FIERY_PATH
+
+Route112_MapBGEvents: @ 8529AF4
+	bg_event 19, 44, 3, 0, 0, Route112_EventScript_1F1E4F
+	bg_event 22, 37, 0, 0, 0, Route112_EventScript_1F1E46
+	bg_event 4, 49, 0, 0, 0, Route112_EventScript_1F1E58
+
+Route112_MapEvents:: @ 8529B18
+	map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents
+
diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc
index e0411ce05..397c0060a 100644
--- a/data/maps/Route112/header.inc
+++ b/data/maps/Route112/header.inc
@@ -1,5 +1,5 @@
 Route112: @ 84827AC
-	.4byte Route112_MapAttributes
+	.4byte Route112_Layout
 	.4byte Route112_MapEvents
 	.4byte Route112_MapScripts
 	.4byte Route112_MapConnections
diff --git a/data/scripts/maps/Route112.inc b/data/maps/Route112/scripts.inc
index 0ad5ee47c..0ad5ee47c 100644
--- a/data/scripts/maps/Route112.inc
+++ b/data/maps/Route112/scripts.inc
diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc
new file mode 100644
index 000000000..77f37d72c
--- /dev/null
+++ b/data/maps/Route112_CableCarStation/events.inc
@@ -0,0 +1,11 @@
+Route112_CableCarStation_EventObjects: @ 8533C54
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0
+	object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0
+
+Route112_CableCarStation_MapWarps: @ 8533C84
+	warp_def 6, 11, 0, 0, MAP_ROUTE112
+	warp_def 7, 11, 0, 1, MAP_ROUTE112
+
+Route112_CableCarStation_MapEvents:: @ 8533C94
+	map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc
index 6caefade9..72667053d 100644
--- a/data/maps/Route112_CableCarStation/header.inc
+++ b/data/maps/Route112_CableCarStation/header.inc
@@ -1,5 +1,5 @@
 Route112_CableCarStation: @ 8483DE0
-	.4byte Route112_CableCarStation_MapAttributes
+	.4byte CableCarStation_Layout
 	.4byte Route112_CableCarStation_MapEvents
 	.4byte Route112_CableCarStation_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc
new file mode 100644
index 000000000..93e8ea759
--- /dev/null
+++ b/data/maps/Route112_CableCarStation/scripts.inc
@@ -0,0 +1,99 @@
+Route112_CableCarStation_MapScripts:: @ 822AABE
+	map_script 3, Route112_CableCarStation_MapScript1_22AAC9
+	map_script 2, Route112_CableCarStation_MapScript2_22AAE9
+	.byte 0
+
+Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9
+	setescapewarp MAP_ROUTE112, 255, 28, 28
+	compare VAR_0x40A3, 2
+	call_if 1, Route112_CableCarStation_EventScript_22AADD
+	end
+
+Route112_CableCarStation_EventScript_22AADD:: @ 822AADD
+	setobjectxyperm 1, 7, 4
+	setobjectmovementtype 1, 9
+	return
+
+Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9
+	map_script_2 VAR_0x40A3, 2, Route112_CableCarStation_EventScript_22AAF3
+	.2byte 0
+
+Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3
+	lockall
+	applymovement 255, Route112_CableCarStation_Movement_22AB80
+	applymovement 1, Route112_CableCarStation_Movement_22AB76
+	waitmovement 0
+	setvar VAR_0x40A3, 0
+	setobjectxyperm 1, 6, 7
+	setobjectmovementtype 1, 8
+	releaseall
+	end
+
+Route112_CableCarStation_EventScript_22AB17:: @ 822AB17
+	lock
+	faceplayer
+	msgbox Route112_CableCarStation_Text_22AB85, 5
+	compare VAR_RESULT, 1
+	goto_eq Route112_CableCarStation_EventScript_22AB38
+	compare VAR_RESULT, 0
+	goto_eq Route112_CableCarStation_EventScript_22AB67
+	end
+
+Route112_CableCarStation_EventScript_22AB38:: @ 822AB38
+	msgbox Route112_CableCarStation_Text_22ABC2, 4
+	closemessage
+	applymovement 1, Route112_CableCarStation_Movement_22AB71
+	applymovement 255, Route112_CableCarStation_Movement_22AB7B
+	waitmovement 0
+	setvar VAR_0x8004, 0
+	setvar VAR_0x40A3, 1
+	incrementgamestat 48
+	special CableCarWarp
+	special sub_814FC9C
+	waitstate
+	release
+	end
+
+Route112_CableCarStation_EventScript_22AB67:: @ 822AB67
+	msgbox Route112_CableCarStation_Text_22ABD8, 4
+	release
+	end
+
+Route112_CableCarStation_Movement_22AB71: @ 822AB71
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_left
+	step_end
+
+Route112_CableCarStation_Movement_22AB76: @ 822AB76
+	delay_16
+	walk_left
+	walk_down
+	walk_down
+	step_end
+
+Route112_CableCarStation_Movement_22AB7B: @ 822AB7B
+	walk_up
+	walk_up
+	walk_up
+	delay_16
+	step_end
+
+Route112_CableCarStation_Movement_22AB80: @ 822AB80
+	walk_down
+	walk_down
+	walk_down
+	delay_16
+	step_end
+
+Route112_CableCarStation_Text_22AB85: @ 822AB85
+	.string "The CABLE CAR is ready to go up.\n"
+	.string "Would you like to be on it?$"
+
+Route112_CableCarStation_Text_22ABC2: @ 822ABC2
+	.string "Please step this way.$"
+
+Route112_CableCarStation_Text_22ABD8: @ 822ABD8
+	.string "Please ride with us another time.$"
+
diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc
index 1ba0cf64c..3067ee23b 100644
--- a/data/maps/Route113/connections.inc
+++ b/data/maps/Route113/connections.inc
@@ -1,7 +1,7 @@
 Route113_MapConnectionsList: @ 84869C8
-	connection down, 60, ROUTE_112, 0
-	connection left, 0, FALLARBOR_TOWN, 0
-	connection right, 0, ROUTE_111, 0
+	connection down, 60, MAP_ROUTE112
+	connection left, 0, MAP_FALLARBOR_TOWN
+	connection right, 0, MAP_ROUTE111
 
 Route113_MapConnections: @ 84869EC
 	.4byte 0x3
diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc
new file mode 100644
index 000000000..25287a747
--- /dev/null
+++ b/data/maps/Route113/events.inc
@@ -0,0 +1,57 @@
+Route113_EventObjects: @ 8529B2C
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_1F2193, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, 3, 0, 1, 0, 0, Route113_EventScript_1F218A, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013
+	object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F2250, 0
+	object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 71, 2, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0
+	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, 8, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0
+	object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, 8, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, 1, 1, 1, 0, 0, Route113_EventScript_290DF6, 1143
+	object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, 9, 1, 1, 1, 4, Route113_EventScript_1F2344, 0
+	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, 7, 1, 1, 1, 1, Route113_EventScript_1F232D, 0
+	object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, 26, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 7, 13, 3, 25, 1, 3, 1, 6, Route113_EventScript_1F2316, 0
+
+Route113_MapWarps: @ 8529CAC
+	warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP
+	warp_def 41, 12, 0, 0, MAP_TERRA_CAVE_ENTRANCE
+	warp_def 88, 5, 0, 0, MAP_TERRA_CAVE_ENTRANCE
+
+Route113_MapCoordEvents: @ 8529CC4
+	coord_event 19, 11, 3, 0, 8, 0, 0, 0x0
+	coord_event 19, 10, 3, 0, 8, 0, 0, 0x0
+	coord_event 19, 12, 3, 0, 8, 0, 0, 0x0
+	coord_event 19, 13, 3, 0, 8, 0, 0, 0x0
+	coord_event 86, 9, 3, 0, 8, 0, 0, 0x0
+	coord_event 85, 10, 3, 0, 8, 0, 0, 0x0
+	coord_event 85, 11, 3, 0, 8, 0, 0, 0x0
+	coord_event 14, 10, 3, 0, 2, 0, 0, 0x0
+	coord_event 14, 11, 3, 0, 2, 0, 0, 0x0
+	coord_event 14, 12, 3, 0, 2, 0, 0, 0x0
+	coord_event 14, 13, 3, 0, 2, 0, 0, 0x0
+	coord_event 94, 8, 3, 0, 2, 0, 0, 0x0
+	coord_event 94, 9, 3, 0, 2, 0, 0, 0x0
+	coord_event 94, 10, 3, 0, 2, 0, 0, 0x0
+	coord_event 94, 11, 0, 0, 2, 0, 0, 0x0
+	coord_event 19, 14, 3, 0, 8, 0, 0, 0x0
+	coord_event 87, 8, 3, 0, 8, 0, 0, 0x0
+	coord_event 87, 6, 3, 0, 8, 0, 0, 0x0
+	coord_event 87, 7, 3, 0, 8, 0, 0, 0x0
+
+Route113_MapBGEvents: @ 8529DF4
+	bg_event 85, 6, 0, 0, 0, Route113_EventScript_1F219C
+	bg_event 12, 9, 0, 0, 0, Route113_EventScript_1F21A5
+	bg_event 58, 4, 3, 0, 0, Route113_EventScript_1F21B7
+	bg_event 31, 5, 0, 0, 0, Route113_EventScript_1F21AE
+	bg_event 49, 8, 3, 8, 0, ITEM_GREAT_BALL, 0, 0
+	bg_event 66, 3, 3, 7, 0, ITEM_ETHER, 3, 0
+	bg_event 22, 5, 3, 7, 0, ITEM_TM32, 30, 0
+	bg_event 73, 3, 3, 7, 0, ITEM_NUGGET, 98, 0
+
+Route113_MapEvents:: @ 8529E54
+	map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
+
diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc
index a8c19f49d..87d56215e 100644
--- a/data/maps/Route113/header.inc
+++ b/data/maps/Route113/header.inc
@@ -1,5 +1,5 @@
 Route113: @ 84827C8
-	.4byte Route113_MapAttributes
+	.4byte Route113_Layout
 	.4byte Route113_MapEvents
 	.4byte Route113_MapScripts
 	.4byte Route113_MapConnections
diff --git a/data/scripts/maps/Route113.inc b/data/maps/Route113/scripts.inc
index 63dc6c47f..63dc6c47f 100644
--- a/data/scripts/maps/Route113.inc
+++ b/data/maps/Route113/scripts.inc
diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc
new file mode 100644
index 000000000..1d5104e1c
--- /dev/null
+++ b/data/maps/Route113_GlassWorkshop/events.inc
@@ -0,0 +1,11 @@
+Route113_GlassWorkshop_EventObjects: @ 853EA78
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, 2, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0
+
+Route113_GlassWorkshop_MapWarps: @ 853EAA8
+	warp_def 3, 8, 0, 0, MAP_ROUTE113
+	warp_def 4, 8, 0, 0, MAP_ROUTE113
+
+Route113_GlassWorkshop_MapEvents:: @ 853EAB8
+	map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc
index 49c0005b0..e9424580a 100644
--- a/data/maps/Route113_GlassWorkshop/header.inc
+++ b/data/maps/Route113_GlassWorkshop/header.inc
@@ -1,5 +1,5 @@
 Route113_GlassWorkshop: @ 8485CB8
-	.4byte Route113_GlassWorkshop_MapAttributes
+	.4byte House4_Layout
 	.4byte Route113_GlassWorkshop_MapEvents
 	.4byte Route113_GlassWorkshop_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/scripts.inc
index 5ea100567..5ea100567 100644
--- a/data/scripts/maps/Route113_GlassWorkshop.inc
+++ b/data/maps/Route113_GlassWorkshop/scripts.inc
diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc
index 8569b143f..760c2ddc0 100644
--- a/data/maps/Route114/connections.inc
+++ b/data/maps/Route114/connections.inc
@@ -1,6 +1,6 @@
 Route114_MapConnectionsList: @ 84869F4
-	connection left, 40, ROUTE_115, 0
-	connection right, 0, FALLARBOR_TOWN, 0
+	connection left, 40, MAP_ROUTE115
+	connection right, 0, MAP_FALLARBOR_TOWN
 
 Route114_MapConnections: @ 8486A0C
 	.4byte 0x2
diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc
new file mode 100644
index 000000000..3e48c5721
--- /dev/null
+++ b/data/maps/Route114/events.inc
@@ -0,0 +1,53 @@
+Route114_EventObjects: @ 8529E68
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, 12, 0, 0, 0, 77, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, 12, 0, 0, 0, 78, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1F2640, 0
+	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, 9, 0, 0, 1, 4, Route114_EventScript_1F2657, 0
+	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_1F266E, 0
+	object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_1F2685, 0
+	object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_1F269C, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, 12, 0, 0, 0, 68, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_290E03, 1014
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_290E10, 1015
+	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, 1, 0, 0, 0, 0, Route114_EventScript_2907A6, 17
+	object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0
+	object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F2612, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, 3, 0, 1, 0, 0, Route114_EventScript_1F2582, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, 8, 0, 0, 1, 0, Route114_EventScript_1F2777, 0
+	object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1F2760, 0
+	object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0
+	object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 18
+	object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 19
+	object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 20
+	object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 21
+	object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, 8, 1, 1, 1, 1, Route114_EventScript_1F27A9, 0
+	object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, 8, 1, 1, 1, 1, Route114_EventScript_1F278E, 0
+	object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, 7, 1, 1, 1, 3, Route114_EventScript_1F27DB, 0
+	object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, 18, 1, 1, 1, 4, Route114_EventScript_1F27C4, 0
+	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, 1, 1, 1, 0, 0, Route114_EventScript_290E1D, 1160
+	object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, 17, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0
+
+Route114_MapWarps: @ 852A0F0
+	warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R
+	warp_def 29, 5, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE
+	warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE
+	warp_def 6, 46, 0, 0, MAP_TERRA_CAVE_ENTRANCE
+	warp_def 7, 4, 0, 0, MAP_TERRA_CAVE_ENTRANCE
+
+Route114_MapBGEvents: @ 852A118
+	bg_event 7, 64, 0, 0, 0, Route114_EventScript_1F2625
+	bg_event 31, 7, 0, 0, 0, Route114_EventScript_1F262E
+	bg_event 9, 47, 0, 8, 0, ITEM_RED_FLUTE, 0, 0
+	bg_event 30, 51, 0, 8, 0, ITEM_GREEN_SHARD, 0, 0
+	bg_event 11, 62, 0, 8, 0, 61, 0, 0
+	bg_event 19, 70, 0, 8, 0, ITEM_PP_MAX, 0, 0
+	bg_event 11, 27, 0, 8, 0, ITEM_EXP_SHARE, 0, 0
+	bg_event 12, 27, 0, 8, 0, ITEM_DEEP_SEA_TOOTH, 0, 0
+	bg_event 25, 38, 3, 0, 0, Route114_EventScript_1F2637
+	bg_event 20, 57, 3, 7, 0, ITEM_CARBOS, 4, 0
+	bg_event 32, 57, 0, 8, 0, ITEM_GUARD_SPEC, 0, 0
+	bg_event 7, 30, 3, 7, 0, ITEM_REVIVE, 42, 0
+
+Route114_MapEvents:: @ 852A1A8
+	map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents
+
diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc
index 5b9db262a..cda0036b3 100644
--- a/data/maps/Route114/header.inc
+++ b/data/maps/Route114/header.inc
@@ -1,5 +1,5 @@
 Route114: @ 84827E4
-	.4byte Route114_MapAttributes
+	.4byte Route114_Layout
 	.4byte Route114_MapEvents
 	.4byte Route114_MapScripts
 	.4byte Route114_MapConnections
diff --git a/data/scripts/maps/Route114.inc b/data/maps/Route114/scripts.inc
index 9443d35bc..9443d35bc 100644
--- a/data/scripts/maps/Route114.inc
+++ b/data/maps/Route114/scripts.inc
diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc
new file mode 100644
index 000000000..c947d9d8f
--- /dev/null
+++ b/data/maps/Route114_FossilManiacsHouse/events.inc
@@ -0,0 +1,17 @@
+Route114_FossilManiacsHouse_EventObjects: @ 8533CFC
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, 8, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0
+
+Route114_FossilManiacsHouse_MapWarps: @ 8533D14
+	warp_def 4, 7, 0, 1, MAP_ROUTE114
+	warp_def 5, 7, 0, 1, MAP_ROUTE114
+	warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL
+
+Route114_FossilManiacsHouse_MapBGEvents: @ 8533D2C
+	bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD73
+	bg_event 6, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD73
+	bg_event 7, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD7C
+	bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD7C
+
+Route114_FossilManiacsHouse_MapEvents:: @ 8533D5C
+	map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents
+
diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc
index 277c0c0df..efe6a1b76 100644
--- a/data/maps/Route114_FossilManiacsHouse/header.inc
+++ b/data/maps/Route114_FossilManiacsHouse/header.inc
@@ -1,5 +1,5 @@
 Route114_FossilManiacsHouse: @ 8483E18
-	.4byte Route114_FossilManiacsHouse_MapAttributes
+	.4byte Route114_FossilManiacsHouse_Layout
 	.4byte Route114_FossilManiacsHouse_MapEvents
 	.4byte Route114_FossilManiacsHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc
index f14c15f9e..f14c15f9e 100644
--- a/data/scripts/maps/Route114_FossilManiacsHouse.inc
+++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc
diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc
new file mode 100644
index 000000000..99edadee1
--- /dev/null
+++ b/data/maps/Route114_FossilManiacsTunnel/events.inc
@@ -0,0 +1,15 @@
+Route114_FossilManiacsTunnel_EventObjects: @ 8533D70
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, 7, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0
+
+Route114_FossilManiacsTunnel_MapWarps: @ 8533D88
+	warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE
+	warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE
+	warp_def 6, 2, 0, 0, MAP_DESERT_UNDERPASS
+
+Route114_FossilManiacsTunnel_MapCoordEvents: @ 8533DA0
+	coord_event 5, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66
+	coord_event 6, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66
+
+Route114_FossilManiacsTunnel_MapEvents:: @ 8533DC0
+	map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0
+
diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc
index 169b0b7a4..c20e1b2d3 100644
--- a/data/maps/Route114_FossilManiacsTunnel/header.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/header.inc
@@ -1,5 +1,5 @@
 Route114_FossilManiacsTunnel: @ 8483E34
-	.4byte Route114_FossilManiacsTunnel_MapAttributes
+	.4byte Route114_FossilManiacsTunnel_Layout
 	.4byte Route114_FossilManiacsTunnel_MapEvents
 	.4byte Route114_FossilManiacsTunnel_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
index bc5a6d977..bc5a6d977 100644
--- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc
new file mode 100644
index 000000000..352bb2037
--- /dev/null
+++ b/data/maps/Route114_LanettesHouse/events.inc
@@ -0,0 +1,15 @@
+Route114_LanettesHouse_EventObjects: @ 8533DD4
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870
+
+Route114_LanettesHouse_MapWarps: @ 8533DEC
+	warp_def 5, 7, 0, 2, MAP_ROUTE114
+	warp_def 6, 7, 0, 2, MAP_ROUTE114
+
+Route114_LanettesHouse_MapBGEvents: @ 8533DFC
+	bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B309
+	bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345
+	bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345
+
+Route114_LanettesHouse_MapEvents:: @ 8533E20
+	map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents
+
diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc
index ba4cccfd5..9a5763394 100644
--- a/data/maps/Route114_LanettesHouse/header.inc
+++ b/data/maps/Route114_LanettesHouse/header.inc
@@ -1,5 +1,5 @@
 Route114_LanettesHouse: @ 8483E50
-	.4byte Route114_LanettesHouse_MapAttributes
+	.4byte Route114_LanettesHouse_Layout
 	.4byte Route114_LanettesHouse_MapEvents
 	.4byte Route114_LanettesHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/scripts.inc
index 00bb4f226..00bb4f226 100644
--- a/data/scripts/maps/Route114_LanettesHouse.inc
+++ b/data/maps/Route114_LanettesHouse/scripts.inc
diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc
index 3f283eb91..4518e31fa 100644
--- a/data/maps/Route115/connections.inc
+++ b/data/maps/Route115/connections.inc
@@ -1,6 +1,6 @@
 Route115_MapConnectionsList: @ 8486A14
-	connection down, 0, RUSTBORO_CITY, 0
-	connection right, -40, ROUTE_114, 0
+	connection down, 0, MAP_RUSTBORO_CITY
+	connection right, -40, MAP_ROUTE114
 
 Route115_MapConnections: @ 8486A2C
 	.4byte 0x2
diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc
new file mode 100644
index 000000000..37d886e7f
--- /dev/null
+++ b/data/maps/Route115/events.inc
@@ -0,0 +1,49 @@
+Route115_EventObjects: @ 852A1BC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, 2, 1, 1, 0, 0, Route115_EventScript_1F2973, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_1F298E, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, 15, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 69, BerryTreeScript, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, 12, 0, 0, 0, 70, BerryTreeScript, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 0, 71, BerryTreeScript, 0
+	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0
+	object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, 27, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, 18, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E37, 1017
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E44, 1018
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, 12, 0, 0, 0, 55, BerryTreeScript, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, 12, 0, 0, 0, 56, BerryTreeScript, 0
+	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, 1, 1, 1, 0, 0, Route115_EventScript_2907A6, 17
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, 1, 1, 1, 0, 0, Route115_EventScript_290E51, 1118
+	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, 46, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0
+	object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 11, 12, 3, 57, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0
+	object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, 9, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0
+	object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, 10, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0
+	object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, 9, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, 1, 1, 1, 0, 0, Route115_EventScript_290E6B, 1161
+	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, 1, 1, 1, 0, 0, Route115_EventScript_290E5E, 1144
+
+Route115_MapWarps: @ 852A3E4
+	warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R
+	warp_def 21, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE
+	warp_def 36, 10, 0, 0, MAP_TERRA_CAVE_ENTRANCE
+
+Route115_MapBGEvents: @ 852A3FC
+	bg_event 32, 6, 0, 8, 0, 72, 0, 0
+	bg_event 21, 18, 0, 8, 0, 62, 0, 0
+	bg_event 16, 64, 0, 0, 0, Route115_EventScript_1F297C
+	bg_event 25, 38, 3, 0, 0, Route115_EventScript_1F2985
+	bg_event 8, 30, 0, 8, 0, ITEM_CHERI_BERRY, 0, 0
+	bg_event 32, 39, 0, 8, 0, ITEM_BLACK_FLUTE, 0, 0
+	bg_event 26, 15, 0, 8, 0, 52, 0, 0
+	bg_event 23, 8, 0, 8, 0, ITEM_WHITE_FLUTE, 0, 0
+	bg_event 32, 46, 0, 8, 0, 53, 0, 0
+	bg_event 7, 20, 0, 8, 0, ITEM_STARF_BERRY, 0, 0
+	bg_event 8, 20, 0, 8, 0, ITEM_QUICK_CLAW, 0, 0
+	bg_event 25, 24, 0, 8, 0, ITEM_HP_UP, 0, 0
+	bg_event 20, 53, 0, 8, 0, ITEM_HYPER_POTION, 0, 0
+	bg_event 15, 49, 3, 7, 0, ITEM_HEART_SCALE, 97, 0
+
+Route115_MapEvents:: @ 852A4A4
+	map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents
+
diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc
index 4d135e0b6..97156442e 100644
--- a/data/maps/Route115/header.inc
+++ b/data/maps/Route115/header.inc
@@ -1,5 +1,5 @@
 Route115: @ 8482800
-	.4byte Route115_MapAttributes
+	.4byte Route115_Layout
 	.4byte Route115_MapEvents
 	.4byte Route115_MapScripts
 	.4byte Route115_MapConnections
diff --git a/data/scripts/maps/Route115.inc b/data/maps/Route115/scripts.inc
index 2d4f7c2e3..2d4f7c2e3 100644
--- a/data/scripts/maps/Route115.inc
+++ b/data/maps/Route115/scripts.inc
diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc
index e037bff3b..fef193c0f 100644
--- a/data/maps/Route116/connections.inc
+++ b/data/maps/Route116/connections.inc
@@ -1,6 +1,6 @@
 Route116_MapConnectionsList: @ 8486A34
-	connection down, 80, VERDANTURF_TOWN, 0
-	connection left, 0, RUSTBORO_CITY, 0
+	connection down, 80, MAP_VERDANTURF_TOWN
+	connection left, 0, MAP_RUSTBORO_CITY
 
 Route116_MapConnections: @ 8486A4C
 	.4byte 0x2
diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc
new file mode 100644
index 000000000..16afe4482
--- /dev/null
+++ b/data/maps/Route116/events.inc
@@ -0,0 +1,56 @@
+Route116_EventObjects: @ 852A4B8
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, 12, 0, 0, 0, 25, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, 12, 0, 0, 0, 26, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0
+	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 17
+	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 18
+	object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E85, 1019
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E92, 1020
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, 12, 0, 0, 0, 66, BerryTreeScript, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, 12, 0, 0, 0, 67, BerryTreeScript, 0
+	object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 19
+	object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, 15, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 20
+	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021
+	object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, 10, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0
+	object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0
+	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, 7, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0
+	object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, 1, 1, 1, 0, 0, Route116_EventScript_1F2CA2, 947
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, 1, 1, 1, 0, 0, Route116_EventScript_290E78, 1001
+	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, 10, 1, 1, 0, 0, Route116_EventScript_1F2C70, 894
+	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, 1, 1, 1, 0, 0, Route116_EventScript_1F2DB6, 813
+	object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 33, 8, 3, 7, 0, 0, 1, 1, Route116_EventScript_1F3041, 0
+	object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, 8, 0, 0, 1, 2, Route116_EventScript_1F3058, 0
+	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, 1, 1, 1, 0, 0, Route116_EventScript_290EAC, 1146
+	object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, 1, 1, 1, 0, 0, Route116_EventScript_2906BB, 21
+	object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, 18, 1, 1, 1, 5, Route116_EventScript_1F3086, 0
+	object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, 9, 1, 1, 1, 5, Route116_EventScript_1F306F, 0
+
+Route116_MapWarps: @ 852A758
+	warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL
+	warp_def 38, 8, 0, 0, MAP_ROUTE116_TUNNELERS_REST_HOUSE
+	warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL
+	warp_def 59, 13, 0, 0, MAP_TERRA_CAVE_ENTRANCE
+	warp_def 79, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE
+
+Route116_MapCoordEvents: @ 852A780
+	coord_event 47, 9, 3, 0, VAR_0x406F, 1, 0, Route116_EventScript_1F2D95
+
+Route116_MapBGEvents: @ 852A790
+	bg_event 5, 10, 0, 0, 0, Route116_EventScript_1F2D57
+	bg_event 48, 9, 0, 0, 0, Route116_EventScript_1F2D60
+	bg_event 40, 9, 0, 0, 0, Route116_EventScript_1F2D69
+	bg_event 71, 4, 0, 8, 0, ITEM_FLUFFY_TAIL, 0, 0
+	bg_event 79, 11, 0, 8, 0, 91, 0, 0
+	bg_event 16, 12, 0, 0, 0, Route116_EventScript_1F2D72
+	bg_event 29, 10, 0, 0, 0, Route116_EventScript_1F2D7B
+	bg_event 56, 6, 0, 8, 0, 102, 0, 0
+	bg_event 55, 15, 0, 8, 0, 112, 0, 0
+	bg_event 22, 9, 3, 7, 0, ITEM_SUPER_POTION, 45, 0
+	bg_event 70, 13, 3, 7, 0, ITEM_BLACK_GLASSES, 96, 0
+
+Route116_MapEvents:: @ 852A814
+	map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents
+
diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc
index 27009ad3f..919dffa6f 100644
--- a/data/maps/Route116/header.inc
+++ b/data/maps/Route116/header.inc
@@ -1,5 +1,5 @@
 Route116: @ 848281C
-	.4byte Route116_MapAttributes
+	.4byte Route116_Layout
 	.4byte Route116_MapEvents
 	.4byte Route116_MapScripts
 	.4byte Route116_MapConnections
diff --git a/data/scripts/maps/Route116.inc b/data/maps/Route116/scripts.inc
index 68a32c3b5..68a32c3b5 100644
--- a/data/scripts/maps/Route116.inc
+++ b/data/maps/Route116/scripts.inc
diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc
new file mode 100644
index 000000000..8d133ab6d
--- /dev/null
+++ b/data/maps/Route116_TunnelersRestHouse/events.inc
@@ -0,0 +1,12 @@
+Route116_TunnelersRestHouse_EventObjects: @ 8533E34
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0
+
+Route116_TunnelersRestHouse_MapWarps: @ 8533E7C
+	warp_def 4, 8, 0, 1, MAP_ROUTE116
+	warp_def 5, 8, 0, 1, MAP_ROUTE116
+
+Route116_TunnelersRestHouse_MapEvents:: @ 8533E8C
+	map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc
index 489c5a8b9..ac319327f 100644
--- a/data/maps/Route116_TunnelersRestHouse/header.inc
+++ b/data/maps/Route116_TunnelersRestHouse/header.inc
@@ -1,5 +1,5 @@
 Route116_TunnelersRestHouse: @ 8483E6C
-	.4byte Route116_TunnelersRestHouse_MapAttributes
+	.4byte Route116_TunnelersRestHouse_Layout
 	.4byte Route116_TunnelersRestHouse_MapEvents
 	.4byte Route116_TunnelersRestHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc
index f9dbbd3f2..f9dbbd3f2 100644
--- a/data/scripts/maps/Route116_TunnelersRestHouse.inc
+++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc
diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc
index ab64dd3b6..2780eac5a 100644
--- a/data/maps/Route117/connections.inc
+++ b/data/maps/Route117/connections.inc
@@ -1,6 +1,6 @@
 Route117_MapConnectionsList: @ 8486A54
-	connection left, 0, VERDANTURF_TOWN, 0
-	connection right, 0, MAUVILLE_CITY, 0
+	connection left, 0, MAP_VERDANTURF_TOWN
+	connection right, 0, MAP_MAUVILLE_CITY
 
 Route117_MapConnections: @ 8486A6C
 	.4byte 0x2
diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc
new file mode 100644
index 000000000..f84ef6212
--- /dev/null
+++ b/data/maps/Route117/events.inc
@@ -0,0 +1,38 @@
+Route117_EventObjects: @ 852A828
+	object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_1F399A, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 25, 5, 3, 40, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_291C18, 0
+	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 33, 3, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0
+	object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 38, 16, 3, 28, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 10, 3, 23, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0
+	object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 33, 11, 3, 16, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, 12, 0, 0, 0, 29, BerryTreeScript, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, 12, 0, 0, 0, 28, BerryTreeScript, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, 12, 0, 0, 0, 27, BerryTreeScript, 0
+	object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, 1, 0, 0, 0, 0, Route117_EventScript_2906BB, 17
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023
+	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 26, 13, 3, 33, 2, 2, 1, 5, Route117_EventScript_1F3AF6, 0
+	object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, 7, 1, 1, 1, 4, Route117_EventScript_1F3B58, 0
+	object_event 19, EVENT_OBJ_GFX_LASS, 0, 43, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0
+	object_event 20, EVENT_OBJ_GFX_LASS, 0, 42, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0
+	object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, 2, 1, 1, 0, 0, Route117_EventScript_1F39AC, 0
+	object_event 22, EVENT_OBJ_GFX_LASS, 0, 15, 4, 3, 10, 1, 1, 1, 4, Route117_EventScript_1F3C4E, 0
+	object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, 9, 1, 1, 1, 4, Route117_EventScript_1F3C65, 0
+	object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, 28, 4, 1, 1, 4, Route117_EventScript_1F3C37, 0
+
+Route117_MapWarps: @ 852AA68
+	warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE
+
+Route117_MapBGEvents: @ 852AA70
+	bg_event 16, 6, 0, 0, 0, Route117_EventScript_1F39B5
+	bg_event 49, 12, 0, 0, 0, Route117_EventScript_1F39BE
+	bg_event 49, 5, 0, 0, 0, Route117_EventScript_1F39C7
+	bg_event 3, 18, 3, 7, 0, ITEM_REPEL, 72, 0
+
+Route117_MapEvents:: @ 852AAA0
+	map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents
+
diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc
index d92b96e30..897d37afb 100644
--- a/data/maps/Route117/header.inc
+++ b/data/maps/Route117/header.inc
@@ -1,5 +1,5 @@
 Route117: @ 8482838
-	.4byte Route117_MapAttributes
+	.4byte Route117_Layout
 	.4byte Route117_MapEvents
 	.4byte Route117_MapScripts
 	.4byte Route117_MapConnections
diff --git a/data/scripts/maps/Route117.inc b/data/maps/Route117/scripts.inc
index 55a7b910e..55a7b910e 100644
--- a/data/scripts/maps/Route117.inc
+++ b/data/maps/Route117/scripts.inc
diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc
new file mode 100644
index 000000000..05220bdc9
--- /dev/null
+++ b/data/maps/Route117_PokemonDayCare/events.inc
@@ -0,0 +1,10 @@
+Route117_PokemonDayCare_EventObjects: @ 8533EA0
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0
+
+Route117_PokemonDayCare_MapWarps: @ 8533EB8
+	warp_def 2, 8, 0, 0, MAP_ROUTE117
+	warp_def 3, 8, 0, 0, MAP_ROUTE117
+
+Route117_PokemonDayCare_MapEvents:: @ 8533EC8
+	map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc
index 1ace346b5..f690fa432 100644
--- a/data/maps/Route117_PokemonDayCare/header.inc
+++ b/data/maps/Route117_PokemonDayCare/header.inc
@@ -1,5 +1,5 @@
 Route117_PokemonDayCare: @ 8483E88
-	.4byte Route117_PokemonDayCare_MapAttributes
+	.4byte Route117_PokemonDayCare_Layout
 	.4byte Route117_PokemonDayCare_MapEvents
 	.4byte Route117_PokemonDayCare_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/scripts.inc
index b2e9ddfaa..b2e9ddfaa 100644
--- a/data/scripts/maps/Route117_PokemonDayCare.inc
+++ b/data/maps/Route117_PokemonDayCare/scripts.inc
diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc
index fe473be52..8069f036e 100644
--- a/data/maps/Route118/connections.inc
+++ b/data/maps/Route118/connections.inc
@@ -1,7 +1,7 @@
 Route118_MapConnectionsList: @ 8486A74
-	connection up, 40, ROUTE_119, 0
-	connection left, 0, MAUVILLE_CITY, 0
-	connection right, 0, ROUTE_123, 0
+	connection up, 40, MAP_ROUTE119
+	connection left, 0, MAP_MAUVILLE_CITY
+	connection right, 0, MAP_ROUTE123
 
 Route118_MapConnections: @ 8486A98
 	.4byte 0x3
diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc
new file mode 100644
index 000000000..5e732890d
--- /dev/null
+++ b/data/maps/Route118/events.inc
@@ -0,0 +1,46 @@
+Route118_EventObjects: @ 852AAB4
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797
+	object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797
+	object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, 2, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0
+	object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901
+	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901
+	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904
+	object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17
+	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0
+	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, 15, 1, 1, 1, 3, Route118_EventScript_1F4017, 0
+	object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, 8, 1, 1, 0, 0, 0x0, 966
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, 1, 1, 1, 0, 0, Route118_EventScript_290ED3, 1121
+	object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, 8, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0
+
+Route118_MapWarps: @ 852ACAC
+	warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE
+	warp_def 9, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE
+
+Route118_MapCoordEvents: @ 852ACBC
+	coord_event 43, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3E8E
+	coord_event 44, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3EAE
+	coord_event 45, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3EC4
+
+Route118_MapBGEvents: @ 852ACEC
+	bg_event 47, 14, 0, 8, 0, ITEM_MASTER_BALL, 0, 0
+	bg_event 13, 6, 0, 0, 0, Route118_EventScript_1F3E7C
+	bg_event 56, 8, 0, 0, 0, Route118_EventScript_1F3E85
+	bg_event 67, 6, 0, 8, 0, ITEM_LUXURY_BALL, 0, 0
+	bg_event 29, 5, 0, 8, 0, ITEM_HARBOR_MAIL, 0, 0
+	bg_event 47, 5, 0, 8, 0, ITEM_SPELON_BERRY, 0, 0
+	bg_event 46, 5, 0, 8, 0, ITEM_PETAYA_BERRY, 0, 0
+	bg_event 31, 13, 3, 7, 0, ITEM_IRON, 67, 0
+	bg_event 12, 14, 3, 7, 0, ITEM_HEART_SCALE, 66, 0
+
+Route118_MapEvents:: @ 852AD58
+	map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents
+
diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc
index 5567df47f..3bf779b27 100644
--- a/data/maps/Route118/header.inc
+++ b/data/maps/Route118/header.inc
@@ -1,5 +1,5 @@
 Route118: @ 8482854
-	.4byte Route118_MapAttributes
+	.4byte Route118_Layout
 	.4byte Route118_MapEvents
 	.4byte Route118_MapScripts
 	.4byte Route118_MapConnections
diff --git a/data/scripts/maps/Route118.inc b/data/maps/Route118/scripts.inc
index 818111b81..818111b81 100644
--- a/data/scripts/maps/Route118.inc
+++ b/data/maps/Route118/scripts.inc
diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc
index 20dd27498..4987e049e 100644
--- a/data/maps/Route119/connections.inc
+++ b/data/maps/Route119/connections.inc
@@ -1,6 +1,6 @@
 Route119_MapConnectionsList: @ 8486AA0
-	connection down, -40, ROUTE_118, 0
-	connection right, 0, FORTREE_CITY, 0
+	connection down, -40, MAP_ROUTE118
+	connection right, 0, MAP_FORTREE_CITY
 
 Route119_MapConnections: @ 8486AB8
 	.4byte 0x2
diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc
new file mode 100644
index 000000000..bd10dc05b
--- /dev/null
+++ b/data/maps/Route119/events.inc
@@ -0,0 +1,99 @@
+Route119_EventObjects: @ 852AD6C
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, 12, 0, 0, 0, 34, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, 12, 0, 0, 0, 35, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, 12, 0, 0, 0, 36, BerryTreeScript, 0
+	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0
+	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0
+	object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_1F479D, 0
+	object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1F4810, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F4786, 0
+	object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1F4872, 0
+	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0
+	object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0
+	object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 14, 3, 57, 0, 0, 1, 1, Route119_EventScript_1F4902, 0
+	object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_1F4919, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0
+	object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 63, 3, 8, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0
+	object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, 851
+	object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EED, 1025
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F07, 1027
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F14, 1028
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F21, 1029
+	object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890
+	object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890
+	object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, 923
+	object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, 8, 1, 1, 0, 0, Route119_EventScript_1F49D1, 0
+	object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, 12, 0, 0, 0, 83, BerryTreeScript, 0
+	object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, 12, 0, 0, 0, 84, BerryTreeScript, 0
+	object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, 12, 0, 0, 0, 85, BerryTreeScript, 0
+	object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, 12, 0, 0, 0, 86, BerryTreeScript, 0
+	object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, 5, 2, 1, 0, 0, Route119_EventScript_1F476B, 0
+	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, 1, 1, 1, 0, 0, Route119_EventScript_290F2E, 1106
+	object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, 2, 1, 1, 0, 0, Route119_EventScript_1F49DA, 0
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 57, 1, 1, 1, 3, Route119_EventScript_1F4930, 0
+	object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, 76, 1, 1, 0, 0, Route119_EventScript_27231C, 989
+	object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, 76, 1, 1, 0, 0, Route119_EventScript_272329, 990
+	object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, 10, 1, 1, 1, 0, Route119_EventScript_1F4947, 0
+	object_event 38, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 68, 3, 7, 1, 1, 1, 5, Route119_EventScript_1F498C, 0
+	object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 16, 52, 3, 10, 1, 1, 1, 3, Route119_EventScript_1F4975, 0
+	object_event 40, EVENT_OBJ_GFX_MAN_6, 0, 32, 15, 3, 9, 1, 1, 1, 4, Route119_EventScript_1F495E, 0
+	object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, 1, 1, 1, 0, 0, Route119_EventScript_291399, 1134
+	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, 1, 1, 1, 0, 0, Route119_EventScript_290F3B, 1147
+	object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786
+
+Route119_MapWarps: @ 852B174
+	warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F
+	warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE
+
+Route119_MapCoordEvents: @ 852B184
+	coord_event 25, 31, 0, 0, VAR_0x4072, 0, 0, Route119_EventScript_1F4472
+	coord_event 26, 31, 0, 0, VAR_0x4072, 0, 0, Route119_EventScript_1F447D
+	coord_event 29, 13, 3, 0, 20, 0, 0, 0x0
+	coord_event 30, 13, 3, 0, 20, 0, 0, 0x0
+	coord_event 31, 13, 3, 0, 20, 0, 0, 0x0
+	coord_event 32, 13, 3, 0, 20, 0, 0, 0x0
+	coord_event 15, 133, 3, 0, 20, 0, 0, 0x0
+	coord_event 16, 132, 3, 0, 20, 0, 0, 0x0
+	coord_event 17, 131, 3, 0, 20, 0, 0, 0x0
+	coord_event 18, 130, 3, 0, 20, 0, 0, 0x0
+	coord_event 19, 131, 3, 0, 20, 0, 0, 0x0
+	coord_event 20, 132, 3, 0, 20, 0, 0, 0x0
+	coord_event 21, 133, 3, 0, 20, 0, 0, 0x0
+	coord_event 36, 6, 3, 0, 2, 0, 0, 0x0
+	coord_event 36, 7, 3, 0, 2, 0, 0, 0x0
+	coord_event 35, 8, 3, 0, 2, 0, 0, 0x0
+	coord_event 35, 9, 3, 0, 2, 0, 0, 0x0
+	coord_event 16, 137, 3, 0, 2, 0, 0, 0x0
+	coord_event 17, 137, 3, 0, 2, 0, 0, 0x0
+	coord_event 18, 137, 3, 0, 2, 0, 0, 0x0
+	coord_event 19, 137, 3, 0, 2, 0, 0, 0x0
+	coord_event 20, 137, 3, 0, 2, 0, 0, 0x0
+	coord_event 34, 13, 3, 0, 20, 0, 0, 0x0
+
+Route119_MapBGEvents: @ 852B2F4
+	bg_event 9, 33, 0, 0, 0, Route119_EventScript_1F477D
+	bg_event 27, 19, 0, 0, 0, Route119_EventScript_1F4774
+	bg_event 5, 2, 0, 8, 0, ITEM_DRAGON_SCALE, 0, 0
+	bg_event 4, 89, 0, 8, 0, ITEM_LIGHT_BALL, 0, 0
+	bg_event 5, 15, 0, 8, 0, ITEM_POISON_BARB, 0, 0
+	bg_event 7, 101, 3, 8, 0, ITEM_NEVER_MELT_ICE, 0, 0
+	bg_event 34, 24, 3, 8, 0, ITEM_LAX_INCENSE, 0, 0
+	bg_event 31, 73, 3, 8, 0, 231, 0, 0
+	bg_event 16, 81, 0, 8, 0, ITEM_TINY_MUSHROOM, 0, 0
+	bg_event 16, 28, 0, 8, 0, 113, 0, 0
+	bg_event 17, 82, 3, 7, 0, ITEM_CALCIUM, 5, 0
+	bg_event 38, 63, 3, 7, 0, ITEM_ULTRA_BALL, 6, 0
+	bg_event 26, 81, 0, 8, 0, ITEM_FULL_HEAL, 0, 0
+	bg_event 19, 76, 0, 8, 0, ITEM_LANSAT_BERRY, 0, 0
+	bg_event 18, 76, 0, 8, 0, ITEM_DEEP_SEA_SCALE, 0, 0
+	bg_event 4, 15, 0, 8, 0, ITEM_METAL_POWDER, 0, 0
+	bg_event 6, 2, 0, 8, 0, 233, 0, 0
+	bg_event 26, 120, 3, 7, 0, ITEM_FULL_HEAL, 68, 0
+	bg_event 20, 29, 3, 7, 0, ITEM_MAX_ETHER, 87, 0
+	bg_event 28, 9, 0, 0, 0, Route119_EventScript_1F49E3
+
+Route119_MapEvents:: @ 852B3E4
+	map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents
+
diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc
index 17d13f572..cb61c3a38 100644
--- a/data/maps/Route119/header.inc
+++ b/data/maps/Route119/header.inc
@@ -1,5 +1,5 @@
 Route119: @ 8482870
-	.4byte Route119_MapAttributes
+	.4byte Route119_Layout
 	.4byte Route119_MapEvents
 	.4byte Route119_MapScripts
 	.4byte Route119_MapConnections
diff --git a/data/scripts/maps/Route119.inc b/data/maps/Route119/scripts.inc
index a4b6a5fb1..a4b6a5fb1 100644
--- a/data/scripts/maps/Route119.inc
+++ b/data/maps/Route119/scripts.inc
diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc
new file mode 100644
index 000000000..05d426fe5
--- /dev/null
+++ b/data/maps/Route119_House/events.inc
@@ -0,0 +1,16 @@
+Route119_House_EventObjects: @ 853ECD0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0
+	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, 2, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0
+	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, 2, 1, 1, 0, 0, Route119_House_EventScript_27096F, 0
+	object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, 2, 3, 2, 0, 0, Route119_House_EventScript_27096F, 0
+	object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0
+	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, 2, 1, 3, 0, 0, Route119_House_EventScript_27096F, 0
+
+Route119_House_MapWarps: @ 853ED78
+	warp_def 3, 8, 0, 1, MAP_ROUTE119
+	warp_def 4, 8, 0, 1, MAP_ROUTE119
+
+Route119_House_MapEvents:: @ 853ED88
+	map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc
index 86f968efc..754b0c245 100644
--- a/data/maps/Route119_House/header.inc
+++ b/data/maps/Route119_House/header.inc
@@ -1,5 +1,5 @@
 Route119_House: @ 8485D28
-	.4byte Route119_House_MapAttributes
+	.4byte House1_Layout
 	.4byte Route119_House_MapEvents
 	.4byte Route119_House_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route119_House.inc b/data/maps/Route119_House/scripts.inc
index 5e633437d..5e633437d 100644
--- a/data/scripts/maps/Route119_House.inc
+++ b/data/maps/Route119_House/scripts.inc
diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc
new file mode 100644
index 000000000..ee9f42ac5
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_1F/events.inc
@@ -0,0 +1,21 @@
+Route119_WeatherInstitute_1F_EventObjects: @ 853EB20
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, 2, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0
+
+Route119_WeatherInstitute_1F_MapWarps: @ 853EB98
+	warp_def 9, 12, 0, 0, MAP_ROUTE119
+	warp_def 10, 12, 0, 0, MAP_ROUTE119
+	warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F
+
+Route119_WeatherInstitute_1F_MapBGEvents: @ 853EBB0
+	bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18
+	bg_event 1, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18
+	bg_event 0, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18
+	bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18
+
+Route119_WeatherInstitute_1F_MapEvents:: @ 853EBE0
+	map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents
+
diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc
index 1f555389a..fac499e3f 100644
--- a/data/maps/Route119_WeatherInstitute_1F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/header.inc
@@ -1,5 +1,5 @@
 Route119_WeatherInstitute_1F: @ 8485CF0
-	.4byte Route119_WeatherInstitute_1F_MapAttributes
+	.4byte Route119_WeatherInstitute_1F_Layout
 	.4byte Route119_WeatherInstitute_1F_MapEvents
 	.4byte Route119_WeatherInstitute_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
index b008f52c0..b008f52c0 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc
new file mode 100644
index 000000000..4196be41b
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_2F/events.inc
@@ -0,0 +1,16 @@
+Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893
+	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, 1, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893
+	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, 9, 1, 1, 0, 0, 0x0, 992
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, 9, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890
+
+Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4
+	warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F
+
+Route119_WeatherInstitute_2F_MapEvents:: @ 853ECBC
+	map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc
index 048ccbf77..69a351082 100644
--- a/data/maps/Route119_WeatherInstitute_2F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/header.inc
@@ -1,5 +1,5 @@
 Route119_WeatherInstitute_2F: @ 8485D0C
-	.4byte Route119_WeatherInstitute_2F_MapAttributes
+	.4byte Route119_WeatherInstitute_2F_Layout
 	.4byte Route119_WeatherInstitute_2F_MapEvents
 	.4byte Route119_WeatherInstitute_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
index b2341bf3d..b2341bf3d 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc
index f05e65739..c599e6a2c 100644
--- a/data/maps/Route120/connections.inc
+++ b/data/maps/Route120/connections.inc
@@ -1,6 +1,6 @@
 Route120_MapConnectionsList: @ 8486AC0
-	connection left, 0, FORTREE_CITY, 0
-	connection right, 80, ROUTE_121, 0
+	connection left, 0, MAP_FORTREE_CITY
+	connection right, 80, MAP_ROUTE121
 
 Route120_MapConnections: @ 8486AD8
 	.4byte 0x2
diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc
new file mode 100644
index 000000000..a19a70f33
--- /dev/null
+++ b/data/maps/Route120/events.inc
@@ -0,0 +1,90 @@
+Route120_EventObjects: @ 852B3F8
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0
+	object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0
+	object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0
+	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030
+	object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798
+	object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798
+	object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902
+	object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902
+	object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031
+	object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0
+	object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0
+	object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0
+	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0
+	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, 1, 1, 1, 0, 0, Route120_EventScript_290F6F, 1108
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, 1, 1, 1, 0, 0, Route120_EventScript_290F62, 1107
+	object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, 76, 1, 1, 0, 0, Route120_EventScript_1F57BC, 970
+	object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, 8, 1, 1, 0, 0, Route120_EventScript_1F5641, 972
+	object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, 1, 1, 1, 0, 0, Route120_EventScript_2906BB, 20
+	object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, 1, 1, 1, 0, 0, Route120_EventScript_2906BB, 18
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, 58, 1, 1, 1, 3, Route120_EventScript_1F593C, 0
+	object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, 57, 1, 1, 1, 3, Route120_EventScript_1F5953, 0
+	object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, 8, 1, 1, 0, 0, 0x0, 981
+	object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722DB, 982
+	object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722E8, 985
+	object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722F5, 986
+	object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, 76, 1, 1, 0, 0, Route120_EventScript_27230F, 988
+	object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, 76, 1, 1, 0, 0, Route120_EventScript_272302, 987
+	object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, 7, 1, 1, 1, 3, Route120_EventScript_1F5981, 0
+	object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 14, 34, 3, 10, 1, 1, 1, 3, Route120_EventScript_1F596A, 0
+	object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, 1, 1, 1, 0, 0, Route120_EventScript_290F7C, 1148
+
+Route120_MapWarps: @ 852B818
+	warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB
+	warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB
+
+Route120_MapCoordEvents: @ 852B828
+	coord_event 7, 15, 0, 0, 3, 0, 0, 0x0
+	coord_event 7, 16, 0, 0, 3, 0, 0, 0x0
+	coord_event 22, 61, 3, 0, 3, 0, 0, 0x0
+	coord_event 12, 64, 3, 0, 3, 0, 0, 0x0
+	coord_event 35, 63, 3, 0, 1, 0, 0, 0x0
+	coord_event 36, 63, 3, 0, 1, 0, 0, 0x0
+	coord_event 37, 63, 3, 0, 1, 0, 0, 0x0
+	coord_event 38, 63, 3, 0, 1, 0, 0, 0x0
+	coord_event 32, 88, 5, 0, 1, 0, 0, 0x0
+	coord_event 28, 15, 0, 0, 2, 0, 0, 0x0
+	coord_event 28, 16, 0, 0, 2, 0, 0, 0x0
+	coord_event 28, 17, 3, 0, 2, 0, 0, 0x0
+	coord_event 32, 89, 5, 0, 1, 0, 0, 0x0
+	coord_event 32, 90, 5, 0, 1, 0, 0, 0x0
+	coord_event 32, 91, 5, 0, 1, 0, 0, 0x0
+	coord_event 10, 75, 3, 0, 1, 0, 0, 0x0
+	coord_event 11, 75, 3, 0, 1, 0, 0, 0x0
+	coord_event 12, 75, 3, 0, 1, 0, 0, 0x0
+	coord_event 13, 75, 3, 0, 1, 0, 0, 0x0
+
+Route120_MapBGEvents: @ 852B958
+	bg_event 27, 3, 3, 0, 0, Route120_EventScript_1F57C5
+	bg_event 38, 88, 3, 0, 0, Route120_EventScript_1F57CE
+	bg_event 28, 62, 0, 8, 0, 101, 0, 0
+	bg_event 30, 62, 0, 8, 0, ITEM_HEART_SCALE, 0, 0
+	bg_event 26, 10, 0, 8, 0, ITEM_LUCKY_PUNCH, 0, 0
+	bg_event 29, 85, 5, 8, 0, 232, 0, 0
+	bg_event 18, 12, 0, 8, 0, ITEM_SUN_STONE, 0, 0
+	bg_event 38, 54, 0, 8, 0, ITEM_SOFT_SAND, 0, 0
+	bg_event 31, 23, 0, 8, 0, ITEM_SPELL_TAG, 0, 0
+	bg_event 9, 1, 3, 7, 0, ITEM_RARE_CANDY, 71, 0
+	bg_event 31, 11, 3, 7, 0, ITEM_REVIVE, 84, 0
+	bg_event 0, 86, 3, 7, 0, ITEM_RARE_CANDY, 69, 0
+	bg_event 24, 42, 3, 7, 0, ITEM_ZINC, 70, 0
+	bg_event 5, 76, 0, 8, 0, ITEM_HARD_STONE, 0, 0
+
+Route120_MapEvents:: @ 852BA00
+	map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents
+
diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc
index ab7022f9c..9b8d641d9 100644
--- a/data/maps/Route120/header.inc
+++ b/data/maps/Route120/header.inc
@@ -1,5 +1,5 @@
 Route120: @ 848288C
-	.4byte Route120_MapAttributes
+	.4byte Route120_Layout
 	.4byte Route120_MapEvents
 	.4byte Route120_MapScripts
 	.4byte Route120_MapConnections
diff --git a/data/scripts/maps/Route120.inc b/data/maps/Route120/scripts.inc
index 7d6876aeb..7d6876aeb 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/maps/Route120/scripts.inc
diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc
index 47d55b65d..94116a03e 100644
--- a/data/maps/Route121/connections.inc
+++ b/data/maps/Route121/connections.inc
@@ -1,7 +1,7 @@
 Route121_MapConnectionsList: @ 8486AE0
-	connection down, 20, ROUTE_122, 0
-	connection left, -80, ROUTE_120, 0
-	connection right, -10, LILYCOVE_CITY, 0
+	connection down, 20, MAP_ROUTE122
+	connection left, -80, MAP_ROUTE120
+	connection right, -10, MAP_LILYCOVE_CITY
 
 Route121_MapConnections: @ 8486B04
 	.4byte 0x3
diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc
new file mode 100644
index 000000000..17ddae47f
--- /dev/null
+++ b/data/maps/Route121/events.inc
@@ -0,0 +1,55 @@
+Route121_EventObjects: @ 852BA14
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, 10, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0
+	object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0
+	object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0
+	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914
+	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914
+	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17
+	object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18
+	object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0
+	object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0
+	object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0
+	object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_290F89, 1103
+	object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, 1, 1, 1, 0, 0, Route121_EventScript_2906BB, 19
+	object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, 26, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0
+	object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 59, 8, 3, 8, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0
+	object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 59, 13, 3, 7, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0
+	object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 65, 9, 3, 18, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0
+	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 72, 9, 3, 17, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0
+	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_290F96, 1149
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, 1, 1, 1, 0, 0, Route121_EventScript_290FA3, 1150
+
+Route121_MapWarps: @ 852BCCC
+	warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
+
+Route121_MapCoordEvents: @ 852BCD4
+	coord_event 25, 5, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
+	coord_event 25, 6, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
+	coord_event 25, 7, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
+	coord_event 25, 8, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
+
+Route121_MapBGEvents: @ 852BD14
+	bg_event 32, 14, 0, 0, 0, Route121_EventScript_1F5E06
+	bg_event 40, 11, 0, 8, 0, ITEM_PREMIER_BALL, 0, 0
+	bg_event 18, 13, 0, 8, 0, ITEM_SUPER_POTION, 0, 0
+	bg_event 43, 7, 0, 8, 0, ITEM_NOMEL_BERRY, 0, 0
+	bg_event 42, 7, 0, 8, 0, ITEM_APICOT_BERRY, 0, 0
+	bg_event 39, 6, 0, 0, 0, Route121_EventScript_1F5E0F
+	bg_event 23, 10, 3, 7, 0, ITEM_HP_UP, 39, 0
+	bg_event 58, 3, 3, 7, 0, ITEM_NUGGET, 40, 0
+	bg_event 72, 5, 3, 7, 0, ITEM_FULL_HEAL, 73, 0
+	bg_event 68, 8, 3, 7, 0, ITEM_MAX_REVIVE, 100, 0
+
+Route121_MapEvents:: @ 852BD8C
+	map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents
+
diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc
index 5347f6d3d..4a05c76fe 100644
--- a/data/maps/Route121/header.inc
+++ b/data/maps/Route121/header.inc
@@ -1,5 +1,5 @@
 Route121: @ 84828A8
-	.4byte Route121_MapAttributes
+	.4byte Route121_Layout
 	.4byte Route121_MapEvents
 	.4byte Route121_MapScripts
 	.4byte Route121_MapConnections
diff --git a/data/scripts/maps/Route121.inc b/data/maps/Route121/scripts.inc
index f133ffe56..f133ffe56 100644
--- a/data/scripts/maps/Route121.inc
+++ b/data/maps/Route121/scripts.inc
diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc
new file mode 100644
index 000000000..2d8351534
--- /dev/null
+++ b/data/maps/Route121_SafariZoneEntrance/events.inc
@@ -0,0 +1,20 @@
+Route121_SafariZoneEntrance_EventObjects: @ 8533EDC
+	object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0
+	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0
+
+Route121_SafariZoneEntrance_MapWarps: @ 8533F24
+	warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH
+	warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH
+	warp_def 14, 13, 0, 0, MAP_ROUTE121
+	warp_def 15, 13, 0, 0, MAP_ROUTE121
+
+Route121_SafariZoneEntrance_MapCoordEvents: @ 8533F44
+	coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_22BC18
+
+Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54
+	bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BD21
+
+Route121_SafariZoneEntrance_MapEvents:: @ 8533F60
+	map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents
+
diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc
index 3ce3d22e7..56a07a3fa 100644
--- a/data/maps/Route121_SafariZoneEntrance/header.inc
+++ b/data/maps/Route121_SafariZoneEntrance/header.inc
@@ -1,5 +1,5 @@
 Route121_SafariZoneEntrance: @ 8483EA4
-	.4byte Route121_SafariZoneEntrance_MapAttributes
+	.4byte Route121_SafariZoneEntrance_Layout
 	.4byte Route121_SafariZoneEntrance_MapEvents
 	.4byte Route121_SafariZoneEntrance_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc
new file mode 100644
index 000000000..1973b0e9e
--- /dev/null
+++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc
@@ -0,0 +1,142 @@
+Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB
+	map_script 2, Route121_SafariZoneEntrance_MapScript2_22BBC1
+	.byte 0
+
+Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1
+	map_script_2 VAR_0x40A4, 1, Route121_SafariZoneEntrance_EventScript_22BBCB
+	.2byte 0
+
+Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB
+	lockall
+	applymovement 255, Route121_SafariZoneEntrance_Movement_22BBDD
+	waitmovement 0
+	setvar VAR_0x40A4, 0
+	releaseall
+	end
+
+Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+Route121_SafariZoneEntrance_EventScript_22BBE6:: @ 822BBE6
+	msgbox Route121_SafariZoneEntrance_Text_2A4D12, 2
+	end
+
+Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF
+	lock
+	faceplayer
+	msgbox Route121_SafariZoneEntrance_Text_2A4E46, 5
+	compare VAR_RESULT, 1
+	goto_eq Route121_SafariZoneEntrance_EventScript_22BC0E
+	msgbox Route121_SafariZoneEntrance_Text_2A4E7E, 4
+	release
+	end
+
+Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E
+	msgbox Route121_SafariZoneEntrance_Text_2A4EA1, 4
+	release
+	end
+
+Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18
+	lockall
+	applymovement 255, Route121_SafariZoneEntrance_Movement_2725A6
+	waitmovement 0
+	showmoneybox 0, 0, 0
+	msgbox Route121_SafariZoneEntrance_Text_2A4F74, 5
+	compare VAR_RESULT, 1
+	goto_eq Route121_SafariZoneEntrance_EventScript_22BC48
+	msgbox Route121_SafariZoneEntrance_Text_2A4FD7, 4
+	goto Route121_SafariZoneEntrance_EventScript_22BD06
+	end
+
+Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare VAR_RESULT, 0
+	goto_eq Route121_SafariZoneEntrance_EventScript_22BCEA
+	call Route121_SafariZoneEntrance_EventScript_22BCBF
+	checkmoney 0x1f4, 0
+	compare VAR_RESULT, 0
+	goto_eq Route121_SafariZoneEntrance_EventScript_22BCF8
+	playse SE_REGI
+	msgbox Route121_SafariZoneEntrance_Text_2A501B, 4
+	takemoney 0x1f4, 0
+	updatemoneybox 0, 0
+	nop
+	msgbox Route121_SafariZoneEntrance_Text_2A5036, 4
+	playfanfare MUS_FANFA4
+	message Route121_SafariZoneEntrance_Text_2A5052
+	waitfanfare
+	msgbox Route121_SafariZoneEntrance_Text_2A506F, 4
+	closemessage
+	hidemoneybox
+	nop
+	nop
+	applymovement 255, Route121_SafariZoneEntrance_Movement_22BD18
+	waitmovement 0
+	special EnterSafariMode
+	setvar VAR_0x40A4, 2
+	clearflag FLAG_0x05D
+	warp MAP_SAFARI_ZONE_SOUTH, 255, 32, 33
+	waitstate
+	end
+
+Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF
+	getpartysize
+	compare VAR_RESULT, 6
+	goto_if 5, Route121_SafariZoneEntrance_EventScript_22BCE9
+	specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace
+	compare VAR_RESULT, 1
+	goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9
+	msgbox Route121_SafariZoneEntrance_Text_2A50E5, 4
+	goto Route121_SafariZoneEntrance_EventScript_22BD06
+	end
+
+Route121_SafariZoneEntrance_EventScript_22BCE9:: @ 822BCE9
+	return
+
+Route121_SafariZoneEntrance_EventScript_22BCEA:: @ 822BCEA
+	msgbox Route121_SafariZoneEntrance_Text_2A5105, 4
+	goto Route121_SafariZoneEntrance_EventScript_22BD06
+	end
+
+Route121_SafariZoneEntrance_EventScript_22BCF8:: @ 822BCF8
+	msgbox Route121_SafariZoneEntrance_Text_2A4FF7, 4
+	goto Route121_SafariZoneEntrance_EventScript_22BD06
+	end
+
+Route121_SafariZoneEntrance_EventScript_22BD06:: @ 822BD06
+	closemessage
+	hidemoneybox
+	nop
+	nop
+	applymovement 255, Route121_SafariZoneEntrance_Movement_22BD16
+	waitmovement 0
+	releaseall
+	end
+
+Route121_SafariZoneEntrance_Movement_22BD16: @ 822BD16
+	walk_right
+	step_end
+
+Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	delay_16
+	step_end
+
+Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21
+	msgbox Route121_SafariZoneEntrance_Text_2A55BB, 3
+	end
+
diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc
index 2d6f53859..2a0442a05 100644
--- a/data/maps/Route122/connections.inc
+++ b/data/maps/Route122/connections.inc
@@ -1,6 +1,6 @@
 Route122_MapConnectionsList: @ 8486B0C
-	connection up, -20, ROUTE_121, 0
-	connection down, -100, ROUTE_123, 0
+	connection up, -20, MAP_ROUTE121
+	connection down, -100, MAP_ROUTE123
 
 Route122_MapConnections: @ 8486B24
 	.4byte 0x2
diff --git a/data/maps/Route122/events.inc b/data/maps/Route122/events.inc
new file mode 100644
index 000000000..4c5b9b464
--- /dev/null
+++ b/data/maps/Route122/events.inc
@@ -0,0 +1,6 @@
+Route122_MapWarps: @ 852BDA0
+	warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F
+
+Route122_MapEvents:: @ 852BDA8
+	map_events 0x0, Route122_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc
index f4856b8ab..591501de1 100644
--- a/data/maps/Route122/header.inc
+++ b/data/maps/Route122/header.inc
@@ -1,5 +1,5 @@
 Route122: @ 84828C4
-	.4byte Route122_MapAttributes
+	.4byte Route122_Layout
 	.4byte Route122_MapEvents
 	.4byte Route122_MapScripts
 	.4byte Route122_MapConnections
diff --git a/data/scripts/maps/Route122.inc b/data/maps/Route122/scripts.inc
index 8fcfb4c09..8fcfb4c09 100644
--- a/data/scripts/maps/Route122.inc
+++ b/data/maps/Route122/scripts.inc
diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc
index ef10fb974..616c365ef 100644
--- a/data/maps/Route123/connections.inc
+++ b/data/maps/Route123/connections.inc
@@ -1,6 +1,6 @@
 Route123_MapConnectionsList: @ 8486B2C
-	connection up, 100, ROUTE_122, 0
-	connection left, 0, ROUTE_118, 0
+	connection up, 100, MAP_ROUTE122
+	connection left, 0, MAP_ROUTE118
 
 Route123_MapConnections: @ 8486B44
 	.4byte 0x2
diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc
new file mode 100644
index 000000000..0fc1b015b
--- /dev/null
+++ b/data/maps/Route123/events.inc
@@ -0,0 +1,88 @@
+Route123_EventObjects: @ 852BDBC
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0
+	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0
+	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0
+	object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17
+	object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18
+	object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032
+	object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0
+	object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0
+	object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0
+	object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0
+	object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0
+	object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0
+	object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0
+	object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0
+	object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0
+	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FBD, 1104
+	object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FCA, 1109
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 138, 14, 3, 57, 1, 1, 1, 1, Route123_EventScript_1F6377, 0
+	object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 138, 16, 3, 7, 1, 1, 1, 1, Route123_EventScript_1F6360, 0
+	object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, 7, 1, 1, 1, 4, Route123_EventScript_1F6349, 0
+	object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 66, 16, 3, 8, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0
+	object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 66, 19, 3, 7, 1, 1, 1, 2, Route123_EventScript_1F6332, 0
+	object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 49, 19, 3, 7, 1, 1, 1, 2, Route123_EventScript_1F631B, 0
+	object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FD7, 1152
+	object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 16, 3, 7, 1, 1, 1, 3, Route123_EventScript_1F638E, 0
+	object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, 26, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0
+	object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FE4, 1153
+
+Route123_MapWarps: @ 852C1C4
+	warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE
+
+Route123_MapCoordEvents: @ 852C1CC
+	coord_event 90, 16, 3, 0, 21, 0, 0, 0x0
+	coord_event 92, 9, 3, 0, 21, 0, 0, 0x0
+	coord_event 93, 12, 3, 0, 21, 0, 0, 0x0
+	coord_event 92, 13, 3, 0, 21, 0, 0, 0x0
+	coord_event 91, 14, 3, 0, 21, 0, 0, 0x0
+	coord_event 19, 13, 3, 0, 21, 0, 0, 0x0
+	coord_event 19, 12, 3, 0, 21, 0, 0, 0x0
+	coord_event 34, 13, 3, 0, 21, 0, 0, 0x0
+	coord_event 19, 14, 3, 0, 21, 0, 0, 0x0
+	coord_event 19, 15, 3, 0, 21, 0, 0, 0x0
+	coord_event 19, 16, 3, 0, 21, 0, 0, 0x0
+	coord_event 108, 14, 3, 0, 2, 0, 0, 0x0
+	coord_event 109, 15, 3, 0, 2, 0, 0, 0x0
+	coord_event 110, 16, 3, 0, 2, 0, 0, 0x0
+	coord_event 111, 17, 3, 0, 2, 0, 0, 0x0
+	coord_event 112, 18, 3, 0, 2, 0, 0, 0x0
+	coord_event 9, 12, 3, 0, 2, 0, 0, 0x0
+	coord_event 9, 13, 3, 0, 2, 0, 0, 0x0
+	coord_event 9, 14, 3, 0, 2, 0, 0, 0x0
+	coord_event 9, 15, 3, 0, 2, 0, 0, 0x0
+	coord_event 9, 16, 3, 0, 2, 0, 0, 0x0
+	coord_event 94, 10, 3, 0, 21, 0, 0, 0x0
+
+Route123_MapBGEvents: @ 852C32C
+	bg_event 117, 10, 0, 0, 0, Route123_EventScript_1F61B3
+	bg_event 47, 3, 0, 8, 0, 82, 0, 0
+	bg_event 49, 3, 0, 8, 0, 92, 0, 0
+	bg_event 10, 12, 3, 0, 0, Route123_EventScript_1F61AA
+	bg_event 75, 1, 3, 7, 0, ITEM_SUPER_REPEL, 7, 0
+	bg_event 20, 7, 3, 0, 0, Route123_EventScript_1F61BC
+	bg_event 57, 5, 0, 8, 0, ITEM_SUPER_REPEL, 0, 0
+	bg_event 12, 1, 3, 7, 0, ITEM_REVIVE, 41, 0
+	bg_event 91, 15, 3, 7, 0, ITEM_HYPER_POTION, 74, 0
+	bg_event 139, 15, 3, 7, 0, ITEM_PP_UP, 99, 0
+	bg_event 138, 18, 3, 7, 0, ITEM_RARE_CANDY, 110, 0
+
+Route123_MapEvents:: @ 852C3B0
+	map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents
+
diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc
index ff3ab332f..7d7a4590f 100644
--- a/data/maps/Route123/header.inc
+++ b/data/maps/Route123/header.inc
@@ -1,5 +1,5 @@
 Route123: @ 84828E0
-	.4byte Route123_MapAttributes
+	.4byte Route123_Layout
 	.4byte Route123_MapEvents
 	.4byte Route123_MapScripts
 	.4byte Route123_MapConnections
diff --git a/data/scripts/maps/Route123.inc b/data/maps/Route123/scripts.inc
index b622a931b..b622a931b 100644
--- a/data/scripts/maps/Route123.inc
+++ b/data/maps/Route123/scripts.inc
diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc
new file mode 100644
index 000000000..3f4725870
--- /dev/null
+++ b/data/maps/Route123_BerryMastersHouse/events.inc
@@ -0,0 +1,11 @@
+Route123_BerryMastersHouse_EventObjects: @ 853EACC
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0
+
+Route123_BerryMastersHouse_MapWarps: @ 853EAFC
+	warp_def 3, 7, 0, 0, MAP_ROUTE123
+	warp_def 4, 7, 0, 0, MAP_ROUTE123
+
+Route123_BerryMastersHouse_MapEvents:: @ 853EB0C
+	map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc
index f086368ad..f1466f9e7 100644
--- a/data/maps/Route123_BerryMastersHouse/header.inc
+++ b/data/maps/Route123_BerryMastersHouse/header.inc
@@ -1,5 +1,5 @@
 Route123_BerryMastersHouse: @ 8485CD4
-	.4byte Route123_BerryMastersHouse_MapAttributes
+	.4byte House2_Layout
 	.4byte Route123_BerryMastersHouse_MapEvents
 	.4byte Route123_BerryMastersHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc
index 9e865ad6a..9e865ad6a 100644
--- a/data/scripts/maps/Route123_BerryMastersHouse.inc
+++ b/data/maps/Route123_BerryMastersHouse/scripts.inc
diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc
index 72e358f4c..ed10daab9 100644
--- a/data/maps/Route124/connections.inc
+++ b/data/maps/Route124/connections.inc
@@ -1,9 +1,9 @@
 Route124_MapConnectionsList: @ 8486B4C
-	connection down, 0, ROUTE_126, 0
-	connection left, 10, LILYCOVE_CITY, 0
-	connection right, 0, ROUTE_125, 0
-	connection right, 40, MOSSDEEP_CITY, 0
-	connection dive, 0, UNDERWATER_1, 0
+	connection down, 0, MAP_ROUTE126
+	connection left, 10, MAP_LILYCOVE_CITY
+	connection right, 0, MAP_ROUTE125
+	connection right, 40, MAP_MOSSDEEP_CITY
+	connection dive, 0, MAP_UNDERWATER1
 
 Route124_MapConnections: @ 8486B88
 	.4byte 0x5
diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc
new file mode 100644
index 000000000..2dc839783
--- /dev/null
+++ b/data/maps/Route124/events.inc
@@ -0,0 +1,23 @@
+Route124_EventObjects: @ 852C3C4
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, 67, 5, 3, 1, 7, Route124_EventScript_1F659C, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, 18, 6, 8, 1, 5, Route124_EventScript_1F6615, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, 1, 1, 1, 0, 0, Route124_EventScript_290FF1, 1092
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, 1, 1, 1, 0, 0, Route124_EventScript_290FFE, 1093
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, 1, 1, 1, 0, 0, Route124_EventScript_29100B, 1066
+	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, 8, 1, 1, 1, 1, Route124_EventScript_1F6643, 0
+	object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, 8, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0
+	object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, 7, 1, 1, 1, 5, Route124_EventScript_1F670B, 0
+	object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, 66, 1, 1, 1, 7, Route124_EventScript_1F6722, 0
+
+Route124_MapWarps: @ 852C4E4
+	warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE
+
+Route124_MapBGEvents: @ 852C4EC
+	bg_event 73, 48, 3, 0, 0, Route124_EventScript_1F657C
+
+Route124_MapEvents:: @ 852C4F8
+	map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents
+
diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc
index e4c690104..811fb3ec7 100644
--- a/data/maps/Route124/header.inc
+++ b/data/maps/Route124/header.inc
@@ -1,5 +1,5 @@
 Route124: @ 84828FC
-	.4byte Route124_MapAttributes
+	.4byte Route124_Layout
 	.4byte Route124_MapEvents
 	.4byte Route124_MapScripts
 	.4byte Route124_MapConnections
diff --git a/data/scripts/maps/Route124.inc b/data/maps/Route124/scripts.inc
index b21e55417..b21e55417 100644
--- a/data/scripts/maps/Route124.inc
+++ b/data/maps/Route124/scripts.inc
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
new file mode 100644
index 000000000..606138e38
--- /dev/null
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
@@ -0,0 +1,12 @@
+Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C
+	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0
+
+Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4
+	warp_def 3, 8, 0, 0, MAP_ROUTE124
+	warp_def 4, 8, 0, 0, MAP_ROUTE124
+
+Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4
+	bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270F63
+
+Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0
+	map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
index d277004eb..a7501cddc 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
@@ -1,5 +1,5 @@
 Route124_DivingTreasureHuntersHouse: @ 8485D44
-	.4byte Route124_DivingTreasureHuntersHouse_MapAttributes
+	.4byte Route124_DivingTreasureHuntersHouse_Layout
 	.4byte Route124_DivingTreasureHuntersHouse_MapEvents
 	.4byte Route124_DivingTreasureHuntersHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
index 0892b216a..0892b216a 100644
--- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc
index 1abbf0979..2b5f944c9 100644
--- a/data/maps/Route125/connections.inc
+++ b/data/maps/Route125/connections.inc
@@ -1,7 +1,7 @@
 Route125_MapConnectionsList: @ 8486B90
-	connection down, 0, MOSSDEEP_CITY, 0
-	connection left, 0, ROUTE_124, 0
-	connection dive, 0, UNDERWATER_7, 0
+	connection down, 0, MAP_MOSSDEEP_CITY
+	connection left, 0, MAP_ROUTE124
+	connection dive, 0, MAP_UNDERWATER7
 
 Route125_MapConnections: @ 8486BB4
 	.4byte 0x3
diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc
new file mode 100644
index 000000000..b767e512d
--- /dev/null
+++ b/data/maps/Route125/events.inc
@@ -0,0 +1,24 @@
+Route125_EventObjects: @ 852C50C
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, 10, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 30, 28, 1, 52, 9, 9, 1, 3, Route125_EventScript_1F67E9, 0
+	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0
+	object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, 8, 1, 1, 1, 1, Route125_EventScript_1F6862, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, 8, 1, 1, 1, 1, Route125_EventScript_1F687D, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 43, 19, 3, 28, 2, 1, 1, 3, Route125_EventScript_1F6898, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 48, 19, 3, 27, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, 1, 1, 1, 0, 0, Route125_EventScript_291018, 1154
+
+Route125_MapWarps: @ 852C5FC
+	warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
+
+Route125_MapBGEvents: @ 852C604
+	bg_event 53, 10, 0, 8, 0, ITEM_ULTRA_BALL, 0, 0
+	bg_event 55, 11, 0, 8, 0, ITEM_HEAL_POWDER, 0, 0
+	bg_event 7, 25, 0, 8, 0, ITEM_RETRO_MAIL, 0, 0
+	bg_event 24, 32, 0, 8, 0, ITEM_PINAP_BERRY, 0, 0
+
+Route125_MapEvents:: @ 852C634
+	map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents
+
diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc
index 09afc815f..4e67b3cb6 100644
--- a/data/maps/Route125/header.inc
+++ b/data/maps/Route125/header.inc
@@ -1,5 +1,5 @@
 Route125: @ 8482918
-	.4byte Route125_MapAttributes
+	.4byte Route125_Layout
 	.4byte Route125_MapEvents
 	.4byte Route125_MapScripts
 	.4byte Route125_MapConnections
diff --git a/data/scripts/maps/Route125.inc b/data/maps/Route125/scripts.inc
index 2dda3fb2d..2dda3fb2d 100644
--- a/data/scripts/maps/Route125.inc
+++ b/data/maps/Route125/scripts.inc
diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc
index c2beee1d8..b1f0f6d81 100644
--- a/data/maps/Route126/connections.inc
+++ b/data/maps/Route126/connections.inc
@@ -1,7 +1,7 @@
 Route126_MapConnectionsList: @ 8486BBC
-	connection up, 0, ROUTE_124, 0
-	connection right, 0, ROUTE_127, 0
-	connection dive, 0, UNDERWATER_2, 0
+	connection up, 0, MAP_ROUTE124
+	connection right, 0, MAP_ROUTE127
+	connection dive, 0, MAP_UNDERWATER2
 
 Route126_MapConnections: @ 8486BE0
 	.4byte 0x3
diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc
new file mode 100644
index 000000000..cf87bb74e
--- /dev/null
+++ b/data/maps/Route126/events.inc
@@ -0,0 +1,14 @@
+Route126_EventObjects: @ 852C648
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, 51, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, 28, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, 24, 0, 0, 1, 3, Route126_EventScript_1F6904, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, 7, 0, 0, 1, 3, Route126_EventScript_1F691B, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, 1, 1, 1, 0, 0, Route126_EventScript_291025, 1105
+	object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, 66, 1, 1, 1, 7, Route126_EventScript_1F6960, 0
+	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, 67, 1, 1, 1, 7, Route126_EventScript_1F6977, 0
+	object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, 66, 1, 1, 1, 7, Route126_EventScript_1F6949, 0
+	object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, 67, 1, 1, 1, 7, Route126_EventScript_1F6932, 0
+
+Route126_MapEvents:: @ 852C720
+	map_events Route126_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc
index f87efc723..13e741159 100644
--- a/data/maps/Route126/header.inc
+++ b/data/maps/Route126/header.inc
@@ -1,5 +1,5 @@
 Route126: @ 8482934
-	.4byte Route126_MapAttributes
+	.4byte Route126_Layout
 	.4byte Route126_MapEvents
 	.4byte Route126_MapScripts
 	.4byte Route126_MapConnections
diff --git a/data/scripts/maps/Route126.inc b/data/maps/Route126/scripts.inc
index 3ea9ba786..3ea9ba786 100644
--- a/data/scripts/maps/Route126.inc
+++ b/data/maps/Route126/scripts.inc
diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc
index 2b4136c3c..3ad7057a3 100644
--- a/data/maps/Route127/connections.inc
+++ b/data/maps/Route127/connections.inc
@@ -1,8 +1,8 @@
 Route127_MapConnectionsList: @ 8486BE8
-	connection up, 0, MOSSDEEP_CITY, 0
-	connection down, 0, ROUTE_128, 0
-	connection left, 0, ROUTE_126, 0
-	connection dive, 0, UNDERWATER_3, 0
+	connection up, 0, MAP_MOSSDEEP_CITY
+	connection down, 0, MAP_ROUTE128
+	connection left, 0, MAP_ROUTE126
+	connection dive, 0, MAP_UNDERWATER3
 
 Route127_MapConnections: @ 8486C18
 	.4byte 0x4
diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc
new file mode 100644
index 000000000..b7c378a96
--- /dev/null
+++ b/data/maps/Route127/events.inc
@@ -0,0 +1,23 @@
+Route127_EventObjects: @ 852C734
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035
+	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, 9, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, 10, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0
+	object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, 7, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 15, 23, 3, 9, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0
+	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, 1, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0
+	object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 23, 3, 10, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, 1, 0, 0, 0, 0, Route127_EventScript_29104C, 1155
+
+Route127_MapBGEvents: @ 852C83C
+	bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0
+	bg_event 59, 72, 0, 8, 0, ITEM_SITRUS_BERRY, 0, 0
+	bg_event 67, 63, 0, 8, 0, ITEM_WEPEAR_BERRY, 0, 0
+	bg_event 61, 21, 0, 8, 0, ITEM_FIGY_BERRY, 0, 0
+	bg_event 45, 24, 0, 8, 0, ITEM_GLITTER_MAIL, 0, 0
+
+Route127_MapEvents:: @ 852C878
+	map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents
+
diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc
index 070f9996f..fa3ee0200 100644
--- a/data/maps/Route127/header.inc
+++ b/data/maps/Route127/header.inc
@@ -1,5 +1,5 @@
 Route127: @ 8482950
-	.4byte Route127_MapAttributes
+	.4byte Route127_Layout
 	.4byte Route127_MapEvents
 	.4byte Route127_MapScripts
 	.4byte Route127_MapConnections
diff --git a/data/scripts/maps/Route127.inc b/data/maps/Route127/scripts.inc
index 12e5bf127..12e5bf127 100644
--- a/data/scripts/maps/Route127.inc
+++ b/data/maps/Route127/scripts.inc
diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc
index 5355677de..5b2f0665d 100644
--- a/data/maps/Route128/connections.inc
+++ b/data/maps/Route128/connections.inc
@@ -1,8 +1,8 @@
 Route128_MapConnectionsList: @ 8486C20
-	connection up, 0, ROUTE_127, 0
-	connection down, 0, ROUTE_129, 0
-	connection right, -40, EVER_GRANDE_CITY, 0
-	connection dive, 0, UNDERWATER_4, 0
+	connection up, 0, MAP_ROUTE127
+	connection down, 0, MAP_ROUTE129
+	connection right, -40, MAP_EVER_GRANDE_CITY
+	connection dive, 0, MAP_UNDERWATER4
 
 Route128_MapConnections: @ 8486C50
 	.4byte 0x4
diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc
new file mode 100644
index 000000000..c34f6eb16
--- /dev/null
+++ b/data/maps/Route128/events.inc
@@ -0,0 +1,20 @@
+Route128_EventObjects: @ 852C88C
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, 48, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0
+	object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834
+	object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, 9, 1, 1, 0, 0, 0x0, 944
+	object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, 7, 1, 1, 0, 0, 0x0, 945
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, 7, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 47, 9, 3, 10, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 24, 8, 3, 17, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0
+	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, 25, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0
+	object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, 26, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0
+
+Route128_MapBGEvents: @ 852C97C
+	bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0
+	bg_event 57, 21, 3, 7, 0, ITEM_HEART_SCALE, 93, 0
+	bg_event 31, 33, 3, 7, 0, ITEM_HEART_SCALE, 94, 0
+
+Route128_MapEvents:: @ 852C9A0
+	map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents
+
diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc
index 01d1a46ba..08acd71f2 100644
--- a/data/maps/Route128/header.inc
+++ b/data/maps/Route128/header.inc
@@ -1,5 +1,5 @@
 Route128: @ 848296C
-	.4byte Route128_MapAttributes
+	.4byte Route128_Layout
 	.4byte Route128_MapEvents
 	.4byte Route128_MapScripts
 	.4byte Route128_MapConnections
diff --git a/data/scripts/maps/Route128.inc b/data/maps/Route128/scripts.inc
index 8e2742ff5..8e2742ff5 100644
--- a/data/scripts/maps/Route128.inc
+++ b/data/maps/Route128/scripts.inc
diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc
index f373faff2..1293e8235 100644
--- a/data/maps/Route129/connections.inc
+++ b/data/maps/Route129/connections.inc
@@ -1,7 +1,7 @@
 Route129_MapConnectionsList: @ 8486C58
-	connection up, 0, ROUTE_128, 0
-	connection left, 0, ROUTE_130, 0
-	connection dive, 0, UNDERWATER_5, 0
+	connection up, 0, MAP_ROUTE128
+	connection left, 0, MAP_ROUTE130
+	connection dive, 0, MAP_UNDERWATER5
 
 Route129_MapConnections: @ 8486C7C
 	.4byte 0x3
diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc
new file mode 100644
index 000000000..7c1425ebe
--- /dev/null
+++ b/data/maps/Route129/events.inc
@@ -0,0 +1,10 @@
+Route129_EventObjects: @ 852C9B4
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, 50, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, 52, 5, 2, 1, 2, Route129_EventScript_1F7303, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, 64, 1, 1, 1, 5, Route129_EventScript_1F7331, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, 24, 1, 1, 1, 2, Route129_EventScript_1F731A, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, 65, 1, 1, 1, 5, Route129_EventScript_1F7348, 0
+
+Route129_MapEvents:: @ 852CA2C
+	map_events Route129_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc
index 4e5b177df..53abdbebe 100644
--- a/data/maps/Route129/header.inc
+++ b/data/maps/Route129/header.inc
@@ -1,5 +1,5 @@
 Route129: @ 8482988
-	.4byte Route129_MapAttributes
+	.4byte Route129_Layout
 	.4byte Route129_MapEvents
 	.4byte Route129_MapScripts
 	.4byte Route129_MapConnections
diff --git a/data/scripts/maps/Route129.inc b/data/maps/Route129/scripts.inc
index 170d87e56..170d87e56 100644
--- a/data/scripts/maps/Route129.inc
+++ b/data/maps/Route129/scripts.inc
diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc
index f4972fa38..b977d43bc 100644
--- a/data/maps/Route130/connections.inc
+++ b/data/maps/Route130/connections.inc
@@ -1,6 +1,6 @@
 Route130_MapConnectionsList: @ 8486C84
-	connection left, 0, ROUTE_131, 0
-	connection right, 0, ROUTE_129, 0
+	connection left, 0, MAP_ROUTE131
+	connection right, 0, MAP_ROUTE129
 
 Route130_MapConnections: @ 8486C9C
 	.4byte 0x2
diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc
new file mode 100644
index 000000000..ad1429553
--- /dev/null
+++ b/data/maps/Route130/events.inc
@@ -0,0 +1,9 @@
+Route130_EventObjects: @ 852CA40
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, 51, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, 26, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, 25, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0
+
+Route130_MapEvents:: @ 852CAA0
+	map_events Route130_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc
index f4e1f3292..47b4b613c 100644
--- a/data/maps/Route130/header.inc
+++ b/data/maps/Route130/header.inc
@@ -1,5 +1,5 @@
 Route130: @ 84829A4
-	.4byte Route130_MapAttributes
+	.4byte Route130_Layout
 	.4byte Route130_MapEvents
 	.4byte Route130_MapScripts
 	.4byte Route130_MapConnections
diff --git a/data/scripts/maps/Route130.inc b/data/maps/Route130/scripts.inc
index 26278cf50..26278cf50 100644
--- a/data/scripts/maps/Route130.inc
+++ b/data/maps/Route130/scripts.inc
diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc
index 4470802dd..150ea7023 100644
--- a/data/maps/Route131/connections.inc
+++ b/data/maps/Route131/connections.inc
@@ -1,6 +1,6 @@
 Route131_MapConnectionsList: @ 8486CA4
-	connection left, 0, PACIFIDLOG_TOWN, 0
-	connection right, 0, ROUTE_130, 0
+	connection left, 0, MAP_PACIFIDLOG_TOWN
+	connection right, 0, MAP_ROUTE130
 
 Route131_MapConnections: @ 8486CBC
 	.4byte 0x2
diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc
new file mode 100644
index 000000000..2bb2c5cbc
--- /dev/null
+++ b/data/maps/Route131/events.inc
@@ -0,0 +1,16 @@
+Route131_EventObjects: @ 852CAB4
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, 29, 5, 7, 1, 3, Route131_EventScript_1F7429, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, 22, 0, 7, 1, 4, Route131_EventScript_1F7440, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, 20, 6, 0, 1, 4, Route131_EventScript_1F7457, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 25, 1, 47, 3, 5, 1, 3, Route131_EventScript_1F746E, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, 8, 1, 1, 1, 1, Route131_EventScript_1F7485, 0
+	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, 8, 1, 1, 1, 1, Route131_EventScript_1F74A0, 0
+	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, 26, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0
+	object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, 25, 1, 3, 1, 5, Route131_EventScript_1F74BB, 0
+
+Route131_MapWarps: @ 852CB74
+	warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE
+
+Route131_MapEvents:: @ 852CB7C
+	map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc
index 44a8921ba..b13a344fc 100644
--- a/data/maps/Route131/header.inc
+++ b/data/maps/Route131/header.inc
@@ -1,5 +1,5 @@
 Route131: @ 84829C0
-	.4byte Route131_MapAttributes
+	.4byte Route131_Layout
 	.4byte Route131_MapEvents
 	.4byte Route131_MapScripts
 	.4byte Route131_MapConnections
diff --git a/data/scripts/maps/Route131.inc b/data/maps/Route131/scripts.inc
index 566cbef66..566cbef66 100644
--- a/data/scripts/maps/Route131.inc
+++ b/data/maps/Route131/scripts.inc
diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc
index 0e18aa2f2..5a70e3471 100644
--- a/data/maps/Route132/connections.inc
+++ b/data/maps/Route132/connections.inc
@@ -1,6 +1,6 @@
 Route132_MapConnectionsList: @ 8486CC4
-	connection left, 0, ROUTE_133, 0
-	connection right, 0, PACIFIDLOG_TOWN, 0
+	connection left, 0, MAP_ROUTE133
+	connection right, 0, MAP_PACIFIDLOG_TOWN
 
 Route132_MapConnections: @ 8486CDC
 	.4byte 0x2
diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc
new file mode 100644
index 000000000..19ff5ccc8
--- /dev/null
+++ b/data/maps/Route132/events.inc
@@ -0,0 +1,15 @@
+Route132_EventObjects: @ 852CB90
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, 46, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, 45, 3, 3, 1, 2, Route132_EventScript_1F7501, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036
+	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0
+	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0
+	object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 33, 26, 3, 8, 1, 1, 1, 4, Route132_EventScript_1F7546, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 31, 3, 25, 1, 4, 1, 4, Route132_EventScript_1F755D, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 21, 30, 3, 7, 1, 1, 1, 4, Route132_EventScript_1F758B, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 21, 25, 3, 26, 1, 4, 1, 4, Route132_EventScript_1F7574, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, 1, 1, 1, 0, 0, Route132_EventScript_291066, 1156
+
+Route132_MapEvents:: @ 852CC80
+	map_events Route132_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc
index df2aadbfa..b4fe2bc0d 100644
--- a/data/maps/Route132/header.inc
+++ b/data/maps/Route132/header.inc
@@ -1,5 +1,5 @@
 Route132: @ 84829DC
-	.4byte Route132_MapAttributes
+	.4byte Route132_Layout
 	.4byte Route132_MapEvents
 	.4byte Route132_MapScripts
 	.4byte Route132_MapConnections
diff --git a/data/scripts/maps/Route132.inc b/data/maps/Route132/scripts.inc
index a4ae6f716..a4ae6f716 100644
--- a/data/scripts/maps/Route132.inc
+++ b/data/maps/Route132/scripts.inc
diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc
index b133d8804..1f22ea960 100644
--- a/data/maps/Route133/connections.inc
+++ b/data/maps/Route133/connections.inc
@@ -1,6 +1,6 @@
 Route133_MapConnectionsList: @ 8486CE4
-	connection left, 0, ROUTE_134, 0
-	connection right, 0, ROUTE_132, 0
+	connection left, 0, MAP_ROUTE134
+	connection right, 0, MAP_ROUTE132
 
 Route133_MapConnections: @ 8486CFC
 	.4byte 0x2
diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc
new file mode 100644
index 000000000..6adfce330
--- /dev/null
+++ b/data/maps/Route133/events.inc
@@ -0,0 +1,15 @@
+Route133_EventObjects: @ 852CC94
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, 25, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, 26, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038
+	object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 7, 14, 3, 18, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 56, 11, 3, 8, 1, 1, 1, 3, Route133_EventScript_1F7616, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 56, 15, 3, 16, 1, 1, 1, 3, Route133_EventScript_1F762D, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, 1, 1, 1, 0, 0, Route133_EventScript_29108D, 1157
+
+Route133_MapEvents:: @ 852CD84
+	map_events Route133_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc
index 30a69f94d..e8bc66e6f 100644
--- a/data/maps/Route133/header.inc
+++ b/data/maps/Route133/header.inc
@@ -1,5 +1,5 @@
 Route133: @ 84829F8
-	.4byte Route133_MapAttributes
+	.4byte Route133_Layout
 	.4byte Route133_MapEvents
 	.4byte Route133_MapScripts
 	.4byte Route133_MapConnections
diff --git a/data/scripts/maps/Route133.inc b/data/maps/Route133/scripts.inc
index dc15a5d40..dc15a5d40 100644
--- a/data/scripts/maps/Route133.inc
+++ b/data/maps/Route133/scripts.inc
diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc
index 8429378e4..861c82b4d 100644
--- a/data/maps/Route134/connections.inc
+++ b/data/maps/Route134/connections.inc
@@ -1,6 +1,6 @@
 Route134_MapConnectionsList: @ 8486D04
-	connection left, 0, SLATEPORT_CITY, 0
-	connection right, 0, ROUTE_133, 0
+	connection left, 0, MAP_SLATEPORT_CITY
+	connection right, 0, MAP_ROUTE133
 
 Route134_MapConnections: @ 8486D1C
 	.4byte 0x2
diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc
new file mode 100644
index 000000000..5a2d57417
--- /dev/null
+++ b/data/maps/Route134/events.inc
@@ -0,0 +1,16 @@
+Route134_EventObjects: @ 852CD98
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, 49, 3, 5, 1, 2, Route134_EventScript_1F7653, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 24, 23, 3, 26, 0, 3, 1, 6, Route134_EventScript_1F7681, 0
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 43, 23, 1, 9, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0
+	object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, 25, 0, 3, 1, 6, Route134_EventScript_1F770B, 0
+	object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0
+	object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, 18, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, 1, 1, 1, 0, 0, Route134_EventScript_29109A, 1158
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, 1, 1, 1, 0, 0, Route134_EventScript_2910A7, 1159
+
+Route134_MapEvents:: @ 852CEA0
+	map_events Route134_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc
index 9730f5036..20f6dd90a 100644
--- a/data/maps/Route134/header.inc
+++ b/data/maps/Route134/header.inc
@@ -1,5 +1,5 @@
 Route134: @ 8482A14
-	.4byte Route134_MapAttributes
+	.4byte Route134_Layout
 	.4byte Route134_MapEvents
 	.4byte Route134_MapScripts
 	.4byte Route134_MapConnections
diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc
new file mode 100644
index 000000000..bdec88c42
--- /dev/null
+++ b/data/maps/Route134/scripts.inc
@@ -0,0 +1,53 @@
+Route134_MapScripts:: @ 81F7644
+	map_script 5, Route134_MapScript1_1F764A
+	.byte 0
+
+Route134_MapScript1_1F764A: @ 81F764A
+	setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6
+	end
+
+Route134_EventScript_1F7653:: @ 81F7653
+	trainerbattle 0, TRAINER_JACK, 0, Route134_Text_2A4571, Route134_Text_2A45BB
+	msgbox Route134_Text_2A45C5, 6
+	end
+
+Route134_EventScript_1F766A:: @ 81F766A
+	trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_2A4609, Route134_Text_2A4643
+	msgbox Route134_Text_2A464B, 6
+	end
+
+Route134_EventScript_1F7681:: @ 81F7681
+	trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_2A4682, Route134_Text_2A46BE
+	msgbox Route134_Text_2A46D2, 6
+	end
+
+Route134_EventScript_1F7698:: @ 81F7698
+	trainerbattle 0, TRAINER_AARON, 0, Route134_Text_2A479E, Route134_Text_2A47E1
+	msgbox Route134_Text_2A47FD, 6
+	end
+
+Route134_EventScript_1F76AF:: @ 81F76AF
+	trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_2A4709, Route134_Text_2A4745
+	msgbox Route134_Text_2A475D, 6
+	end
+
+Route134_EventScript_1F76C6:: @ 81F76C6
+	trainerbattle 0, TRAINER_HUDSON, 0, Route134_Text_2A4A8F, Route134_Text_2A4AC1
+	msgbox Route134_Text_2A4AD8, 6
+	end
+
+Route134_EventScript_1F76DD:: @ 81F76DD
+	trainerbattle 0, TRAINER_REYNA, 0, Route134_Text_2A49E9, Route134_Text_2A4A10
+	msgbox Route134_Text_2A4A34, 6
+	end
+
+Route134_EventScript_1F76F4:: @ 81F76F4
+	trainerbattle 0, TRAINER_MARLEY, 0, Route134_Text_2A4937, Route134_Text_2A496B
+	msgbox Route134_Text_2A49B1, 6
+	end
+
+Route134_EventScript_1F770B:: @ 81F770B
+	trainerbattle 0, TRAINER_KELVIN, 0, Route134_Text_2A4875, Route134_Text_2A489B
+	msgbox Route134_Text_2A48BD, 6
+	end
+
diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc
index 01e5aff35..dbca1662d 100644
--- a/data/maps/RustboroCity/connections.inc
+++ b/data/maps/RustboroCity/connections.inc
@@ -1,7 +1,7 @@
 RustboroCity_MapConnectionsList: @ 8486758
-	connection up, 0, ROUTE_115, 0
-	connection down, 0, ROUTE_104, 0
-	connection right, 0, ROUTE_116, 0
+	connection up, 0, MAP_ROUTE115
+	connection down, 0, MAP_ROUTE104
+	connection right, 0, MAP_ROUTE116
 
 RustboroCity_MapConnections: @ 848677C
 	.4byte 0x3
diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc
new file mode 100644
index 000000000..b71bdb875
--- /dev/null
+++ b/data/maps/RustboroCity/events.inc
@@ -0,0 +1,70 @@
+RustboroCity_EventObjects: @ 85267E0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_1E08D1, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0
+	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0
+	object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, 10, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, 732
+	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, 731
+	object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, 2, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041
+	object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, 8, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0
+	object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, 814
+	object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, 1, 1, 1, 0, 0, 0x0, 844
+	object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, 1, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0
+
+RustboroCity_MapWarps: @ 8526960
+	warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM
+	warp_def 13, 30, 0, 0, MAP_RUSTBORO_CITY_FLAT1_1F
+	warp_def 16, 45, 0, 0, MAP_RUSTBORO_CITY_MART
+	warp_def 16, 38, 0, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F
+	warp_def 27, 34, 0, 0, MAP_RUSTBORO_CITY_POKEMON_SCHOOL
+	warp_def 11, 15, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_1F
+	warp_def 12, 15, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_1F
+	warp_def 33, 19, 0, 0, MAP_RUSTBORO_CITY_HOUSE1
+	warp_def 9, 38, 0, 0, MAP_RUSTBORO_CITY_CUTTERS_HOUSE
+	warp_def 30, 28, 0, 0, MAP_RUSTBORO_CITY_HOUSE2
+	warp_def 5, 51, 0, 0, MAP_RUSTBORO_CITY_FLAT2_1F
+	warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3
+
+RustboroCity_MapCoordEvents: @ 85269C0
+	coord_event 23, 20, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E095A
+	coord_event 23, 21, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E0971
+	coord_event 23, 22, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E0988
+	coord_event 23, 23, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E099F
+	coord_event 23, 24, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E09B6
+	coord_event 30, 9, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0AFE
+	coord_event 29, 10, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B0A
+	coord_event 30, 11, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B16
+	coord_event 30, 12, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B22
+	coord_event 30, 9, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C2B
+	coord_event 31, 10, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C37
+	coord_event 30, 11, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C43
+	coord_event 30, 12, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C4F
+	coord_event 12, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0DF3
+	coord_event 13, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0E33
+	coord_event 14, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0E73
+	coord_event 15, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0EB3
+	coord_event 16, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0EF3
+	coord_event 17, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0F33
+	coord_event 18, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0F73
+	coord_event 19, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0FB3
+
+RustboroCity_MapBGEvents: @ 8526B10
+	bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_1E08F5
+	bg_event 25, 35, 0, 0, 0, RustboroCity_EventScript_1E0910
+	bg_event 17, 45, 0, 1, 0, RustboroCity_EventScript_271E6A
+	bg_event 18, 38, 0, 1, 0, RustboroCity_EventScript_271E73
+	bg_event 19, 49, 0, 0, 0, RustboroCity_EventScript_1E0907
+	bg_event 18, 45, 0, 1, 0, RustboroCity_EventScript_271E6A
+	bg_event 17, 38, 0, 1, 0, RustboroCity_EventScript_271E73
+	bg_event 17, 20, 0, 0, 0, RustboroCity_EventScript_1E08EC
+	bg_event 30, 8, 0, 0, 0, RustboroCity_EventScript_1E08E3
+	bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_1E0919
+
+RustboroCity_MapEvents:: @ 8526B88
+	map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents
+
diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc
index 9698b81de..adce7ef75 100644
--- a/data/maps/RustboroCity/header.inc
+++ b/data/maps/RustboroCity/header.inc
@@ -1,5 +1,5 @@
 RustboroCity: @ 848250C
-	.4byte RustboroCity_MapAttributes
+	.4byte RustboroCity_Layout
 	.4byte RustboroCity_MapEvents
 	.4byte RustboroCity_MapScripts
 	.4byte RustboroCity_MapConnections
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
new file mode 100644
index 000000000..6eb8d48bc
--- /dev/null
+++ b/data/maps/RustboroCity/scripts.inc
@@ -0,0 +1,1310 @@
+RustboroCity_MapScripts:: @ 81E06BD
+	map_script 3, RustboroCity_MapScript1_1E06C8
+	map_script 2, RustboroCity_MapScript2_1E070B
+	.byte 0
+
+RustboroCity_MapScript1_1E06C8: @ 81E06C8
+	setflag FLAG_VISITED_RUSTBORO_CITY
+	call RustboroCity_EventScript_271ED7
+	compare VAR_0x405A, 6
+	call_if 1, RustboroCity_EventScript_1E0707
+	getplayerxy VAR_TEMP_0, VAR_TEMP_1
+	compare VAR_0x405A, 6
+	goto_eq RustboroCity_EventScript_1E06EC
+	end
+
+RustboroCity_EventScript_1E06EC:: @ 81E06EC
+	compare VAR_TEMP_0, 11
+	goto_eq RustboroCity_EventScript_1E06FF
+	setobjectxyperm 15, 12, 15
+	end
+
+RustboroCity_EventScript_1E06FF:: @ 81E06FF
+	setobjectxyperm 15, 11, 15
+	end
+
+RustboroCity_EventScript_1E0707:: @ 81E0707
+	setflag FLAG_SPECIAL_FLAG_0x4000
+	return
+
+RustboroCity_MapScript2_1E070B: @ 81E070B
+	map_script_2 VAR_0x405A, 6, RustboroCity_EventScript_1E0715
+	.2byte 0
+
+RustboroCity_EventScript_1E0715:: @ 81E0715
+	lockall
+	setvar VAR_0x4063, 1
+	applymovement 255, RustboroCity_Movement_1E0850
+	waitmovement 0
+	playse SE_KAIDAN
+	delay 10
+	addobject 15
+	applymovement 15, RustboroCity_Movement_1E0852
+	waitmovement 0
+	playse SE_PIN
+	applymovement 15, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 15, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725A6
+	waitmovement 0
+	applymovement 15, RustboroCity_Movement_1E084E
+	waitmovement 0
+	msgbox RustboroCity_Text_1E22A5, 4
+	closemessage
+	setflag FLAG_HAS_MATCH_CALL
+	applymovement 15, RustboroCity_Movement_2725A4
+	waitmovement 0
+	playse SE_TK_KASYA
+	delay 10
+	playse SE_TK_KASYA
+	delay 10
+	playse SE_TK_KASYA
+	delay 10
+	playse SE_TK_KASYA
+	delay 20
+	applymovement 15, RustboroCity_Movement_2725AA
+	waitmovement 0
+	msgbox RustboroCity_Text_1E2331, 4
+	closemessage
+	delay 20
+	goto RustboroCity_EventScript_1E07BD
+
+RustboroCity_EventScript_1E07AC:: @ 81E07AC
+	msgbox RustboroCity_Text_1E2449, 4
+	closemessage
+	delay 10
+	goto RustboroCity_EventScript_1E07BD
+
+RustboroCity_EventScript_1E07BD:: @ 81E07BD
+	setflag FLAG_0x130
+	special sp106_CreateStartMenu
+	waitstate
+	switch VAR_RESULT
+	case 0, RustboroCity_EventScript_1E07AC
+	case 1, RustboroCity_EventScript_1E07AC
+	case 2, RustboroCity_EventScript_1E07AC
+	case 4, RustboroCity_EventScript_1E07AC
+	case 5, RustboroCity_EventScript_1E07AC
+	case 6, RustboroCity_EventScript_1E07AC
+	case 7, RustboroCity_EventScript_1E07AC
+	case 127, RustboroCity_EventScript_1E07AC
+	special sub_81C72A4
+	waitstate
+	delay 20
+	msgbox RustboroCity_Text_1E2464, 4
+	closemessage
+	applymovement 15, RustboroCity_Movement_1E085D
+	waitmovement 0
+	playse SE_KAIDAN
+	removeobject 15
+	setflag FLAG_0x34C
+	setvar VAR_0x405A, 7
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	releaseall
+	end
+
+RustboroCity_Movement_1E084E: @ 81E084E
+	walk_in_place_down
+	step_end
+
+RustboroCity_Movement_1E0850: @ 81E0850
+	walk_down
+	step_end
+
+RustboroCity_Movement_1E0852: @ 81E0852
+	walk_down
+	delay_16
+	step_end
+
+RustboroCity_Movement_1E0855: @ 81E0855
+	delay_16
+	walk_left
+	walk_down
+	walk_down
+	walk_right
+	walk_in_place_fastest_up
+	delay_16
+	step_end
+
+RustboroCity_Movement_1E085D: @ 81E085D
+	walk_up
+	step_end
+
+RustboroCity_EventScript_1E085F:: @ 81E085F
+	lock
+	faceplayer
+	checkflag FLAG_0x08E
+	goto_eq RustboroCity_EventScript_1E0874
+	msgbox RustboroCity_Text_1E123F, 4
+	release
+	end
+
+RustboroCity_EventScript_1E0874:: @ 81E0874
+	msgbox RustboroCity_Text_1E12AC, 4
+	release
+	end
+
+RustboroCity_EventScript_1E087E:: @ 81E087E
+	lock
+	faceplayer
+	msgbox RustboroCity_Text_1E1407, 4
+	release
+	end
+
+RustboroCity_EventScript_1E088A:: @ 81E088A
+	msgbox RustboroCity_Text_1E1480, 2
+	end
+
+RustboroCity_EventScript_1E0893:: @ 81E0893
+	lock
+	faceplayer
+	checkflag FLAG_BADGE01_GET
+	goto_eq RustboroCity_EventScript_1E08A8
+	msgbox RustboroCity_Text_1E130D, 4
+	release
+	end
+
+RustboroCity_EventScript_1E08A8:: @ 81E08A8
+	msgbox RustboroCity_Text_1E139E, 4
+	release
+	end
+
+RustboroCity_EventScript_1E08B2:: @ 81E08B2
+	lock
+	faceplayer
+	checkflag FLAG_0x0BC
+	goto_eq RustboroCity_EventScript_1E08C7
+	msgbox RustboroCity_Text_1E1520, 4
+	release
+	end
+
+RustboroCity_EventScript_1E08C7:: @ 81E08C7
+	msgbox RustboroCity_Text_1E1589, 4
+	release
+	end
+
+RustboroCity_EventScript_1E08D1:: @ 81E08D1
+	msgbox RustboroCity_Text_1E1633, 2
+	end
+
+RustboroCity_EventScript_1E08DA:: @ 81E08DA
+	msgbox RustboroCity_Text_1E1695, 3
+	end
+
+RustboroCity_EventScript_1E08E3:: @ 81E08E3
+	msgbox RustboroCity_Text_1E20A6, 3
+	end
+
+RustboroCity_EventScript_1E08EC:: @ 81E08EC
+	msgbox RustboroCity_Text_1E2128, 3
+	end
+
+RustboroCity_EventScript_1E08F5:: @ 81E08F5
+	msgbox RustboroCity_Text_1E2167, 3
+	end
+
+RustboroCity_EventScript_1E08FE:: @ 81E08FE
+	msgbox RustboroCity_Text_1E21B3, 3
+	end
+
+RustboroCity_EventScript_1E0907:: @ 81E0907
+	msgbox RustboroCity_Text_1E220B, 3
+	end
+
+RustboroCity_EventScript_1E0910:: @ 81E0910
+	msgbox RustboroCity_Text_1E2253, 3
+	end
+
+RustboroCity_EventScript_1E0919:: @ 81E0919
+	msgbox RustboroCity_Text_1E2296, 3
+	end
+
+RustboroCity_EventScript_1E0922:: @ 81E0922
+	lock
+	faceplayer
+	msgbox RustboroCity_Text_1E16F4, 4
+	applymovement 7, RustboroCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+RustboroCity_EventScript_1E0938:: @ 81E0938
+	lock
+	faceplayer
+	msgbox RustboroCity_Text_1E174B, 4
+	applymovement 8, RustboroCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+RustboroCity_EventScript_1E094E:: @ 81E094E
+	lock
+	faceplayer
+	msgbox RustboroCity_Text_1E1789, 4
+	release
+	end
+
+RustboroCity_EventScript_1E095A:: @ 81E095A
+	lockall
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
+	setvar VAR_0x8004, 0
+	goto RustboroCity_EventScript_1E09CD
+	end
+
+RustboroCity_EventScript_1E0971:: @ 81E0971
+	lockall
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
+	setvar VAR_0x8004, 1
+	goto RustboroCity_EventScript_1E09CD
+	end
+
+RustboroCity_EventScript_1E0988:: @ 81E0988
+	lockall
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
+	setvar VAR_0x8004, 2
+	goto RustboroCity_EventScript_1E09CD
+	end
+
+RustboroCity_EventScript_1E099F:: @ 81E099F
+	lockall
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
+	setvar VAR_0x8004, 3
+	goto RustboroCity_EventScript_1E09CD
+	end
+
+RustboroCity_EventScript_1E09B6:: @ 81E09B6
+	lockall
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
+	setvar VAR_0x8004, 4
+	goto RustboroCity_EventScript_1E09CD
+	end
+
+RustboroCity_EventScript_1E09CD:: @ 81E09CD
+	msgbox RustboroCity_Text_1E17FE, 4
+	closemessage
+	playbgm MUS_AQA_0, 0
+	addobject 10
+	addobject 9
+	applymovement 10, RustboroCity_Movement_1E0AA0
+	waitmovement 0
+	removeobject 10
+	applymovement 9, RustboroCity_Movement_1E0AB1
+	waitmovement 0
+	msgbox RustboroCity_Text_1E1817, 4
+	closemessage
+	applymovement 9, RustboroCity_Movement_1E0AB9
+	waitmovement 0
+	fadedefaultbgm
+	removeobject 9
+	setobjectxyperm 9, 30, 10
+	clearflag FLAG_0x2DC
+	setflag FLAG_0x08E
+	setvar VAR_0x405A, 2
+	setvar VAR_0x409A, 2
+	setvar VAR_0x406F, 1
+	clearflag FLAG_0x37B
+	clearflag FLAG_0x370
+	clearflag FLAG_0x36E
+	setflag FLAG_0x2E3
+	setflag FLAG_0x371
+	releaseall
+	end
+
+RustboroCity_EventScript_1E0A3B:: @ 81E0A3B
+	msgbox RustboroCity_Text_1E1904, 4
+	return
+
+RustboroCity_EventScript_1E0A44:: @ 81E0A44
+	msgbox RustboroCity_Text_1E194D, 4
+	return
+
+RustboroCity_EventScript_1E0A4D:: @ 81E0A4D
+	applymovement 9, RustboroCity_Movement_1E0AC1
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_1E0A58:: @ 81E0A58
+	applymovement 9, RustboroCity_Movement_1E0AC5
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_1E0A63:: @ 81E0A63
+	applymovement 9, RustboroCity_Movement_1E0ACA
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_1E0A6E:: @ 81E0A6E
+	applymovement 9, RustboroCity_Movement_1E0ACF
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_1E0A79:: @ 81E0A79
+	applymovement 9, RustboroCity_Movement_1E0AD5
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725A6
+	waitmovement 0
+	return
+
+RustboroCity_Movement_1E0A8E: @ 81E0A8E
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	step_end
+
+RustboroCity_Movement_1E0AA0: @ 81E0AA0
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	step_end
+
+RustboroCity_Movement_1E0AB1: @ 81E0AB1
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+RustboroCity_Movement_1E0AB9: @ 81E0AB9
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+RustboroCity_Movement_1E0AC1: @ 81E0AC1
+	walk_down
+	walk_right
+	walk_right
+	step_end
+
+RustboroCity_Movement_1E0AC5: @ 81E0AC5
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	step_end
+
+RustboroCity_Movement_1E0ACA: @ 81E0ACA
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	step_end
+
+RustboroCity_Movement_1E0ACF: @ 81E0ACF
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	step_end
+
+RustboroCity_Movement_1E0AD5: @ 81E0AD5
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+RustboroCity_EventScript_1E0ADD:: @ 81E0ADD
+	lock
+	faceplayer
+	checkflag FLAG_0x08F
+	goto_eq RustboroCity_EventScript_1E0AF2
+	msgbox RustboroCity_Text_1E1904, 4
+	release
+	end
+
+RustboroCity_EventScript_1E0AF2:: @ 81E0AF2
+	waitse
+	setvar VAR_TEMP_1, 4
+	goto RustboroCity_EventScript_1E0C5B
+	end
+
+RustboroCity_EventScript_1E0AFE:: @ 81E0AFE
+	lockall
+	setvar VAR_TEMP_1, 0
+	goto RustboroCity_EventScript_1E0B2E
+	end
+
+RustboroCity_EventScript_1E0B0A:: @ 81E0B0A
+	lockall
+	setvar VAR_TEMP_1, 1
+	goto RustboroCity_EventScript_1E0B2E
+	end
+
+RustboroCity_EventScript_1E0B16:: @ 81E0B16
+	lockall
+	setvar VAR_TEMP_1, 2
+	goto RustboroCity_EventScript_1E0B2E
+	end
+
+RustboroCity_EventScript_1E0B22:: @ 81E0B22
+	lockall
+	setvar VAR_TEMP_1, 3
+	goto RustboroCity_EventScript_1E0B2E
+	end
+
+RustboroCity_EventScript_1E0B2E:: @ 81E0B2E
+	compare VAR_TEMP_1, 0
+	call_if 1, RustboroCity_EventScript_1E0B6F
+	compare VAR_TEMP_1, 1
+	call_if 1, RustboroCity_EventScript_1E0B9B
+	compare VAR_TEMP_1, 2
+	call_if 1, RustboroCity_EventScript_1E0BC7
+	compare VAR_TEMP_1, 3
+	call_if 1, RustboroCity_EventScript_1E0BF3
+	setflag FLAG_0x09F
+	setvar VAR_0x405A, 3
+	moveobjectoffscreen 9
+	msgbox RustboroCity_Text_1E183E, 4
+	releaseall
+	end
+
+RustboroCity_EventScript_1E0B6F:: @ 81E0B6F
+	applymovement 9, RustboroCity_Movement_2725A6
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725AA
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_1E0B9B:: @ 81E0B9B
+	applymovement 9, RustboroCity_Movement_2725A4
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725AC
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_1E0BC7:: @ 81E0BC7
+	applymovement 9, RustboroCity_Movement_2725AA
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725A6
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_1E0BF3:: @ 81E0BF3
+	applymovement 9, RustboroCity_Movement_2725AA
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_1E0C29
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725A6
+	waitmovement 0
+	return
+
+RustboroCity_Movement_1E0C29: @ 81E0C29
+	walk_down
+	step_end
+
+RustboroCity_EventScript_1E0C2B:: @ 81E0C2B
+	lockall
+	setvar VAR_TEMP_1, 0
+	goto RustboroCity_EventScript_1E0C5B
+	end
+
+RustboroCity_EventScript_1E0C37:: @ 81E0C37
+	lockall
+	setvar VAR_TEMP_1, 1
+	goto RustboroCity_EventScript_1E0C5B
+	end
+
+RustboroCity_EventScript_1E0C43:: @ 81E0C43
+	lockall
+	setvar VAR_TEMP_1, 2
+	goto RustboroCity_EventScript_1E0C5B
+	end
+
+RustboroCity_EventScript_1E0C4F:: @ 81E0C4F
+	lockall
+	setvar VAR_TEMP_1, 3
+	goto RustboroCity_EventScript_1E0C5B
+	end
+
+RustboroCity_EventScript_1E0C5B:: @ 81E0C5B
+	compare VAR_TEMP_1, 0
+	call_if 1, RustboroCity_EventScript_1E0CDC
+	compare VAR_TEMP_1, 1
+	call_if 1, RustboroCity_EventScript_1E0D08
+	compare VAR_TEMP_1, 2
+	call_if 1, RustboroCity_EventScript_1E0D34
+	compare VAR_TEMP_1, 3
+	call_if 1, RustboroCity_EventScript_1E0D60
+	compare VAR_TEMP_1, 4
+	call_if 1, RustboroCity_EventScript_1E0D96
+	msgbox RustboroCity_Text_1E194D, 4
+	giveitem_std ITEM_GREAT_BALL
+	compare VAR_RESULT, 0
+	call_if 1, RustboroCity_EventScript_1E0CD3
+	msgbox RustboroCity_Text_1E1A21, 4
+	closemessage
+	setflag FLAG_0x090
+	setflag FLAG_0x2DC
+	setvar VAR_0x405A, 5
+	delay 30
+	warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2
+	waitstate
+	releaseall
+	end
+
+RustboroCity_EventScript_1E0CD3:: @ 81E0CD3
+	msgbox RustboroCity_Text_1E19E5, 4
+	return
+
+RustboroCity_EventScript_1E0CDC:: @ 81E0CDC
+	applymovement 9, RustboroCity_Movement_2725A6
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725AA
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_1E0D08:: @ 81E0D08
+	applymovement 9, RustboroCity_Movement_2725A8
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725AE
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_1E0D34:: @ 81E0D34
+	applymovement 9, RustboroCity_Movement_2725AA
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725A6
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_1E0D60:: @ 81E0D60
+	applymovement 9, RustboroCity_Movement_2725AA
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_1E0C29
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725A6
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_1E0D96:: @ 81E0D96
+	applymovement 9, RustboroCity_Movement_2725A4
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_27259A
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_1E0DB8:: @ 81E0DB8
+	lockall
+	checkflag FLAG_0x120
+	call_if 0, RustboroCity_EventScript_1E0DD1
+	applymovement 14, RustboroCity_Movement_27259E
+	waitmovement 0
+	goto RustboroCity_EventScript_1E0FF3
+
+Route104_EventScript_1E0DD1:: @ 81E0DD1
+RustboroCity_EventScript_1E0DD1:: @ 81E0DD1
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq RustboroCity_EventScript_1E0DE9
+	compare VAR_RESULT, 1
+	goto_eq RustboroCity_EventScript_1E0DEE
+	return
+
+RustboroCity_EventScript_1E0DE9:: @ 81E0DE9
+	playbgm MUS_GIRL_SUP, 1
+	return
+
+RustboroCity_EventScript_1E0DEE:: @ 81E0DEE
+	playbgm MUS_BOY_SUP, 1
+	return
+
+RustboroCity_EventScript_1E0DF3:: @ 81E0DF3
+	lockall
+	call RustboroCity_EventScript_1E0DD1
+	applymovement 14, RustboroCity_Movement_2725AA
+	waitmovement 0
+	playse SE_PIN
+	applymovement 14, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_1E120E
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725A6
+	waitmovement 0
+	goto RustboroCity_EventScript_1E0FF3
+
+RustboroCity_EventScript_1E0E33:: @ 81E0E33
+	lockall
+	call RustboroCity_EventScript_1E0DD1
+	applymovement 14, RustboroCity_Movement_2725AA
+	waitmovement 0
+	playse SE_PIN
+	applymovement 14, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_1E1215
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725A6
+	waitmovement 0
+	goto RustboroCity_EventScript_1E0FF3
+
+RustboroCity_EventScript_1E0E73:: @ 81E0E73
+	lockall
+	call RustboroCity_EventScript_1E0DD1
+	applymovement 14, RustboroCity_Movement_2725AA
+	waitmovement 0
+	playse SE_PIN
+	applymovement 14, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_1E121B
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725A6
+	waitmovement 0
+	goto RustboroCity_EventScript_1E0FF3
+
+RustboroCity_EventScript_1E0EB3:: @ 81E0EB3
+	lockall
+	call RustboroCity_EventScript_1E0DD1
+	applymovement 14, RustboroCity_Movement_2725AA
+	waitmovement 0
+	playse SE_PIN
+	applymovement 14, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_1E1220
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725A6
+	waitmovement 0
+	goto RustboroCity_EventScript_1E0FF3
+
+RustboroCity_EventScript_1E0EF3:: @ 81E0EF3
+	lockall
+	call RustboroCity_EventScript_1E0DD1
+	applymovement 14, RustboroCity_Movement_2725AA
+	waitmovement 0
+	playse SE_PIN
+	applymovement 14, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_1E1224
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725A6
+	waitmovement 0
+	goto RustboroCity_EventScript_1E0FF3
+
+RustboroCity_EventScript_1E0F33:: @ 81E0F33
+	lockall
+	call RustboroCity_EventScript_1E0DD1
+	applymovement 14, RustboroCity_Movement_2725AA
+	waitmovement 0
+	playse SE_PIN
+	applymovement 14, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_1E1227
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725A6
+	waitmovement 0
+	goto RustboroCity_EventScript_1E0FF3
+
+RustboroCity_EventScript_1E0F73:: @ 81E0F73
+	lockall
+	call RustboroCity_EventScript_1E0DD1
+	applymovement 14, RustboroCity_Movement_2725AA
+	waitmovement 0
+	playse SE_PIN
+	applymovement 14, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_1E122B
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725A6
+	waitmovement 0
+	goto RustboroCity_EventScript_1E0FF3
+
+RustboroCity_EventScript_1E0FB3:: @ 81E0FB3
+	lockall
+	call RustboroCity_EventScript_1E0DD1
+	applymovement 14, RustboroCity_Movement_2725AA
+	waitmovement 0
+	playse SE_PIN
+	applymovement 14, RustboroCity_Movement_272598
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_27259A
+	waitmovement 0
+	applymovement 14, RustboroCity_Movement_1E1230
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_2725A6
+	waitmovement 0
+	goto RustboroCity_EventScript_1E0FF3
+
+RustboroCity_EventScript_1E0FF3:: @ 81E0FF3
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq RustboroCity_EventScript_1E100B
+	compare VAR_RESULT, 1
+	goto_eq RustboroCity_EventScript_1E1114
+	end
+
+RustboroCity_EventScript_1E100B:: @ 81E100B
+	checkflag FLAG_0x0D3
+	goto_eq RustboroCity_EventScript_1E10C1
+	checkflag FLAG_0x120
+	goto_eq RustboroCity_EventScript_1E1070
+	setflag FLAG_0x120
+	msgbox RustboroCity_Text_1E1A49, 4
+	closemessage
+	delay 30
+	playfanfare MUS_ME_TORE_EYE
+	msgbox RustboroCity_Text_1E1ADB, 4
+	waitfanfare
+	closemessage
+	delay 30
+	setflag FLAG_0x0FD
+	setvar VAR_0x405A, 8
+	setvar VAR_0x4063, 2
+	setvar VAR_0x8008, 0
+	msgbox RustboroCity_Text_1E1AFA, 5
+	compare VAR_RESULT, 1
+	goto_eq RustboroCity_EventScript_1E1092
+	msgbox RustboroCity_Text_1E1BD3, 4
+	call RustboroCity_EventScript_1E10D6
+	releaseall
+	end
+
+RustboroCity_EventScript_1E1070:: @ 81E1070
+	setvar VAR_0x8008, 1
+	msgbox RustboroCity_Text_1E1C48, 5
+	compare VAR_RESULT, 1
+	goto_eq RustboroCity_EventScript_1E1092
+	msgbox RustboroCity_Text_1E1BD3, 4
+	releaseall
+	end
+
+RustboroCity_EventScript_1E1092:: @ 81E1092
+	msgbox RustboroCity_Text_1E1C84, 4
+	switch VAR_FIRST_POKE
+	case 0, RustboroCity_EventScript_1E10DB
+	case 1, RustboroCity_EventScript_1E10EE
+	case 2, RustboroCity_EventScript_1E1101
+	end
+
+RustboroCity_EventScript_1E10C1:: @ 81E10C1
+	msgbox RustboroCity_Text_1E1CE7, 4
+	compare VAR_0x8008, 0
+	call_if 1, RustboroCity_EventScript_1E10D6
+	releaseall
+	end
+
+RustboroCity_EventScript_1E10D6:: @ 81E10D6
+	savebgm MUS_DUMMY
+	fadedefaultbgm
+	return
+
+RustboroCity_EventScript_1E10DB:: @ 81E10DB
+	trainerbattle 3, TRAINER_MAY_14, 0, RustboroCity_Text_1E1CC1
+	setflag FLAG_0x0D3
+	goto RustboroCity_EventScript_1E10C1
+	end
+
+RustboroCity_EventScript_1E10EE:: @ 81E10EE
+	trainerbattle 3, TRAINER_MAY_15, 0, RustboroCity_Text_1E1CC1
+	setflag FLAG_0x0D3
+	goto RustboroCity_EventScript_1E10C1
+	end
+
+RustboroCity_EventScript_1E1101:: @ 81E1101
+	trainerbattle 3, TRAINER_MAY_10, 0, RustboroCity_Text_1E1CC1
+	setflag FLAG_0x0D3
+	goto RustboroCity_EventScript_1E10C1
+	end
+
+RustboroCity_EventScript_1E1114:: @ 81E1114
+	checkflag FLAG_0x0D3
+	goto_eq RustboroCity_EventScript_1E11C0
+	checkflag FLAG_0x120
+	goto_eq RustboroCity_EventScript_1E1174
+	setflag FLAG_0x120
+	msgbox RustboroCity_Text_1E1D7D, 4
+	closemessage
+	delay 30
+	playfanfare MUS_ME_TORE_EYE
+	msgbox RustboroCity_Text_1E1E11, 4
+	waitfanfare
+	closemessage
+	delay 30
+	setflag FLAG_0x0FD
+	setvar VAR_0x405A, 8
+	setvar VAR_0x4063, 2
+	msgbox RustboroCity_Text_1E1E34, 5
+	compare VAR_RESULT, 1
+	goto_eq RustboroCity_EventScript_1E1191
+	msgbox RustboroCity_Text_1E1F2F, 4
+	call RustboroCity_EventScript_1E10D6
+	releaseall
+	end
+
+RustboroCity_EventScript_1E1174:: @ 81E1174
+	msgbox RustboroCity_Text_1E1F76, 5
+	compare VAR_RESULT, 1
+	goto_eq RustboroCity_EventScript_1E1191
+	msgbox RustboroCity_Text_1E1F2F, 4
+	releaseall
+	end
+
+RustboroCity_EventScript_1E1191:: @ 81E1191
+	msgbox RustboroCity_Text_1E1FA9, 4
+	switch VAR_FIRST_POKE
+	case 0, RustboroCity_EventScript_1E11D5
+	case 1, RustboroCity_EventScript_1E11E8
+	case 2, RustboroCity_EventScript_1E11FB
+	end
+
+RustboroCity_EventScript_1E11C0:: @ 81E11C0
+	msgbox RustboroCity_Text_1E2002, 4
+	compare VAR_0x8008, 0
+	call_if 1, RustboroCity_EventScript_1E10D6
+	releaseall
+	end
+
+RustboroCity_EventScript_1E11D5:: @ 81E11D5
+	trainerbattle 3, TRAINER_BRENDAN_10, 0, RustboroCity_Text_1E1FE9
+	setflag FLAG_0x0D3
+	goto RustboroCity_EventScript_1E11C0
+	end
+
+RustboroCity_EventScript_1E11E8:: @ 81E11E8
+	trainerbattle 3, TRAINER_BRENDAN_12, 0, RustboroCity_Text_1E1FE9
+	setflag FLAG_0x0D3
+	goto RustboroCity_EventScript_1E11C0
+	end
+
+RustboroCity_EventScript_1E11FB:: @ 81E11FB
+	trainerbattle 3, TRAINER_BRENDAN_11, 0, RustboroCity_Text_1E1FE9
+	setflag FLAG_0x0D3
+	goto RustboroCity_EventScript_1E11C0
+	end
+
+RustboroCity_Movement_1E120E: @ 81E120E
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	step_end
+
+RustboroCity_Movement_1E1215: @ 81E1215
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	step_end
+
+RustboroCity_Movement_1E121B: @ 81E121B
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	step_end
+
+RustboroCity_Movement_1E1220: @ 81E1220
+	walk_down
+	walk_left
+	walk_down
+	step_end
+
+RustboroCity_Movement_1E1224: @ 81E1224
+	walk_down
+	walk_down
+	step_end
+
+RustboroCity_Movement_1E1227: @ 81E1227
+	walk_down
+	walk_right
+	walk_down
+	step_end
+
+RustboroCity_Movement_1E122B: @ 81E122B
+	walk_down
+	walk_right
+	walk_right
+	walk_down
+	step_end
+
+RustboroCity_Movement_1E1230: @ 81E1230
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	step_end
+
+RustboroCity_EventScript_1E1236:: @ 81E1236
+	msgbox RustboroCity_Text_1E249D, 2
+	end
+
+RustboroCity_Text_1E123F: @ 81E123F
+	.string "The DEVON CORPORATION…\n"
+	.string "We all just shorten it to DEVON.\p"
+	.string "That company makes all sorts of\n"
+	.string "convenient products.$"
+
+RustboroCity_Text_1E12AC: @ 81E12AC
+	.string "Hm? A sneaky-looking man?\p"
+	.string "Come to think of it, yes, a shady-\n"
+	.string "looking guy went around the corner.$"
+
+RustboroCity_Text_1E130D: @ 81E130D
+	.string "Have you taken the POKéMON GYM\n"
+	.string "challenge?\p"
+	.string "When you get that shiny GYM BADGE\n"
+	.string "in hand, I guess TRAINERS begin to\l"
+	.string "realize what is required of them.$"
+
+RustboroCity_Text_1E139E: @ 81E139E
+	.string "Hey, that’s RUSTBORO’s GYM BADGE!\p"
+	.string "Out of all the POKéMON GYM BADGES,\n"
+	.string "RUSTBORO’s is the coolest, I’d say.$"
+
+RustboroCity_Text_1E1407: @ 81E1407
+	.string "Oh? Who might you be?\n"
+	.string "You’re a new face around these parts.\p"
+	.string "Have you just transferred into the\n"
+	.string "POKéMON TRAINER’S SCHOOL?$"
+
+RustboroCity_Text_1E1480: @ 81E1480
+	.string "I challenged the GYM LEADER, but…\p"
+	.string "It’s not going to be easy winning with\n"
+	.string "my FIRE-type POKéMON…\p"
+	.string "FIRE-type POKéMON don’t match up\n"
+	.string "well against ROCK-type POKéMON…$"
+
+RustboroCity_Text_1E1520: @ 81E1520
+	.string "The old sailor MR. BRINEY lives in\n"
+	.string "a cottage by the sea.\p"
+	.string "He goes for walks in the tunnel every\n"
+	.string "so often.$"
+
+RustboroCity_Text_1E1589: @ 81E1589
+	.string "The old sailor MR. BRINEY lives in\n"
+	.string "a cottage by the sea.\p"
+	.string "He said he was going shopping in\n"
+	.string "SLATEPORT for his pet, PEEKO.\p"
+	.string "That old sea dog, he must really love\n"
+	.string "that PEEKO.$"
+
+RustboroCity_Text_1E1633: @ 81E1633
+	.string "Wow, you have POKéMON with you, too.\p"
+	.string "When I get bigger, I’m going to go\n"
+	.string "places with POKéMON, too.$"
+
+RustboroCity_Text_1E1695: @ 81E1695
+	.string "POKéMON TRAINER’S SCHOOL!\p"
+	.string "If I go to this school, will I be able\n"
+	.string "to catch rare POKéMON easily?$"
+
+RustboroCity_Text_1E16F4: @ 81E16F4
+	.string "If a POKéMON gains experience in\n"
+	.string "battles, it can sometimes change in\l"
+	.string "the way it looks.$"
+
+RustboroCity_Text_1E174B: @ 81E174B
+	.string "A POKéMON changes shape?\n"
+	.string "If one did that, I would be shocked!$"
+
+RustboroCity_Text_1E1789: @ 81E1789
+	.string "A POKéMON you get in a trade from\n"
+	.string "someone grows fast.\p"
+	.string "But if you don’t have certain GYM\n"
+	.string "BADGES, it may not obey you…$"
+
+RustboroCity_Text_1E17FE: @ 81E17FE
+	.string "Get out!\n"
+	.string "Out of the way!$"
+
+RustboroCity_Text_1E1817: @ 81E1817
+	.string "Wait! Pleeeaaase!\p"
+	.string "Don’t take my GOODS!$"
+
+RustboroCity_Text_1E183E: @ 81E183E
+	.string "Oh, it’s you!\p"
+	.string "You’re that fantastic TRAINER who\n"
+	.string "helped me in PETALBURG WOODS!\p"
+	.string "Help me! I was robbed by TEAM AQUA!\n"
+	.string "I have to get the DEVON GOODS back!\p"
+	.string "If I don’t…\n"
+	.string "I’m going to be in serious trouble.$"
+
+RustboroCity_Text_1E1904: @ 81E1904
+	.string "That shady character, I think he took\n"
+	.string "off towards the tunnel over there.$"
+
+RustboroCity_Text_1E194D: @ 81E194D
+	.string "Oh! How did it go?\n"
+	.string "The DEVON GOODS?\p"
+	.string "You did!\n"
+	.string "You got them back!\p"
+	.string "You really are a great TRAINER!\p"
+	.string "I know! As my thanks, I’ll give you\n"
+	.string "another GREAT BALL!$"
+
+RustboroCity_Text_1E19E5: @ 81E19E5
+	.string "You’re loaded with items.\n"
+	.string "I can’t give you this GREAT BALL.$"
+
+RustboroCity_Text_1E1A21: @ 81E1A21
+	.string "Excuse me, please!\n"
+	.string "Please come with me!$"
+
+RustboroCity_Text_1E1A49: @ 81E1A49
+	.string "MAY: Oh, hi, {PLAYER}{KUN}!\p"
+	.string "You had a MATCH CALL feature put\n"
+	.string "on your POKéNAV!\p"
+	.string "Let’s register each other so we can\n"
+	.string "contact one another anytime!\p"
+	.string "… … … … … …$"
+
+RustboroCity_Text_1E1ADB: @ 81E1ADB
+	.string "Registered MAY\n"
+	.string "in the POKéNAV.$"
+
+RustboroCity_Text_1E1AFA: @ 81E1AFA
+	.string "MAY: Oh, by the way, I passed\n"
+	.string "MR. BRINEY in PETALBURG WOODS.\p"
+	.string "I guess he’s on his way home to his\n"
+	.string "cottage by the sea.\p"
+	.string "How’s your POKéDEX coming along,\n"
+	.string "{PLAYER}{KUN}? Mine’s looking pretty decent!\p"
+	.string "So…\n"
+	.string "How about a little battle?$"
+
+RustboroCity_Text_1E1BD3: @ 81E1BD3
+	.string "MAY: Oh, what’s the matter?\p"
+	.string "Haven’t you caught or raised your\n"
+	.string "POKéMON very much?\p"
+	.string "That’s not very good for a TRAINER!$"
+
+RustboroCity_Text_1E1C48: @ 81E1C48
+	.string "MAY: So, what do you think?\n"
+	.string "How about a little battle here?$"
+
+RustboroCity_Text_1E1C84: @ 81E1C84
+	.string "MAY: You just became a TRAINER,\n"
+	.string "{PLAYER}{KUN}. I’m not going to lose!$"
+
+RustboroCity_Text_1E1CC1: @ 81E1CC1
+	.string "Yikes!\n"
+	.string "You’re better than I expected!$"
+
+RustboroCity_Text_1E1CE7: @ 81E1CE7
+	.string "MAY: Oh, by the way, MR. BRINEY, who\n"
+	.string "I just passed…\p"
+	.string "{PLAYER}{KUN}, you just moved here so you\n"
+	.string "might not know this, but MR. BRINEY\l"
+	.string "was once a revered seafarer.$"
+
+RustboroCity_Text_1E1D7D: @ 81E1D7D
+	.string "BRENDAN: Oh, hey, {PLAYER}!\p"
+	.string "You had a MATCH CALL feature put\n"
+	.string "on your POKéNAV! Cool!\p"
+	.string "Let’s register each other so we can\n"
+	.string "get in touch anytime!\p"
+	.string "… … … … … …$"
+
+RustboroCity_Text_1E1E11: @ 81E1E11
+	.string "Registered BRENDAN\n"
+	.string "in the POKéNAV.$"
+
+RustboroCity_Text_1E1E34: @ 81E1E34
+	.string "BRENDAN: By the way, {PLAYER}, I walked\n"
+	.string "by MR. BRINEY in PETALBURG WOODS.\p"
+	.string "I bet he was on his way home to his\n"
+	.string "cottage by the sea.\p"
+	.string "{PLAYER}, how’s your POKéDEX?\n"
+	.string "Have you filled in any pages yet?\p"
+	.string "Mine rules.\p"
+	.string "Want to have a battle to test how\n"
+	.string "far you’ve progressed?$"
+
+RustboroCity_Text_1E1F2F: @ 81E1F2F
+	.string "BRENDAN: What’s the matter? Don’t have\n"
+	.string "any confidence in your POKéMON?$"
+
+RustboroCity_Text_1E1F76: @ 81E1F76
+	.string "BRENDAN: What’s up?\n"
+	.string "Want to have a battle with me?$"
+
+RustboroCity_Text_1E1FA9: @ 81E1FA9
+	.string "BRENDAN: I know you just became\n"
+	.string "a TRAINER, but I won’t go easy!$"
+
+RustboroCity_Text_1E1FE9: @ 81E1FE9
+	.string "Hmm…\n"
+	.string "You’re pretty good.$"
+
+RustboroCity_Text_1E2002: @ 81E2002
+	.string "BRENDAN: By the way, you know\n"
+	.string "MR. BRINEY? The guy I just passed?\p"
+	.string "I bet you didn’t know this, since you\n"
+	.string "just moved here, {PLAYER}, but\l"
+	.string "MR. BRINEY was once a great sailor.$"
+
+RustboroCity_Text_1E20A6: @ 81E20A6
+	.string "“Timesaving tunnel nearing\n"
+	.string "completion!”\p"
+	.string "…Is what it says on the sign, but\n"
+	.string "there’s also a big “X” splashed\l"
+	.string "across it in red paint…$"
+
+RustboroCity_Text_1E2128: @ 81E2128
+	.string "DEVON CORPORATION\p"
+	.string "“For all your living needs, we make\n"
+	.string "it all.”$"
+
+RustboroCity_Text_1E2167: @ 81E2167
+	.string "RUSTBORO CITY POKéMON GYM\n"
+	.string "LEADER: ROXANNE\p"
+	.string "“The ROCK-loving honors student!”$"
+
+RustboroCity_Text_1E21B3: @ 81E21B3
+	.string "DEVON CORP. BRANCH OFFICE\p"
+	.string "“Access limited to DEVON employees\n"
+	.string "and authorized personnel.”$"
+
+RustboroCity_Text_1E220B: @ 81E220B
+	.string "RUSTBORO CITY\p"
+	.string "“The city probing the integration of\n"
+	.string "nature and science.”$"
+
+RustboroCity_Text_1E2253: @ 81E2253
+	.string "POKéMON TRAINER’S SCHOOL\p"
+	.string "“We’ll teach you anything about\n"
+	.string "POKéMON!”$"
+
+RustboroCity_Text_1E2296: @ 81E2296
+	.string "CUTTER’S HOUSE$"
+
+RustboroCity_Text_1E22A5: @ 81E22A5
+	.string "I’ve been developing an added feature\n"
+	.string "for the POKéNAV…\p"
+	.string "And it turned out great!\p"
+	.string "{PLAYER}, may I see that POKéNAV?\n"
+	.string "The one our PRESIDENT gave you?$"
+
+RustboroCity_Text_1E2331: @ 81E2331
+	.string "There you go, {PLAYER}!\p"
+	.string "I added a new feature named\n"
+	.string "MATCH CALL to your POKéNAV.\p"
+	.string "Using the MATCH CALL feature,\n"
+	.string "you can chat with people who have\l"
+	.string "been registered in your POKéNAV.\p"
+	.string "{PLAYER}, our PRESIDENT STONE should\n"
+	.string "be registered in your POKéNAV.\p"
+	.string "Test it out.\n"
+	.string "Please give our PRESIDENT a call.$"
+
+RustboroCity_Text_1E2449: @ 81E2449
+	.string "Please select the POKéNAV.$"
+
+RustboroCity_Text_1E2464: @ 81E2464
+	.string "Okay, I’d better get back to work.\n"
+	.string "Please take care, {PLAYER}!$"
+
+RustboroCity_Text_1E249D: @ 81E249D
+	.string "Did you know this?\p"
+	.string "You can have a 2-on-2 battle even\n"
+	.string "if you’re not with another TRAINER.\p"
+	.string "If you catch the eyes of two TRAINERS\n"
+	.string "when you have two or more POKéMON,\l"
+	.string "they’ll both challenge you.\p"
+	.string "Don’t you think it’d be cool if you\n"
+	.string "could beat two TRAINERS by yourself?$"
+
diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc
new file mode 100644
index 000000000..db9b6f56d
--- /dev/null
+++ b/data/maps/RustboroCity_CuttersHouse/events.inc
@@ -0,0 +1,11 @@
+RustboroCity_CuttersHouse_EventObjects: @ 8530A1C
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0
+
+RustboroCity_CuttersHouse_MapWarps: @ 8530A4C
+	warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY
+	warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY
+
+RustboroCity_CuttersHouse_MapEvents:: @ 8530A5C
+	map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc
index e7b936a19..5423772bf 100644
--- a/data/maps/RustboroCity_CuttersHouse/header.inc
+++ b/data/maps/RustboroCity_CuttersHouse/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_CuttersHouse: @ 8483478
-	.4byte RustboroCity_CuttersHouse_MapAttributes
+	.4byte RustboroCity_CuttersHouse_Layout
 	.4byte RustboroCity_CuttersHouse_MapEvents
 	.4byte RustboroCity_CuttersHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc
index e5c7527f7..e5c7527f7 100644
--- a/data/scripts/maps/RustboroCity_CuttersHouse.inc
+++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc
diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc
new file mode 100644
index 000000000..c6d4048c4
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc
@@ -0,0 +1,17 @@
+RustboroCity_DevonCorp_1F_EventObjects: @ 853037C
+	object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, 2, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, 2, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0
+
+RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4
+	warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY
+	warp_def 6, 8, 0, 6, MAP_RUSTBORO_CITY
+	warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F
+
+RustboroCity_DevonCorp_1F_MapBGEvents: @ 85303DC
+	bg_event 3, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211312
+	bg_event 8, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211309
+
+RustboroCity_DevonCorp_1F_MapEvents:: @ 85303F4
+	map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents
+
diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc
index 68b72454f..9e270b9fc 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_DevonCorp_1F: @ 8483344
-	.4byte RustboroCity_DevonCorp_1F_MapAttributes
+	.4byte RustboroCity_DevonCorp_1F_Layout
 	.4byte RustboroCity_DevonCorp_1F_MapEvents
 	.4byte RustboroCity_DevonCorp_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
index 97d7dcf78..97d7dcf78 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc
new file mode 100644
index 000000000..31a3d1de6
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc
@@ -0,0 +1,15 @@
+RustboroCity_DevonCorp_2F_EventObjects: @ 8530408
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0
+	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, 7, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0
+	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0
+	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0
+
+RustboroCity_DevonCorp_2F_MapWarps: @ 8530498
+	warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F
+	warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F
+
+RustboroCity_DevonCorp_2F_MapEvents:: @ 85304A8
+	map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc
index 5e4dc392b..f3954aed0 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_DevonCorp_2F: @ 8483360
-	.4byte RustboroCity_DevonCorp_2F_MapAttributes
+	.4byte RustboroCity_DevonCorp_2F_Layout
 	.4byte RustboroCity_DevonCorp_2F_MapEvents
 	.4byte RustboroCity_DevonCorp_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
index 88f0c2e73..88f0c2e73 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc
new file mode 100644
index 000000000..8db3c085c
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc
@@ -0,0 +1,15 @@
+RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, 76, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0
+
+RustboroCity_DevonCorp_3F_MapWarps: @ 8530504
+	warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F
+
+RustboroCity_DevonCorp_3F_MapBGEvents: @ 853050C
+	bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600
+	bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600
+
+RustboroCity_DevonCorp_3F_MapEvents:: @ 8530524
+	map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents
+
diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc
index 54ae910d3..c0bbdebd1 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_DevonCorp_3F: @ 848337C
-	.4byte RustboroCity_DevonCorp_3F_MapAttributes
+	.4byte RustboroCity_DevonCorp_3F_Layout
 	.4byte RustboroCity_DevonCorp_3F_MapEvents
 	.4byte RustboroCity_DevonCorp_3F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
index ffc2614cb..ffc2614cb 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc
new file mode 100644
index 000000000..1f2ae85fd
--- /dev/null
+++ b/data/maps/RustboroCity_Flat1_1F/events.inc
@@ -0,0 +1,12 @@
+RustboroCity_Flat1_1F_EventObjects: @ 8530890
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0
+
+RustboroCity_Flat1_1F_MapWarps: @ 85308C0
+	warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY
+	warp_def 7, 7, 0, 1, MAP_RUSTBORO_CITY
+	warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F
+
+RustboroCity_Flat1_1F_MapEvents:: @ 85308D8
+	map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc
index ede158338..4f424b853 100644
--- a/data/maps/RustboroCity_Flat1_1F/header.inc
+++ b/data/maps/RustboroCity_Flat1_1F/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_Flat1_1F: @ 8483424
-	.4byte RustboroCity_Flat1_1F_MapAttributes
+	.4byte RustboroCity_Flat1_1F_Layout
 	.4byte RustboroCity_Flat1_1F_MapEvents
 	.4byte RustboroCity_Flat1_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc
index 947ea14d3..947ea14d3 100644
--- a/data/scripts/maps/RustboroCity_Flat1_1F.inc
+++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc
diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc
new file mode 100644
index 000000000..647e7a437
--- /dev/null
+++ b/data/maps/RustboroCity_Flat1_2F/events.inc
@@ -0,0 +1,16 @@
+RustboroCity_Flat1_2F_EventObjects: @ 85308EC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 6, 3, 5, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 5, 3, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
+	object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 10, 5, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
+	object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 10, 6, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 8, 5, 3, 10, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0
+	object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
+	object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
+
+RustboroCity_Flat1_2F_MapWarps: @ 85309AC
+	warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F
+
+RustboroCity_Flat1_2F_MapEvents:: @ 85309B4
+	map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc
index c1a83cdbb..49e5c1481 100644
--- a/data/maps/RustboroCity_Flat1_2F/header.inc
+++ b/data/maps/RustboroCity_Flat1_2F/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_Flat1_2F: @ 8483440
-	.4byte RustboroCity_Flat1_2F_MapAttributes
+	.4byte RustboroCity_Flat1_2F_Layout
 	.4byte RustboroCity_Flat1_2F_MapEvents
 	.4byte RustboroCity_Flat1_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc
index 425d61f52..425d61f52 100644
--- a/data/scripts/maps/RustboroCity_Flat1_2F.inc
+++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc
diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc
new file mode 100644
index 000000000..392f5b1fa
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_1F/events.inc
@@ -0,0 +1,12 @@
+RustboroCity_Flat2_1F_EventObjects: @ 8530AC4
+	object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0
+
+RustboroCity_Flat2_1F_MapWarps: @ 8530AF4
+	warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY
+	warp_def 3, 8, 0, 10, MAP_RUSTBORO_CITY
+	warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F
+
+RustboroCity_Flat2_1F_MapEvents:: @ 8530B0C
+	map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc
index 14d40b97a..4080980a0 100644
--- a/data/maps/RustboroCity_Flat2_1F/header.inc
+++ b/data/maps/RustboroCity_Flat2_1F/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_Flat2_1F: @ 84834B0
-	.4byte RustboroCity_Flat2_1F_MapAttributes
+	.4byte RustboroCity_Flat2_1F_Layout
 	.4byte RustboroCity_Flat2_1F_MapEvents
 	.4byte RustboroCity_Flat2_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc
index fbb174a29..fbb174a29 100644
--- a/data/scripts/maps/RustboroCity_Flat2_1F.inc
+++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc
diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc
new file mode 100644
index 000000000..9914eed3c
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_2F/events.inc
@@ -0,0 +1,11 @@
+RustboroCity_Flat2_2F_EventObjects: @ 8530B20
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0
+
+RustboroCity_Flat2_2F_MapWarps: @ 8530B50
+	warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F
+	warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F
+
+RustboroCity_Flat2_2F_MapEvents:: @ 8530B60
+	map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc
index 989069c30..d4ad99dbc 100644
--- a/data/maps/RustboroCity_Flat2_2F/header.inc
+++ b/data/maps/RustboroCity_Flat2_2F/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_Flat2_2F: @ 84834CC
-	.4byte RustboroCity_Flat2_2F_MapAttributes
+	.4byte RustboroCity_Flat2_2F_Layout
 	.4byte RustboroCity_Flat2_2F_MapEvents
 	.4byte RustboroCity_Flat2_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc
index e623aa485..e623aa485 100644
--- a/data/scripts/maps/RustboroCity_Flat2_2F.inc
+++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc
diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc
new file mode 100644
index 000000000..4a67fdc47
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_3F/events.inc
@@ -0,0 +1,10 @@
+RustboroCity_Flat2_3F_EventObjects: @ 8530B74
+	object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0
+
+RustboroCity_Flat2_3F_MapWarps: @ 8530BA4
+	warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F
+
+RustboroCity_Flat2_3F_MapEvents:: @ 8530BAC
+	map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc
index d531fcf98..90918421f 100644
--- a/data/maps/RustboroCity_Flat2_3F/header.inc
+++ b/data/maps/RustboroCity_Flat2_3F/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_Flat2_3F: @ 84834E8
-	.4byte RustboroCity_Flat2_3F_MapAttributes
+	.4byte RustboroCity_Flat2_3F_Layout
 	.4byte RustboroCity_Flat2_3F_MapEvents
 	.4byte RustboroCity_Flat2_3F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc
index 6a267c336..6a267c336 100644
--- a/data/scripts/maps/RustboroCity_Flat2_3F.inc
+++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc
diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc
new file mode 100644
index 000000000..193c41685
--- /dev/null
+++ b/data/maps/RustboroCity_Gym/events.inc
@@ -0,0 +1,18 @@
+RustboroCity_Gym_EventObjects: @ 8530538
+	object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0
+	object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, 8, 1, 1, 1, 3, RustboroCity_Gym_EventScript_213011, 0
+
+RustboroCity_Gym_MapWarps: @ 85305B0
+	warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY
+	warp_def 6, 19, 0, 0, MAP_RUSTBORO_CITY
+
+RustboroCity_Gym_MapBGEvents: @ 85305C0
+	bg_event 2, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213047
+	bg_event 8, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213057
+
+RustboroCity_Gym_MapEvents:: @ 85305D8
+	map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents
+
diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc
index 4b49e1077..8aef6fe28 100644
--- a/data/maps/RustboroCity_Gym/header.inc
+++ b/data/maps/RustboroCity_Gym/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_Gym: @ 8483398
-	.4byte RustboroCity_Gym_MapAttributes
+	.4byte RustboroCity_Gym_Layout
 	.4byte RustboroCity_Gym_MapEvents
 	.4byte RustboroCity_Gym_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/scripts.inc
index 1d722b7de..1d722b7de 100644
--- a/data/scripts/maps/RustboroCity_Gym.inc
+++ b/data/maps/RustboroCity_Gym/scripts.inc
diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc
new file mode 100644
index 000000000..1d2b2d0b7
--- /dev/null
+++ b/data/maps/RustboroCity_House1/events.inc
@@ -0,0 +1,11 @@
+RustboroCity_House1_EventObjects: @ 85309C8
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0
+
+RustboroCity_House1_MapWarps: @ 85309F8
+	warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY
+	warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY
+
+RustboroCity_House1_MapEvents:: @ 8530A08
+	map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc
index 49445724b..c921d3a5e 100644
--- a/data/maps/RustboroCity_House1/header.inc
+++ b/data/maps/RustboroCity_House1/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_House1: @ 848345C
-	.4byte RustboroCity_House1_MapAttributes
+	.4byte RustboroCity_House1_Layout
 	.4byte RustboroCity_House1_MapEvents
 	.4byte RustboroCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/scripts.inc
index d63536c55..d63536c55 100644
--- a/data/scripts/maps/RustboroCity_House1.inc
+++ b/data/maps/RustboroCity_House1/scripts.inc
diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc
new file mode 100644
index 000000000..3a4e5e15e
--- /dev/null
+++ b/data/maps/RustboroCity_House2/events.inc
@@ -0,0 +1,11 @@
+RustboroCity_House2_EventObjects: @ 8530A70
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0
+
+RustboroCity_House2_MapWarps: @ 8530AA0
+	warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY
+	warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY
+
+RustboroCity_House2_MapEvents:: @ 8530AB0
+	map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc
index ec04d74d9..6f4d6c02d 100644
--- a/data/maps/RustboroCity_House2/header.inc
+++ b/data/maps/RustboroCity_House2/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_House2: @ 8483494
-	.4byte RustboroCity_House2_MapAttributes
+	.4byte RustboroCity_House_Layouts
 	.4byte RustboroCity_House2_MapEvents
 	.4byte RustboroCity_House2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/scripts.inc
index fd71dc016..fd71dc016 100644
--- a/data/scripts/maps/RustboroCity_House2.inc
+++ b/data/maps/RustboroCity_House2/scripts.inc
diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc
new file mode 100644
index 000000000..07234fc2e
--- /dev/null
+++ b/data/maps/RustboroCity_House3/events.inc
@@ -0,0 +1,12 @@
+RustboroCity_House3_EventObjects: @ 8530BC0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0
+	object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0
+
+RustboroCity_House3_MapWarps: @ 8530C08
+	warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY
+	warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY
+
+RustboroCity_House3_MapEvents:: @ 8530C18
+	map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc
index 9ffe65113..73b5d4a0b 100644
--- a/data/maps/RustboroCity_House3/header.inc
+++ b/data/maps/RustboroCity_House3/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_House3: @ 8483504
-	.4byte RustboroCity_House3_MapAttributes
+	.4byte RustboroCity_House_Layouts
 	.4byte RustboroCity_House3_MapEvents
 	.4byte RustboroCity_House3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/scripts.inc
index 87d278099..87d278099 100644
--- a/data/scripts/maps/RustboroCity_House3.inc
+++ b/data/maps/RustboroCity_House3/scripts.inc
diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc
new file mode 100644
index 000000000..038d13bf7
--- /dev/null
+++ b/data/maps/RustboroCity_Mart/events.inc
@@ -0,0 +1,13 @@
+RustboroCity_Mart_EventObjects: @ 853080C
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, 3, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0
+	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, 7, 1, 1, 0, 0, RustboroCity_Mart_EventScript_214F86, 0
+
+RustboroCity_Mart_MapWarps: @ 853086C
+	warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY
+	warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY
+
+RustboroCity_Mart_MapEvents:: @ 853087C
+	map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc
index be134394a..cb82a6500 100644
--- a/data/maps/RustboroCity_Mart/header.inc
+++ b/data/maps/RustboroCity_Mart/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_Mart: @ 8483408
-	.4byte RustboroCity_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte RustboroCity_Mart_MapEvents
 	.4byte RustboroCity_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/scripts.inc
index daa445a0e..daa445a0e 100644
--- a/data/scripts/maps/RustboroCity_Mart.inc
+++ b/data/maps/RustboroCity_Mart/scripts.inc
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..e2945f435
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,14 @@
+RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, 2, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0
+
+RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754
+	warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY
+	warp_def 6, 8, 3, 3, MAP_RUSTBORO_CITY
+	warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F
+
+RustboroCity_PokemonCenter_1F_MapEvents:: @ 853076C
+	map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
index fb88549f7..3db96f00d 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_PokemonCenter_1F: @ 84833D0
-	.4byte RustboroCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte RustboroCity_PokemonCenter_1F_MapEvents
 	.4byte RustboroCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
index a9156d5aa..a9156d5aa 100644
--- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..d1ec1adb9
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702
+
+RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0
+	warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+RustboroCity_PokemonCenter_2F_MapEvents:: @ 85307F8
+	map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
index 0acf68eaa..74f264702 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_PokemonCenter_2F: @ 84833EC
-	.4byte RustboroCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte RustboroCity_PokemonCenter_2F_MapEvents
 	.4byte RustboroCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
index a1bdeba5b..a1bdeba5b 100644
--- a/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc
new file mode 100644
index 000000000..2deabdb5c
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonSchool/events.inc
@@ -0,0 +1,23 @@
+RustboroCity_PokemonSchool_EventObjects: @ 85305EC
+	object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0
+	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0
+	object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, 8, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0
+	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, 7, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999
+
+RustboroCity_PokemonSchool_MapWarps: @ 8530694
+	warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY
+	warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY
+
+RustboroCity_PokemonSchool_MapBGEvents: @ 85306A4
+	bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9
+	bg_event 4, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9
+	bg_event 6, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9
+	bg_event 7, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9
+	bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F8C
+
+RustboroCity_PokemonSchool_MapEvents:: @ 85306E0
+	map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents
+
diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc
index a3d257cfb..3d68afc48 100644
--- a/data/maps/RustboroCity_PokemonSchool/header.inc
+++ b/data/maps/RustboroCity_PokemonSchool/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_PokemonSchool: @ 84833B4
-	.4byte RustboroCity_PokemonSchool_MapAttributes
+	.4byte RustboroCity_PokemonSchool_Layout
 	.4byte RustboroCity_PokemonSchool_MapEvents
 	.4byte RustboroCity_PokemonSchool_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc
index f5030facd..f5030facd 100644
--- a/data/scripts/maps/RustboroCity_PokemonSchool.inc
+++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc
diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc
new file mode 100644
index 000000000..e294e200e
--- /dev/null
+++ b/data/maps/RusturfTunnel/events.inc
@@ -0,0 +1,27 @@
+RusturfTunnel_EventObjects: @ 85341C4
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807
+	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, 879
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878
+	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, 8, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932
+	object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, 9, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0
+	object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, 9, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, 983
+
+RusturfTunnel_MapWarps: @ 85342B4
+	warp_def 4, 10, 3, 0, MAP_ROUTE116
+	warp_def 29, 16, 3, 4, MAP_VERDANTURF_TOWN
+	warp_def 18, 20, 3, 2, MAP_ROUTE116
+
+RusturfTunnel_MapCoordEvents: @ 85342CC
+	coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D071
+	coord_event 9, 4, 3, 0, VAR_0x409A, 2, 0, RusturfTunnel_EventScript_22D083
+	coord_event 9, 5, 3, 0, VAR_0x409A, 2, 0, RusturfTunnel_EventScript_22D083
+	coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D077
+	coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D07D
+
+RusturfTunnel_MapEvents:: @ 853431C
+	map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0
+
diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc
index 0ce8c9e12..d4f1fdad5 100644
--- a/data/maps/RusturfTunnel/header.inc
+++ b/data/maps/RusturfTunnel/header.inc
@@ -1,5 +1,5 @@
 RusturfTunnel: @ 8483F30
-	.4byte RusturfTunnel_MapAttributes
+	.4byte RusturfTunnel_Layout
 	.4byte RusturfTunnel_MapEvents
 	.4byte RusturfTunnel_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/maps/RusturfTunnel/scripts.inc
index 5e42be78d..5e42be78d 100644
--- a/data/scripts/maps/RusturfTunnel.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc
new file mode 100644
index 000000000..8f0b1de77
--- /dev/null
+++ b/data/maps/SSTidalCorridor/events.inc
@@ -0,0 +1,35 @@
+SSTidalCorridor_EventObjects: @ 853A158
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, 3, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, 8, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950
+	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, 1, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950
+	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810
+
+SSTidalCorridor_MapWarps: @ 853A1D0
+	warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS
+	warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS
+	warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS
+	warp_def 13, 9, 3, 6, MAP_SS_TIDAL_ROOMS
+	warp_def 4, 3, 3, 8, MAP_SS_TIDAL_ROOMS
+	warp_def 7, 3, 3, 9, MAP_SS_TIDAL_ROOMS
+	warp_def 10, 3, 3, 10, MAP_SS_TIDAL_ROOMS
+	warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS
+	warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK
+
+SSTidalCorridor_MapBGEvents: @ 853A218
+	bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+	bg_event 4, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+	bg_event 6, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+	bg_event 8, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+	bg_event 10, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+	bg_event 12, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+	bg_event 14, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+	bg_event 16, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+	bg_event 5, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C0F5
+	bg_event 8, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C0FE
+	bg_event 11, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C107
+	bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C110
+
+SSTidalCorridor_MapEvents:: @ 853A2A8
+	map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents
+
diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc
index 606d682ba..046eedc85 100644
--- a/data/maps/SSTidalCorridor/header.inc
+++ b/data/maps/SSTidalCorridor/header.inc
@@ -1,5 +1,5 @@
 SSTidalCorridor: @ 8484F0C
-	.4byte SSTidalCorridor_MapAttributes
+	.4byte SSTidalCorridor_Layout
 	.4byte SSTidalCorridor_MapEvents
 	.4byte SSTidalCorridor_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
new file mode 100644
index 000000000..2e1b4cfa4
--- /dev/null
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -0,0 +1,356 @@
+SSTidalCorridor_MapScripts:: @ 823BFCF
+	map_script 2, SSTidalCorridor_MapScript2_23BFD5
+	.byte 0
+
+SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5
+	map_script_2 VAR_0x40D4, 0, SSTidalCorridor_EventScript_23C219
+	map_script_2 VAR_PORTHOLE, 1, SSTidalCorridor_EventScript_23BFFF
+	map_script_2 VAR_PORTHOLE, 5, SSTidalCorridor_EventScript_23C015
+	map_script_2 VAR_PORTHOLE, 9, SSTidalCorridor_EventScript_23C067
+	map_script_2 VAR_PORTHOLE, 10, SSTidalCorridor_EventScript_23C07D
+	.2byte 0
+
+SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF
+	special SetSSTidalFlag
+	setvar VAR_PORTHOLE, 2
+	lockall
+	playse SE_PINPON
+	msgbox SSTidalCorridor_Text_23C462, 4
+	releaseall
+	end
+
+SSTidalCorridor_EventScript_23C015:: @ 823C015
+	setvar VAR_PORTHOLE, 6
+	lockall
+	playse SE_PINPON
+	msgbox SSTidalCorridor_Text_23C4E3, 4
+	releaseall
+	end
+
+SSTidalRooms_EventScript_23C028:: @ 823C028
+	special SetSSTidalFlag
+	setvar VAR_PORTHOLE, 7
+	playse SE_PINPON
+	msgbox SSTidalRooms_Text_23C462, 4
+	return
+
+SSTidalRooms_EventScript_23C03C:: @ 823C03C
+	special ResetSSTidalFlag
+	setvar VAR_PORTHOLE, 4
+	playse SE_PINPON
+	msgbox SSTidalRooms_Text_23C553, 4
+	return
+
+SSTidalCorridor_EventScript_23C050:: @ 823C050
+	compare VAR_PORTHOLE, 2
+	goto_eq SSTidalCorridor_EventScript_23C067
+	compare VAR_PORTHOLE, 7
+	goto_eq SSTidalCorridor_EventScript_23C07D
+	end
+
+SSTidalCorridor_EventScript_23C067:: @ 823C067
+	special ResetSSTidalFlag
+	setvar VAR_PORTHOLE, 3
+	lockall
+	playse SE_PINPON
+	msgbox SSTidalCorridor_Text_23C4E3, 4
+	releaseall
+	end
+
+SSTidalCorridor_EventScript_23C07D:: @ 823C07D
+	special ResetSSTidalFlag
+	setvar VAR_PORTHOLE, 8
+	lockall
+	playse SE_PINPON
+	msgbox SSTidalCorridor_Text_23C50F, 4
+	releaseall
+	end
+
+SSTidalRooms_EventScript_23C093:: @ 823C093
+	special ResetSSTidalFlag
+	setvar VAR_PORTHOLE, 8
+	playse SE_PINPON
+	msgbox SSTidalRooms_Text_23C50F, 4
+	return
+
+SSTidalRooms_EventScript_23C0A7:: @ 823C0A7
+	switch VAR_PORTHOLE
+	case 2, SSTidalRooms_EventScript_23C03C
+	case 3, SSTidalRooms_EventScript_23C03C
+	case 6, SSTidalRooms_EventScript_23C028
+	case 7, SSTidalRooms_EventScript_23C093
+	return
+
+SSTidalCorridor_EventScript_23C0D9:: @ 823C0D9
+	msgbox SSTidalCorridor_Text_23C6EC, 2
+	end
+
+SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_WINGULL, 0
+	msgbox SSTidalCorridor_Text_23C7E1, 4
+	waitmoncry
+	release
+	end
+
+SSTidalCorridor_EventScript_23C0F5:: @ 823C0F5
+	msgbox SSTidalCorridor_Text_23C7F8, 3
+	end
+
+SSTidalCorridor_EventScript_23C0FE:: @ 823C0FE
+	msgbox SSTidalCorridor_Text_23C800, 3
+	end
+
+SSTidalCorridor_EventScript_23C107:: @ 823C107
+	msgbox SSTidalCorridor_Text_23C808, 3
+	end
+
+SSTidalCorridor_EventScript_23C110:: @ 823C110
+	msgbox SSTidalCorridor_Text_23C810, 3
+	end
+
+SSTidalCorridor_EventScript_23C119:: @ 823C119
+	lock
+	faceplayer
+	compare VAR_PORTHOLE, 4
+	goto_eq SSTidalCorridor_EventScript_23C13B
+	compare VAR_PORTHOLE, 8
+	goto_eq SSTidalCorridor_EventScript_23C15A
+	msgbox SSTidalCorridor_Text_23C596, 4
+	release
+	end
+
+SSTidalCorridor_EventScript_23C13B:: @ 823C13B
+	setrespawn 8
+	msgbox SSTidalCorridor_Text_23C64F, 4
+	checkflag FLAG_0x104
+	call_if 1, SSTidalCorridor_EventScript_23C179
+	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
+	waitstate
+	release
+	end
+
+SSTidalCorridor_EventScript_23C15A:: @ 823C15A
+	setrespawn 4
+	msgbox SSTidalCorridor_Text_23C64F, 4
+	checkflag FLAG_0x104
+	call_if 1, SSTidalCorridor_EventScript_23C179
+	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
+	waitstate
+	release
+	end
+
+SSTidalCorridor_EventScript_23C179:: @ 823C179
+	setflag FLAG_0x3B7
+	return
+
+SSTidalCorridor_EventScript_23C17D:: @ 823C17D
+	lockall
+	compare VAR_PORTHOLE, 2
+	goto_eq SSTidalCorridor_EventScript_23C19E
+	compare VAR_PORTHOLE, 7
+	goto_eq SSTidalCorridor_EventScript_23C19E
+	msgbox SSTidalCorridor_Text_23C6C3, 4
+	releaseall
+	end
+
+SSTidalCorridor_EventScript_23C19E:: @ 823C19E
+	special sub_80FB7A4
+	waitstate
+	end
+
+SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3
+	lock
+	faceplayer
+	checkflag FLAG_0x0F7
+	goto_eq SSTidalCorridor_EventScript_23C1BD
+	call SSTidalCorridor_EventScript_23C1C7
+	msgbox SSTidalCorridor_Text_23C65E, 4
+	release
+	end
+
+SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD
+	msgbox SSTidalCorridor_Text_23C6B0, 4
+	release
+	end
+
+SSTidalCorridor_EventScript_23C1C7:: @ 823C1C7
+	checktrainerflag TRAINER_PHILLIP
+	goto_if 0, SSTidalCorridor_EventScript_23C218
+	checktrainerflag TRAINER_LEONARD
+	goto_if 0, SSTidalCorridor_EventScript_23C218
+	checktrainerflag TRAINER_COLTON
+	goto_if 0, SSTidalCorridor_EventScript_23C218
+	checktrainerflag TRAINER_MICAH
+	goto_if 0, SSTidalCorridor_EventScript_23C218
+	checktrainerflag TRAINER_THOMAS
+	goto_if 0, SSTidalCorridor_EventScript_23C218
+	checktrainerflag TRAINER_LEA_AND_JED
+	goto_if 0, SSTidalCorridor_EventScript_23C218
+	checktrainerflag TRAINER_GARRET
+	goto_if 0, SSTidalCorridor_EventScript_23C218
+	checktrainerflag TRAINER_NAOMI
+	goto_if 0, SSTidalCorridor_EventScript_23C218
+	setflag FLAG_0x0F7
+	goto SSTidalCorridor_EventScript_23C1BD
+	return
+
+SSTidalCorridor_EventScript_23C218:: @ 823C218
+	return
+
+SSTidalCorridor_EventScript_23C219:: @ 823C219
+	lockall
+	applymovement 5, SSTidalCorridor_Movement_23C26D
+	waitmovement 0
+	applymovement 255, SSTidalCorridor_Movement_2725A8
+	waitmovement 0
+	msgbox SSTidalCorridor_Text_23C28F, 4
+	closemessage
+	applymovement 255, SSTidalCorridor_Movement_23C27D
+	applymovement 1, SSTidalCorridor_Movement_23C284
+	applymovement 5, SSTidalCorridor_Movement_23C275
+	waitmovement 0
+	playse SE_KAIDAN
+	waitse
+	removeobject 5
+	applymovement 1, SSTidalCorridor_Movement_23C28B
+	waitmovement 0
+	delay 30
+	setflag FLAG_0x1D0
+	setvar VAR_0x40D4, 1
+	releaseall
+	end
+
+SSTidalCorridor_Movement_23C26D: @ 823C26D
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+SSTidalCorridor_Movement_23C275: @ 823C275
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_left
+	step_end
+
+SSTidalCorridor_Movement_23C27D: @ 823C27D
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_down
+	step_end
+
+SSTidalCorridor_Movement_23C284: @ 823C284
+	delay_16
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_fastest_left
+	step_end
+
+SSTidalCorridor_Movement_23C28B: @ 823C28B
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	step_end
+
+SSTidalCorridor_Text_23C28F: @ 823C28F
+	.string "SCOTT: Well, hi, hi!\n"
+	.string "{PLAYER}{KUN}, {PLAYER}{KUN}!\p"
+	.string "Something’s come up, so I have to\n"
+	.string "disembark, but am I glad to see you!\p"
+	.string "Congratulations, LEAGUE CHAMPION!\p"
+	.string "There’s a place I’d like to invite\n"
+	.string "someone like you.\p"
+	.string "It’s the…\n"
+	.string "BATTLE FRONTIER!\p"
+	.string "What’s the place like?\n"
+	.string "You’ll understand when you see it!\p"
+	.string "I’ve spoken with the ship’s CAPTAIN\n"
+	.string "about this.\p"
+	.string "The next time you take a ferry,\n"
+	.string "you should be able to sail to\l"
+	.string "the BATTLE FRONTIER.\p"
+	.string "Okay, {PLAYER}{KUN}, I’ll be waiting for you\n"
+	.string "at the BATTLE FRONTIER!$"
+
+SSTidalCorridor_Text_23C462: @ 823C462
+SSTidalRooms_Text_23C462: @ 823C462
+	.string "This ferry is built to plow through\n"
+	.string "fast-running currents.\p"
+	.string "We hope you enjoy your voyage with us.\n"
+	.string "Feel free to explore the ship.$"
+
+SSTidalCorridor_Text_23C4E3: @ 823C4E3
+	.string "We hope you enjoy your voyage on\n"
+	.string "our ferry.$"
+
+SSTidalCorridor_Text_23C50F: @ 823C50F
+SSTidalRooms_Text_23C50F: @ 823C50F
+	.string "We have made land in SLATEPORT CITY.\n"
+	.string "Thank you for sailing with us.$"
+
+SSTidalRooms_Text_23C553: @ 823C553
+	.string "We have made land in LILYCOVE CITY.\n"
+	.string "Thank you for sailing with us.$"
+
+SSTidalCorridor_Text_23C596: @ 823C596
+	.string "It’ll be some time before we make land,\n"
+	.string "I reckon.\p"
+	.string "You can rest up in your cabin if you’d\n"
+	.string "like. Your cabin’s No. 2.\p"
+	.string "The bed in there is soft and plushy.\n"
+	.string "I can attest to how comfy it is!$"
+
+SSTidalCorridor_Text_23C64F: @ 823C64F
+	.string "We’ve arrived!$"
+
+SSTidalCorridor_Text_23C65E: @ 823C65E
+	.string "Go visit other cabins.\n"
+	.string "TRAINERS bored of the boat trip will\l"
+	.string "be itching to battle.$"
+
+SSTidalCorridor_Text_23C6B0: @ 823C6B0
+	.string "Enjoy your cruise!$"
+
+SSTidalCorridor_Text_23C6C3: @ 823C6C3
+	.string "The horizon spreads beyond\n"
+	.string "the porthole.$"
+
+SSTidalCorridor_Text_23C6EC: @ 823C6EC
+	.string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p"
+	.string "They made me honorary captain of\n"
+	.string "the S.S. TIDAL!\p"
+	.string "You can call me CAPTAIN BRINEY now!\p"
+	.string "You know, I retired once before,\n"
+	.string "but when I saw this majestic ship…\p"
+	.string "Let me just say, it stirred my sleeping\n"
+	.string "soul as a sailor!$"
+
+SSTidalCorridor_Text_23C7E1: @ 823C7E1
+	.string "PEEKO: Pihyo pihyohyo…$"
+
+SSTidalCorridor_Text_23C7F8: @ 823C7F8
+	.string "Cabin 1$"
+
+SSTidalCorridor_Text_23C800: @ 823C800
+	.string "Cabin 2$"
+
+SSTidalCorridor_Text_23C808: @ 823C808
+	.string "Cabin 3$"
+
+SSTidalCorridor_Text_23C810: @ 823C810
+	.string "Cabin 4$"
diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc
new file mode 100644
index 000000000..969830d37
--- /dev/null
+++ b/data/maps/SSTidalLowerDeck/events.inc
@@ -0,0 +1,13 @@
+SSTidalLowerDeck_EventObjects: @ 853A2BC
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, 46, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, 50, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0
+
+SSTidalLowerDeck_MapWarps: @ 853A2EC
+	warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR
+
+SSTidalLowerDeck_MapBGEvents: @ 853A2F4
+	bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0
+
+SSTidalLowerDeck_MapEvents:: @ 853A300
+	map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
+
diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc
index c1f883c84..3e2f5bacb 100644
--- a/data/maps/SSTidalLowerDeck/header.inc
+++ b/data/maps/SSTidalLowerDeck/header.inc
@@ -1,5 +1,5 @@
 SSTidalLowerDeck: @ 8484F28
-	.4byte SSTidalLowerDeck_MapAttributes
+	.4byte SSTidalLowerDeck_Layout
 	.4byte SSTidalLowerDeck_MapEvents
 	.4byte SSTidalLowerDeck_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/scripts.inc
index 2ad1ed580..2ad1ed580 100644
--- a/data/scripts/maps/SSTidalLowerDeck.inc
+++ b/data/maps/SSTidalLowerDeck/scripts.inc
diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc
new file mode 100644
index 000000000..a9900294c
--- /dev/null
+++ b/data/maps/SSTidalRooms/events.inc
@@ -0,0 +1,31 @@
+SSTidalRooms_EventObjects: @ 853A314
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 5, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, 8, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, 7, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, 951
+
+SSTidalRooms_MapWarps: @ 853A3D4
+	warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR
+	warp_def 5, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR
+	warp_def 13, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR
+	warp_def 14, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR
+	warp_def 22, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR
+	warp_def 23, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR
+	warp_def 31, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR
+	warp_def 32, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR
+	warp_def 4, 1, 0, 4, MAP_SS_TIDAL_CORRIDOR
+	warp_def 13, 1, 0, 5, MAP_SS_TIDAL_CORRIDOR
+	warp_def 22, 1, 0, 6, MAP_SS_TIDAL_CORRIDOR
+	warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR
+
+SSTidalRooms_MapBGEvents: @ 853A434
+	bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_23CA33
+	bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_23CA33
+
+SSTidalRooms_MapEvents:: @ 853A44C
+	map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents
+
diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc
index 09bfb8652..c5f0aaa00 100644
--- a/data/maps/SSTidalRooms/header.inc
+++ b/data/maps/SSTidalRooms/header.inc
@@ -1,5 +1,5 @@
 SSTidalRooms: @ 8484F44
-	.4byte SSTidalRooms_MapAttributes
+	.4byte SSTidalRooms_Layout
 	.4byte SSTidalRooms_MapEvents
 	.4byte SSTidalRooms_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/maps/SSTidalRooms/scripts.inc
index 39c453e98..39c453e98 100644
--- a/data/scripts/maps/SSTidalRooms.inc
+++ b/data/maps/SSTidalRooms/scripts.inc
diff --git a/data/maps/SafariZone_North/connections.inc b/data/maps/SafariZone_North/connections.inc
index c2052ea07..d99826f0d 100644
--- a/data/maps/SafariZone_North/connections.inc
+++ b/data/maps/SafariZone_North/connections.inc
@@ -1,7 +1,7 @@
 SafariZone_North_MapConnectionsList: @ 8486E18
-	connection left, 0, SAFARI_ZONE_NORTHWEST, 0
-	connection down, 0, SAFARI_ZONE_SOUTH, 0
-	connection right, 0, SAFARI_ZONE_NORTHEAST, 0
+	connection left, 0, MAP_SAFARI_ZONE_NORTHWEST
+	connection down, 0, MAP_SAFARI_ZONE_SOUTH
+	connection right, 0, MAP_SAFARI_ZONE_NORTHEAST
 
 SafariZone_North_MapConnections: @ 8486E3C
 	.4byte 0x3
diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc
new file mode 100644
index 000000000..88b41669b
--- /dev/null
+++ b/data/maps/SafariZone_North/events.inc
@@ -0,0 +1,14 @@
+SafariZone_North_EventObjects: @ 853B160
+	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, 2, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, 2, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 17
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 18
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 19
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 20
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 21
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 22
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, 1119
+
+SafariZone_North_MapEvents:: @ 853B238
+	map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc
index ce05b1eea..d7ad06ffa 100644
--- a/data/maps/SafariZone_North/header.inc
+++ b/data/maps/SafariZone_North/header.inc
@@ -1,5 +1,5 @@
 SafariZone_North: @ 8485158
-	.4byte SafariZone_North_MapAttributes
+	.4byte SafariZone_North_Layout
 	.4byte SafariZone_North_MapEvents
 	.4byte SafariZone_North_MapScripts
 	.4byte SafariZone_North_MapConnections
diff --git a/data/scripts/maps/SafariZone_North.inc b/data/maps/SafariZone_North/scripts.inc
index a96b6b95d..a96b6b95d 100644
--- a/data/scripts/maps/SafariZone_North.inc
+++ b/data/maps/SafariZone_North/scripts.inc
diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc
index c23dd3e4c..c762c485a 100644
--- a/data/maps/SafariZone_Northeast/connections.inc
+++ b/data/maps/SafariZone_Northeast/connections.inc
@@ -1,6 +1,6 @@
 SafariZone_Northeast_MapConnectionsList: @ 8486E90
-	connection left, 0, SAFARI_ZONE_NORTH, 0
-	connection down, 0, SAFARI_ZONE_SOUTHEAST, 0
+	connection left, 0, MAP_SAFARI_ZONE_NORTH
+	connection down, 0, MAP_SAFARI_ZONE_SOUTHEAST
 
 SafariZone_Northeast_MapConnections: @ 8486EA8
 	.4byte 0x2
diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc
new file mode 100644
index 000000000..e71ba4dd5
--- /dev/null
+++ b/data/maps/SafariZone_Northeast/events.inc
@@ -0,0 +1,18 @@
+SafariZone_Northeast_EventObjects: @ 853B968
+	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21
+	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 35, 0, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169
+
+SafariZone_Northeast_MapBGEvents: @ 853BA40
+	bg_event 31, 35, 3, 7, 0, ITEM_RARE_CANDY, 106, 0
+	bg_event 21, 5, 3, 7, 0, ITEM_ZINC, 107, 0
+
+SafariZone_Northeast_MapEvents:: @ 853BA58
+	map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents
+
diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc
index e5efff7b6..58685eafe 100644
--- a/data/maps/SafariZone_Northeast/header.inc
+++ b/data/maps/SafariZone_Northeast/header.inc
@@ -1,5 +1,5 @@
 SafariZone_Northeast: @ 848528C
-	.4byte SafariZone_Northeast_MapAttributes
+	.4byte SafariZone_Northeast_Layout
 	.4byte SafariZone_Northeast_MapEvents
 	.4byte SafariZone_Northeast_MapScripts
 	.4byte SafariZone_Northeast_MapConnections
diff --git a/data/scripts/maps/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/scripts.inc
index 207e2a584..207e2a584 100644
--- a/data/scripts/maps/SafariZone_Northeast.inc
+++ b/data/maps/SafariZone_Northeast/scripts.inc
diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc
index 9a466f082..010a13cc2 100644
--- a/data/maps/SafariZone_Northwest/connections.inc
+++ b/data/maps/SafariZone_Northwest/connections.inc
@@ -1,6 +1,6 @@
 SafariZone_Northwest_MapConnectionsList: @ 8486DF8
-	connection right, 0, SAFARI_ZONE_NORTH, 0
-	connection down, 0, SAFARI_ZONE_SOUTHWEST, 0
+	connection right, 0, MAP_SAFARI_ZONE_NORTH
+	connection down, 0, MAP_SAFARI_ZONE_SOUTHWEST
 
 SafariZone_Northwest_MapConnections: @ 8486E10
 	.4byte 0x2
diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc
new file mode 100644
index 000000000..8e5b242b9
--- /dev/null
+++ b/data/maps/SafariZone_Northwest/events.inc
@@ -0,0 +1,7 @@
+SafariZone_Northwest_EventObjects: @ 853B11C
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, 1, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094
+
+SafariZone_Northwest_MapEvents:: @ 853B14C
+	map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc
index 810826106..81718dc65 100644
--- a/data/maps/SafariZone_Northwest/header.inc
+++ b/data/maps/SafariZone_Northwest/header.inc
@@ -1,5 +1,5 @@
 SafariZone_Northwest: @ 848513C
-	.4byte SafariZone_Northwest_MapAttributes
+	.4byte SafariZone_Northwest_Layout
 	.4byte SafariZone_Northwest_MapEvents
 	.4byte SafariZone_Northwest_MapScripts
 	.4byte SafariZone_Northwest_MapConnections
diff --git a/data/scripts/maps/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/scripts.inc
index 34e510237..34e510237 100644
--- a/data/scripts/maps/SafariZone_Northwest.inc
+++ b/data/maps/SafariZone_Northwest/scripts.inc
diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc
new file mode 100644
index 000000000..0607ffcc7
--- /dev/null
+++ b/data/maps/SafariZone_RestHouse/events.inc
@@ -0,0 +1,12 @@
+SafariZone_RestHouse_EventObjects: @ 853B8FC
+	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0
+	object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, 9, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0
+
+SafariZone_RestHouse_MapWarps: @ 853B944
+	warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST
+	warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST
+
+SafariZone_RestHouse_MapEvents:: @ 853B954
+	map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc
index 591de9fc1..92488b12d 100644
--- a/data/maps/SafariZone_RestHouse/header.inc
+++ b/data/maps/SafariZone_RestHouse/header.inc
@@ -1,5 +1,5 @@
 SafariZone_RestHouse: @ 8485270
-	.4byte SafariZone_RestHouse_MapAttributes
+	.4byte SafariZone_RestHouse_Layout
 	.4byte SafariZone_RestHouse_MapEvents
 	.4byte SafariZone_RestHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/scripts.inc
index 22657eeb1..22657eeb1 100644
--- a/data/scripts/maps/SafariZone_RestHouse.inc
+++ b/data/maps/SafariZone_RestHouse/scripts.inc
diff --git a/data/maps/SafariZone_South/connections.inc b/data/maps/SafariZone_South/connections.inc
index 79ba1a010..856bb30ab 100644
--- a/data/maps/SafariZone_South/connections.inc
+++ b/data/maps/SafariZone_South/connections.inc
@@ -1,7 +1,7 @@
 SafariZone_South_MapConnectionsList: @ 8486E64
-	connection up, 0, SAFARI_ZONE_NORTH, 0
-	connection left, 0, SAFARI_ZONE_SOUTHWEST, 0
-	connection right, 0, SAFARI_ZONE_SOUTHEAST, 0
+	connection up, 0, MAP_SAFARI_ZONE_NORTH
+	connection left, 0, MAP_SAFARI_ZONE_SOUTHWEST
+	connection right, 0, MAP_SAFARI_ZONE_SOUTHEAST
 
 SafariZone_South_MapConnections: @ 8486E88
 	.4byte 0x3
diff --git a/data/maps/SafariZone_South/events.inc b/data/maps/SafariZone_South/events.inc
new file mode 100644
index 000000000..46173d11a
--- /dev/null
+++ b/data/maps/SafariZone_South/events.inc
@@ -0,0 +1,14 @@
+SafariZone_South_EventObjects: @ 853B2A4
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, 2, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, 2, 1, 1, 0, 0, SafariZone_South_EventScript_23D2DC, 0
+	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, 9, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, 717
+	object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, 9, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, 717
+
+SafariZone_South_MapWarps: @ 853B334
+	warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
+
+SafariZone_South_MapEvents:: @ 853B33C
+	map_events SafariZone_South_EventObjects, SafariZone_South_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc
index 58239408f..3ffd068c2 100644
--- a/data/maps/SafariZone_South/header.inc
+++ b/data/maps/SafariZone_South/header.inc
@@ -1,5 +1,5 @@
 SafariZone_South: @ 8485190
-	.4byte SafariZone_South_MapAttributes
+	.4byte SafariZone_South_Layout
 	.4byte SafariZone_South_MapEvents
 	.4byte SafariZone_South_MapScripts
 	.4byte SafariZone_South_MapConnections
diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc
new file mode 100644
index 000000000..19f51b873
--- /dev/null
+++ b/data/maps/SafariZone_South/scripts.inc
@@ -0,0 +1,154 @@
+SafariZone_South_MapScripts:: @ 823D279
+	map_script 3, SafariZone_South_MapScript1_23D2B1
+	map_script 2, SafariZone_South_MapScript2_23D284
+	.byte 0
+
+SafariZone_South_MapScript2_23D284: @ 823D284
+	map_script_2 VAR_0x40A4, 2, SafariZone_South_EventScript_23D28E
+	.2byte 0
+
+SafariZone_South_EventScript_23D28E:: @ 823D28E
+	lockall
+	applymovement 255, SafariZone_South_Movement_23D2C5
+	waitmovement 0
+	applymovement 1, SafariZone_South_Movement_23D2C7
+	waitmovement 0
+	setobjectxyperm 1, 32, 34
+	setvar VAR_0x40A4, 0
+	releaseall
+	end
+
+SafariZone_South_MapScript1_23D2B1: @ 823D2B1
+	compare VAR_0x40A4, 2
+	call_if 1, SafariZone_South_EventScript_23D2BD
+	end
+
+SafariZone_South_EventScript_23D2BD:: @ 823D2BD
+	setobjectxyperm 1, 31, 34
+	return
+
+SafariZone_South_Movement_23D2C5: @ 823D2C5
+	walk_down
+	step_end
+
+SafariZone_South_Movement_23D2C7: @ 823D2C7
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+SafariZone_South_EventScript_23D2CA:: @ 823D2CA
+	msgbox SafariZone_South_Text_2A52EF, 2
+	end
+
+SafariZone_South_EventScript_23D2D3:: @ 823D2D3
+	msgbox SafariZone_South_Text_2A533B, 2
+	end
+
+SafariZone_South_EventScript_23D2DC:: @ 823D2DC
+	msgbox SafariZone_South_Text_2A553E, 2
+	end
+
+SafariZone_South_EventScript_23D2E5:: @ 823D2E5
+	lock
+	faceplayer
+	checkflag FLAG_0x05D
+	goto_if 0, SafariZone_South_EventScript_23D30D
+	msgbox SafariZone_South_Text_2A51D4, 5
+	compare VAR_RESULT, 1
+	goto_eq SafariZone_South_EventScript_23D31A
+	msgbox SafariZone_South_Text_2A521A, 4
+	release
+	end
+
+SafariZone_South_EventScript_23D30D:: @ 823D30D
+	setflag FLAG_0x05D
+	msgbox SafariZone_South_Text_2A52AB, 4
+	release
+	end
+
+SafariZone_South_EventScript_23D31A:: @ 823D31A
+	msgbox SafariZone_South_Text_2A5248, 4
+	closemessage
+	switch VAR_FACING
+	case 2, SafariZone_South_EventScript_23D33F
+	case 4, SafariZone_South_EventScript_23D359
+	end
+
+SafariZone_South_EventScript_23D33F:: @ 823D33F
+	applymovement 1, SafariZone_South_Movement_23D38A
+	waitmovement 0
+	applymovement 255, SafariZone_South_Movement_23D385
+	waitmovement 0
+	goto SafariZone_South_EventScript_23D373
+	end
+
+SafariZone_South_EventScript_23D359:: @ 823D359
+	applymovement 1, SafariZone_South_Movement_23D38D
+	waitmovement 0
+	applymovement 255, SafariZone_South_Movement_23D387
+	waitmovement 0
+	goto SafariZone_South_EventScript_23D373
+	end
+
+SafariZone_South_EventScript_23D373:: @ 823D373
+	setvar VAR_0x40A4, 1
+	special ExitSafariMode
+	warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
+	waitstate
+	end
+
+SafariZone_South_Movement_23D385: @ 823D385
+	walk_up
+	step_end
+
+SafariZone_South_Movement_23D387: @ 823D387
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+SafariZone_South_Movement_23D38A: @ 823D38A
+	walk_left
+	walk_in_place_fastest_right
+	step_end
+
+SafariZone_South_Movement_23D38D: @ 823D38D
+	walk_down
+	walk_in_place_fastest_up
+	step_end
+
+SafariZone_South_EventScript_23D390:: @ 823D390
+	msgbox SafariZone_South_Text_2A57EE, 2
+	end
+
+SafariZone_Southeast_EventScript_23D399:: @ 823D399
+	msgbox SafariZone_Southeast_Text_2A582D, 2
+	end
+
+SafariZone_South_EventScript_23D3A2:: @ 823D3A2
+	msgbox SafariZone_South_Text_2A5887, 2
+	end
+
+SafariZone_Southeast_EventScript_23D3AB:: @ 823D3AB
+	msgbox SafariZone_Southeast_Text_2A58C6, 2
+	end
+
+SafariZone_Southeast_EventScript_23D3B4:: @ 823D3B4
+	msgbox SafariZone_Southeast_Text_2A58FD, 2
+	end
+
+SafariZone_Southeast_EventScript_23D3BD:: @ 823D3BD
+	msgbox SafariZone_Southeast_Text_2A5960, 2
+	end
+
+SafariZone_Northeast_EventScript_23D3C6:: @ 823D3C6
+	msgbox SafariZone_Northeast_Text_2A59A4, 2
+	end
+
+SafariZone_Northeast_EventScript_23D3CF:: @ 823D3CF
+	msgbox SafariZone_Northeast_Text_2A5A09, 2
+	end
+
+SafariZone_Northeast_EventScript_23D3D8:: @ 823D3D8
+	msgbox SafariZone_Northeast_Text_2A5A44, 2
+	end
+
diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc
index 4855182e9..16b39e87b 100644
--- a/data/maps/SafariZone_Southeast/connections.inc
+++ b/data/maps/SafariZone_Southeast/connections.inc
@@ -1,6 +1,6 @@
 SafariZone_Southeast_MapConnectionsList: @ 8486EB0
-	connection left, 0, SAFARI_ZONE_SOUTH, 0
-	connection up, 0, SAFARI_ZONE_NORTHEAST, 0
+	connection left, 0, MAP_SAFARI_ZONE_SOUTH
+	connection up, 0, MAP_SAFARI_ZONE_NORTHEAST
 
 SafariZone_Southeast_MapConnections: @ 8486EC8
 	.4byte 0x2
diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc
new file mode 100644
index 000000000..af2da0575
--- /dev/null
+++ b/data/maps/SafariZone_Southeast/events.inc
@@ -0,0 +1,14 @@
+SafariZone_Southeast_EventObjects: @ 853BA6C
+	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 7, 7, 3, 1, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 8, 26, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, 1, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170
+	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, 9, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, 747
+
+SafariZone_Southeast_MapBGEvents: @ 853BAE4
+	bg_event 19, 36, 3, 7, 0, ITEM_PP_UP, 108, 0
+	bg_event 32, 33, 0, 7, 0, ITEM_FULL_RESTORE, 105, 0
+
+SafariZone_Southeast_MapEvents:: @ 853BAFC
+	map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents
+
diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc
index 56e8aa094..438d3ea7f 100644
--- a/data/maps/SafariZone_Southeast/header.inc
+++ b/data/maps/SafariZone_Southeast/header.inc
@@ -1,5 +1,5 @@
 SafariZone_Southeast: @ 84852A8
-	.4byte SafariZone_Southeast_MapAttributes
+	.4byte SafariZone_Southeast_Layout
 	.4byte SafariZone_Southeast_MapEvents
 	.4byte SafariZone_Southeast_MapScripts
 	.4byte SafariZone_Southeast_MapConnections
diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/scripts.inc
index f88cd22fb..f88cd22fb 100644
--- a/data/scripts/maps/SafariZone_Southeast.inc
+++ b/data/maps/SafariZone_Southeast/scripts.inc
diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc
index 936a1dc82..83398e3a3 100644
--- a/data/maps/SafariZone_Southwest/connections.inc
+++ b/data/maps/SafariZone_Southwest/connections.inc
@@ -1,6 +1,6 @@
 SafariZone_Southwest_MapConnectionsList: @ 8486E44
-	connection up, 0, SAFARI_ZONE_NORTHWEST, 0
-	connection right, 0, SAFARI_ZONE_SOUTH, 0
+	connection up, 0, MAP_SAFARI_ZONE_NORTHWEST
+	connection right, 0, MAP_SAFARI_ZONE_SOUTH
 
 SafariZone_Southwest_MapConnections: @ 8486E5C
 	.4byte 0x2
diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc
new file mode 100644
index 000000000..ccd775dd2
--- /dev/null
+++ b/data/maps/SafariZone_Southwest/events.inc
@@ -0,0 +1,13 @@
+SafariZone_Southwest_EventObjects: @ 853B24C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, 1, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131
+
+SafariZone_Southwest_MapWarps: @ 853B27C
+	warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE
+
+SafariZone_Southwest_MapBGEvents: @ 853B284
+	bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_23D270
+
+SafariZone_Southwest_MapEvents:: @ 853B290
+	map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents
+
diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc
index 3eaf59e98..5cff316ae 100644
--- a/data/maps/SafariZone_Southwest/header.inc
+++ b/data/maps/SafariZone_Southwest/header.inc
@@ -1,5 +1,5 @@
 SafariZone_Southwest: @ 8485174
-	.4byte SafariZone_Southwest_MapAttributes
+	.4byte SafariZone_Southwest_Layout
 	.4byte SafariZone_Southwest_MapEvents
 	.4byte SafariZone_Southwest_MapScripts
 	.4byte SafariZone_Southwest_MapConnections
diff --git a/data/scripts/maps/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/scripts.inc
index d2e75eb1b..d2e75eb1b 100644
--- a/data/scripts/maps/SafariZone_Southwest.inc
+++ b/data/maps/SafariZone_Southwest/scripts.inc
diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc
new file mode 100644
index 000000000..588b7a9ae
--- /dev/null
+++ b/data/maps/ScorchedSlab/events.inc
@@ -0,0 +1,9 @@
+ScorchedSlab_EventObjects: @ 8536F88
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079
+
+ScorchedSlab_MapWarps: @ 8536FA0
+	warp_def 7, 16, 1, 1, MAP_ROUTE120
+
+ScorchedSlab_MapEvents:: @ 8536FA8
+	map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc
index e9b0a7b7e..543f83ebb 100644
--- a/data/maps/ScorchedSlab/header.inc
+++ b/data/maps/ScorchedSlab/header.inc
@@ -1,5 +1,5 @@
 ScorchedSlab: @ 84846BC
-	.4byte ScorchedSlab_MapAttributes
+	.4byte ScorchedSlab_Layout
 	.4byte ScorchedSlab_MapEvents
 	.4byte ScorchedSlab_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/maps/ScorchedSlab/scripts.inc
index f83724ec5..f83724ec5 100644
--- a/data/scripts/maps/ScorchedSlab.inc
+++ b/data/maps/ScorchedSlab/scripts.inc
diff --git a/data/maps/SeafloorCavern_Entrance/events.inc b/data/maps/SeafloorCavern_Entrance/events.inc
new file mode 100644
index 000000000..e27362f00
--- /dev/null
+++ b/data/maps/SeafloorCavern_Entrance/events.inc
@@ -0,0 +1,10 @@
+SeafloorCavern_Entrance_EventObjects: @ 85356BC
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, 7, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941
+
+SeafloorCavern_Entrance_MapWarps: @ 85356D4
+	warp_def 10, 18, 3, 0, MAP_UNDERWATER4
+	warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1
+
+SeafloorCavern_Entrance_MapEvents:: @ 85356E4
+	map_events SeafloorCavern_Entrance_EventObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc
index be05d04fa..3e26232dc 100644
--- a/data/maps/SeafloorCavern_Entrance/header.inc
+++ b/data/maps/SeafloorCavern_Entrance/header.inc
@@ -1,5 +1,5 @@
 SeafloorCavern_Entrance: @ 84841B4
-	.4byte SeafloorCavern_Entrance_MapAttributes
+	.4byte SeafloorCavern_Entrance_Layout
 	.4byte SeafloorCavern_Entrance_MapEvents
 	.4byte SeafloorCavern_Entrance_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc
new file mode 100644
index 000000000..9eb71d5e3
--- /dev/null
+++ b/data/maps/SeafloorCavern_Entrance/scripts.inc
@@ -0,0 +1,93 @@
+SeafloorCavern_Entrance_MapScripts:: @ 823446E
+	map_script 5, SeafloorCavern_Entrance_MapScript1_234474
+	.byte 0
+
+SeafloorCavern_Entrance_MapScript1_234474: @ 8234474
+	setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5
+	setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5
+	end
+
+SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
+	lockall
+	compare VAR_0x40D9, 1
+	goto_eq SeafloorCavern_Entrance_EventScript_2344ED
+	waitse
+	playse SE_PIN
+	applymovement 1, SeafloorCavern_Entrance_Movement_272598
+	waitmovement 0
+	applymovement 1, SeafloorCavern_Entrance_Movement_27259A
+	waitmovement 0
+	delay 20
+	compare VAR_FACING, 3
+	call_if 1, SeafloorCavern_Entrance_EventScript_23452E
+	compare VAR_FACING, 4
+	call_if 1, SeafloorCavern_Entrance_EventScript_234523
+	compare VAR_FACING, 2
+	call_if 1, SeafloorCavern_Entrance_EventScript_234539
+	delay 30
+	setvar VAR_0x40D9, 1
+	moveobjectoffscreen 1
+	msgbox SeafloorCavern_Entrance_Text_234544, 4
+	closemessage
+	applymovement 1, SeafloorCavern_Entrance_Movement_2725A6
+	waitmovement 0
+	releaseall
+	end
+
+SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED
+	compare VAR_FACING, 3
+	call_if 1, SeafloorCavern_Entrance_EventScript_23452E
+	compare VAR_FACING, 4
+	call_if 1, SeafloorCavern_Entrance_EventScript_234523
+	compare VAR_FACING, 2
+	call_if 1, SeafloorCavern_Entrance_EventScript_234539
+	msgbox SeafloorCavern_Entrance_Text_2346C8, 4
+	closemessage
+	applymovement 1, SeafloorCavern_Entrance_Movement_2725A6
+	waitmovement 0
+	releaseall
+	end
+
+SeafloorCavern_Entrance_EventScript_234523:: @ 8234523
+	applymovement 1, SeafloorCavern_Entrance_Movement_2725A4
+	waitmovement 0
+	return
+
+SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E
+	applymovement 1, SeafloorCavern_Entrance_Movement_2725A8
+	waitmovement 0
+	return
+
+SeafloorCavern_Entrance_EventScript_234539:: @ 8234539
+	applymovement 1, SeafloorCavern_Entrance_Movement_2725AA
+	waitmovement 0
+	return
+
+SeafloorCavern_Entrance_Text_234544: @ 8234544
+	.string "Hey!\n"
+	.string "I remember your face!\p"
+	.string "If you’re here, it must mean that\n"
+	.string "you’re about to mess with us again!\p"
+	.string "A punk like you, do you really think\n"
+	.string "you can take on TEAM AQUA?\p"
+	.string "I’d say you’re too early by about\n"
+	.string "a trillion years!\p"
+	.string "You’re a perfect fit for the likes of\n"
+	.string "TEAM MAGMA!\p"
+	.string "Speaking of TEAM MAGMA, I hear they\n"
+	.string "were spotted near MOSSDEEP.\p"
+	.string "That bunch of goons, they sure don’t\n"
+	.string "look good near the sea!$"
+
+SeafloorCavern_Entrance_Text_2346C8: @ 82346C8
+	.string "A punk like you, do you really think\n"
+	.string "you can take on TEAM AQUA?\p"
+	.string "I’d say you’re too early by about\n"
+	.string "a trillion years!\p"
+	.string "You’re a perfect fit for the likes of\n"
+	.string "TEAM MAGMA!\p"
+	.string "Speaking of TEAM MAGMA, I hear they\n"
+	.string "were spotted near MOSSDEEP.\p"
+	.string "That bunch of goons, they sure don’t\n"
+	.string "look good near the sea!$"
+
diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc
new file mode 100644
index 000000000..261314b9b
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room1/events.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room1_EventObjects: @ 85356F8
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, 1, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, 16, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946
+
+SeafloorCavern_Room1_MapWarps: @ 8535770
+	warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE
+	warp_def 17, 13, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM5
+	warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2
+
+SeafloorCavern_Room1_MapEvents:: @ 8535788
+	map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc
index 094095d7e..29a75081f 100644
--- a/data/maps/SeafloorCavern_Room1/header.inc
+++ b/data/maps/SeafloorCavern_Room1/header.inc
@@ -1,5 +1,5 @@
 SeafloorCavern_Room1: @ 84841D0
-	.4byte SeafloorCavern_Room1_MapAttributes
+	.4byte SeafloorCavern_Room1_Layout
 	.4byte SeafloorCavern_Room1_MapEvents
 	.4byte SeafloorCavern_Room1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/scripts.inc
index d3308fca2..d3308fca2 100644
--- a/data/scripts/maps/SeafloorCavern_Room1.inc
+++ b/data/maps/SeafloorCavern_Room1/scripts.inc
diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc
new file mode 100644
index 000000000..01f6f3ba5
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room2/events.inc
@@ -0,0 +1,19 @@
+SeafloorCavern_Room2_EventObjects: @ 853579C
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23
+
+SeafloorCavern_Room2_MapWarps: @ 853585C
+	warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1
+	warp_def 4, 10, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4
+	warp_def 6, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6
+	warp_def 11, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7
+
+SeafloorCavern_Room2_MapEvents:: @ 853587C
+	map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc
index ebbfc58bc..749b4b9ee 100644
--- a/data/maps/SeafloorCavern_Room2/header.inc
+++ b/data/maps/SeafloorCavern_Room2/header.inc
@@ -1,5 +1,5 @@
 SeafloorCavern_Room2: @ 84841EC
-	.4byte SeafloorCavern_Room2_MapAttributes
+	.4byte SeafloorCavern_Room2_Layout
 	.4byte SeafloorCavern_Room2_MapEvents
 	.4byte SeafloorCavern_Room2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/scripts.inc
index 15201dac0..15201dac0 100644
--- a/data/scripts/maps/SeafloorCavern_Room2.inc
+++ b/data/maps/SeafloorCavern_Room2/scripts.inc
diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc
new file mode 100644
index 000000000..300db40c5
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room3/events.inc
@@ -0,0 +1,19 @@
+SeafloorCavern_Room3_EventObjects: @ 8535890
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, 9, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946
+	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, 10, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946
+
+SeafloorCavern_Room3_MapWarps: @ 8535968
+	warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8
+	warp_def 9, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7
+	warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6
+
+SeafloorCavern_Room3_MapEvents:: @ 8535980
+	map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc
index 56dd1c14b..4ef0565be 100644
--- a/data/maps/SeafloorCavern_Room3/header.inc
+++ b/data/maps/SeafloorCavern_Room3/header.inc
@@ -1,5 +1,5 @@
 SeafloorCavern_Room3: @ 8484208
-	.4byte SeafloorCavern_Room3_MapAttributes
+	.4byte SeafloorCavern_Room3_Layout
 	.4byte SeafloorCavern_Room3_MapEvents
 	.4byte SeafloorCavern_Room3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/scripts.inc
index f57d58e22..f57d58e22 100644
--- a/data/scripts/maps/SeafloorCavern_Room3.inc
+++ b/data/maps/SeafloorCavern_Room3/scripts.inc
diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc
new file mode 100644
index 000000000..6b6df78f2
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room4/events.inc
@@ -0,0 +1,13 @@
+SeafloorCavern_Room4_EventObjects: @ 8535994
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, 17, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, 7, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946
+
+SeafloorCavern_Room4_MapWarps: @ 85359C4
+	warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2
+	warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM5
+	warp_def 9, 10, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM5
+	warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE
+
+SeafloorCavern_Room4_MapEvents:: @ 85359E4
+	map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc
index 1f710ac3a..0edd39d4a 100644
--- a/data/maps/SeafloorCavern_Room4/header.inc
+++ b/data/maps/SeafloorCavern_Room4/header.inc
@@ -1,5 +1,5 @@
 SeafloorCavern_Room4: @ 8484224
-	.4byte SeafloorCavern_Room4_MapAttributes
+	.4byte SeafloorCavern_Room4_Layout
 	.4byte SeafloorCavern_Room4_MapEvents
 	.4byte SeafloorCavern_Room4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/scripts.inc
index e509013d6..e509013d6 100644
--- a/data/scripts/maps/SeafloorCavern_Room4.inc
+++ b/data/maps/SeafloorCavern_Room4/scripts.inc
diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc
new file mode 100644
index 000000000..97787ebbf
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room5/events.inc
@@ -0,0 +1,16 @@
+SeafloorCavern_Room5_EventObjects: @ 85359F8
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20
+
+SeafloorCavern_Room5_MapWarps: @ 8535A88
+	warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1
+	warp_def 15, 12, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM4
+	warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4
+
+SeafloorCavern_Room5_MapEvents:: @ 8535AA0
+	map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc
index 8f9edd756..013f447dc 100644
--- a/data/maps/SeafloorCavern_Room5/header.inc
+++ b/data/maps/SeafloorCavern_Room5/header.inc
@@ -1,5 +1,5 @@
 SeafloorCavern_Room5: @ 8484240
-	.4byte SeafloorCavern_Room5_MapAttributes
+	.4byte SeafloorCavern_Room5_Layout
 	.4byte SeafloorCavern_Room5_MapEvents
 	.4byte SeafloorCavern_Room5_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/scripts.inc
index e1c68db6e..e1c68db6e 100644
--- a/data/scripts/maps/SeafloorCavern_Room5.inc
+++ b/data/maps/SeafloorCavern_Room5/scripts.inc
diff --git a/data/maps/SeafloorCavern_Room6/events.inc b/data/maps/SeafloorCavern_Room6/events.inc
new file mode 100644
index 000000000..99c10d87e
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room6/events.inc
@@ -0,0 +1,8 @@
+SeafloorCavern_Room6_MapWarps: @ 8535AB4
+	warp_def 11, 21, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM2
+	warp_def 4, 1, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM3
+	warp_def 14, 8, 1, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE
+
+SeafloorCavern_Room6_MapEvents:: @ 8535ACC
+	map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc
index e1aab7b08..9bbb14463 100644
--- a/data/maps/SeafloorCavern_Room6/header.inc
+++ b/data/maps/SeafloorCavern_Room6/header.inc
@@ -1,5 +1,5 @@
 SeafloorCavern_Room6: @ 848425C
-	.4byte SeafloorCavern_Room6_MapAttributes
+	.4byte SeafloorCavern_Room6_Layout
 	.4byte SeafloorCavern_Room6_MapEvents
 	.4byte SeafloorCavern_Room6_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/scripts.inc
index ae8cf02fa..ae8cf02fa 100644
--- a/data/scripts/maps/SeafloorCavern_Room6.inc
+++ b/data/maps/SeafloorCavern_Room6/scripts.inc
diff --git a/data/maps/SeafloorCavern_Room7/events.inc b/data/maps/SeafloorCavern_Room7/events.inc
new file mode 100644
index 000000000..2d8fca999
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room7/events.inc
@@ -0,0 +1,7 @@
+SeafloorCavern_Room7_MapWarps: @ 8535AE0
+	warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2
+	warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3
+
+SeafloorCavern_Room7_MapEvents:: @ 8535AF0
+	map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc
index fd0b49c93..d4b0db267 100644
--- a/data/maps/SeafloorCavern_Room7/header.inc
+++ b/data/maps/SeafloorCavern_Room7/header.inc
@@ -1,5 +1,5 @@
 SeafloorCavern_Room7: @ 8484278
-	.4byte SeafloorCavern_Room7_MapAttributes
+	.4byte SeafloorCavern_Room7_Layout
 	.4byte SeafloorCavern_Room7_MapEvents
 	.4byte SeafloorCavern_Room7_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/scripts.inc
index e91cf6193..e91cf6193 100644
--- a/data/scripts/maps/SeafloorCavern_Room7.inc
+++ b/data/maps/SeafloorCavern_Room7/scripts.inc
diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc
new file mode 100644
index 000000000..42dcf9faa
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room8/events.inc
@@ -0,0 +1,21 @@
+SeafloorCavern_Room8_EventObjects: @ 8535B04
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25
+	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26
+	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27
+	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28
+
+SeafloorCavern_Room8_MapWarps: @ 8535C24
+	warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9
+	warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3
+
+SeafloorCavern_Room8_MapEvents:: @ 8535C34
+	map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc
index a5ecc196a..903e25a14 100644
--- a/data/maps/SeafloorCavern_Room8/header.inc
+++ b/data/maps/SeafloorCavern_Room8/header.inc
@@ -1,5 +1,5 @@
 SeafloorCavern_Room8: @ 8484294
-	.4byte SeafloorCavern_Room8_MapAttributes
+	.4byte SeafloorCavern_Room8_Layout
 	.4byte SeafloorCavern_Room8_MapEvents
 	.4byte SeafloorCavern_Room8_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/scripts.inc
index 471cafd17..471cafd17 100644
--- a/data/scripts/maps/SeafloorCavern_Room8.inc
+++ b/data/maps/SeafloorCavern_Room8/scripts.inc
diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc
new file mode 100644
index 000000000..ac3337bed
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room9/events.inc
@@ -0,0 +1,18 @@
+SeafloorCavern_Room9_EventObjects: @ 8535C48
+	object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, 859
+	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 828
+	object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 829
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, 831
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, 831
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090
+	object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, 8, 1, 1, 0, 0, 0x0, 733
+
+SeafloorCavern_Room9_MapWarps: @ 8535CF0
+	warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8
+
+SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8
+	coord_event 17, 42, 3, 0, VAR_0x40A2, 0, 0, SeafloorCavern_Room9_EventScript_234DC9
+
+SeafloorCavern_Room9_MapEvents:: @ 8535D08
+	map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0
+
diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc
index 4df3870e6..0d43deb23 100644
--- a/data/maps/SeafloorCavern_Room9/header.inc
+++ b/data/maps/SeafloorCavern_Room9/header.inc
@@ -1,5 +1,5 @@
 SeafloorCavern_Room9: @ 84842B0
-	.4byte SeafloorCavern_Room9_MapAttributes
+	.4byte SeafloorCavern_Room9_Layout
 	.4byte SeafloorCavern_Room9_MapEvents
 	.4byte SeafloorCavern_Room9_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
new file mode 100644
index 000000000..cbfbccfe4
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -0,0 +1,323 @@
+SeafloorCavern_Room9_MapScripts:: @ 8234DC8
+	.byte 0
+
+SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
+	lockall
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 4
+	setvar VAR_0x8007, 5
+	applymovement 255, SeafloorCavern_Room9_Movement_2725A6
+	waitmovement 0
+	applymovement 255, SeafloorCavern_Room9_Movement_23505C
+	waitmovement 0
+	playbgm MUS_AQA_0, 0
+	msgbox SeafloorCavern_Room9_Text_23505F, 4
+	closemessage
+	addobject VAR_0x8004
+	applymovement 255, SeafloorCavern_Room9_Movement_2725A4
+	waitmovement 0
+	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A
+	waitmovement 0
+	msgbox SeafloorCavern_Room9_Text_23507C, 4
+	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6
+	waitmovement 0
+	msgbox SeafloorCavern_Room9_Text_2350A6, 4
+	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E
+	waitmovement 0
+	msgbox SeafloorCavern_Room9_Text_23512C, 4
+	trainerbattle 3, TRAINER_ARCHIE, 0, SeafloorCavern_Room9_Text_2351BC
+	msgbox SeafloorCavern_Room9_Text_2351E5, 4
+	setweather 0
+	doweather
+	special sub_80B05B4
+	waitstate
+	msgbox SeafloorCavern_Room9_Text_235279, 4
+	special WaitWeather
+	waitstate
+	setvar VAR_RESULT, 1
+	playse SE_W197
+	setfieldeffectargument 0, 16
+	setfieldeffectargument 1, 42
+	setfieldeffectargument 2, 0
+	dofieldeffect 54
+	waitfieldeffect 54
+	closemessage
+	setvar VAR_RESULT, 0
+	playfanfare MUS_ME_TAMA
+	playse SE_TAMA
+	special sub_80B0534
+	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6
+	applymovement 255, SeafloorCavern_Room9_Movement_2725A6
+	waitmovement 0
+	delay 150
+	removeobject 7
+	addobject 1
+	waitstate
+	delay 60
+	applymovement 1, SeafloorCavern_Room9_Movement_235040
+	waitmovement 0
+	special sub_80B058C
+	waitstate
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 8
+	setvar VAR_0x8007, 5
+	special sub_8139560
+	waitstate
+	applymovement 1, SeafloorCavern_Room9_Movement_23504B
+	waitmovement 0
+	removeobject 1
+	delay 4
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 8
+	setvar VAR_0x8007, 5
+	special sub_8139560
+	waitstate
+	delay 30
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 4
+	setvar VAR_0x8007, 5
+	msgbox SeafloorCavern_Room9_Text_2352A7, 4
+	playse SE_PC_LOGIN
+	applymovement 255, SeafloorCavern_Room9_Movement_2725A4
+	waitmovement 0
+	msgbox SeafloorCavern_Room9_Text_2352F6, 4
+	closemessage
+	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_235035
+	waitmovement 0
+	msgbox SeafloorCavern_Room9_Text_23532B, 4
+	closemessage
+	playse SE_PC_OFF
+	delay 20
+	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725AA
+	waitmovement 0
+	msgbox SeafloorCavern_Room9_Text_23546F, 4
+	closemessage
+	addobject VAR_0x8005
+	addobject VAR_0x8006
+	addobject VAR_0x8007
+	applymovement VAR_0x8007, SeafloorCavern_Room9_Movement_235057
+	applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057
+	applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E
+	waitmovement 0
+	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A4
+	waitmovement 0
+	msgbox SeafloorCavern_Room9_Text_2354F0, 4
+	playse SE_PIN
+	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_272598
+	waitmovement 0
+	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259A
+	waitmovement 0
+	msgbox SeafloorCavern_Room9_Text_2355C2, 4
+	msgbox SeafloorCavern_Room9_Text_235692, 4
+	closemessage
+	applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_235054
+	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A
+	waitmovement 0
+	msgbox SeafloorCavern_Room9_Text_235723, 4
+	setvar VAR_0x407B, 1
+	setvar VAR_0x405E, 1
+	clearflag FLAG_0x3CD
+	clearflag FLAG_0x33A
+	clearflag FLAG_0x33B
+	clearflag FLAG_0x356
+	clearflag FLAG_0x3E6
+	clearflag FLAG_0x3E5
+	setflag FLAG_0x347
+	setflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
+	clearflag FLAG_0x3B0
+	clearflag FLAG_0x3B1
+	setflag FLAG_SYS_WEATHER_CTRL
+	setflag FLAG_0x081
+	setflag FLAG_0x3C7
+	setvar VAR_0x40C6, 2
+	setvar VAR_0x40A2, 1
+	setflag FLAG_0x33C
+	setflag FLAG_0x33D
+	setflag FLAG_0x33F
+	setflag FLAG_0x35B
+	setflag FLAG_0x3B2
+	setflag FLAG_SPECIAL_FLAG_0x4000
+	warp MAP_ROUTE128, 255, 38, 22
+	waitstate
+	releaseall
+	end
+
+SeafloorCavern_Room9_Movement_23502A: @ 823502A
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+SeafloorCavern_Room9_Movement_235032: @ 8235032
+	walk_left
+	walk_left
+	step_end
+
+SeafloorCavern_Room9_Movement_235035: @ 8235035
+	walk_left
+	delay_16
+	step_end
+
+SeafloorCavern_Room9_Movement_235038: @ 8235038
+	walk_right
+	step_end
+
+SeafloorCavern_Room9_Movement_23503A: @ 823503A
+	face_up
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
+	walk_in_place_fastest_right
+	step_end
+
+SeafloorCavern_Room9_Movement_235040: @ 8235040
+	delay_16
+	delay_16
+	walk_slow_down
+	delay_16
+	delay_16
+	delay_16
+	walk_slow_down
+	delay_16
+	delay_16
+	delay_16
+	step_end
+
+SeafloorCavern_Room9_Movement_23504B: @ 823504B
+	slide_up
+	slide_up
+	step_end
+
+SeafloorCavern_Room9_Movement_23504E: @ 823504E
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	step_end
+
+SeafloorCavern_Room9_Movement_235054: @ 8235054
+	walk_right
+	walk_right
+	step_end
+
+SeafloorCavern_Room9_Movement_235057: @ 8235057
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	step_end
+
+SeafloorCavern_Room9_Movement_23505C: @ 823505C
+	delay_16
+	delay_16
+	step_end
+
+SeafloorCavern_Room9_Text_23505F: @ 823505F
+	.string "ARCHIE: Hold it right there.$"
+
+SeafloorCavern_Room9_Text_23507C: @ 823507C
+	.string "ARCHIE: Fufufu…\n"
+	.string "So it was you, after all.$"
+
+SeafloorCavern_Room9_Text_2350A6: @ 82350A6
+	.string "ARCHIE: Behold!\p"
+	.string "See how beautiful it is, the sleeping\n"
+	.string "form of the ancient POKéMON KYOGRE!\p"
+	.string "I have waited so long for this day to\n"
+	.string "come…$"
+
+SeafloorCavern_Room9_Text_23512C: @ 823512C
+	.string "ARCHIE: It surprises me, how you’ve\n"
+	.string "managed to chase me here.\p"
+	.string "But that’s all over now.\p"
+	.string "For the realization of my dream,\n"
+	.string "you must disappear now!$"
+
+SeafloorCavern_Room9_Text_2351BC: @ 82351BC
+	.string "What?!\n"
+	.string "I lost to a mere child like you?!$"
+
+SeafloorCavern_Room9_Text_2351E5: @ 82351E5
+	.string "ARCHIE: Fufufu…\p"
+	.string "I commend you. I must recognize that\n"
+	.string "you are truly gifted.\p"
+	.string "But!\n"
+	.string "I have this in my possession!\p"
+	.string "With this RED ORB, I can make KYOGRE…$"
+
+SeafloorCavern_Room9_Text_235279: @ 8235279
+	.string "The RED ORB suddenly began shining\n"
+	.string "by itself!$"
+
+SeafloorCavern_Room9_Text_2352A7: @ 82352A7
+	.string "ARCHIE: What?!\p"
+	.string "I didn’t do anything.\n"
+	.string "Why did the RED ORB…\p"
+	.string "Where did KYOGRE go?$"
+
+SeafloorCavern_Room9_Text_2352F6: @ 82352F6
+	.string "ARCHIE: Hm? It’s a message from our\n"
+	.string "members outside…$"
+
+SeafloorCavern_Room9_Text_23532B: @ 823532B
+	.string "ARCHIE: Yes, what is it?\p"
+	.string "Hm…\n"
+	.string "It’s raining heavily?\p"
+	.string "Good… That should have happened.\n"
+	.string "That is why we awakened KYOGRE,\l"
+	.string "to realize TEAM AQUA’s vision of\l"
+	.string "expanding the sea.\p"
+	.string "What?!\p"
+	.string "It’s raining far harder than we\n"
+	.string "envisioned? You’re in danger?\p"
+	.string "That can’t be…\n"
+	.string "That’s just not possible…\p"
+	.string "Hold your position and monitor\n"
+	.string "the situation!$"
+
+SeafloorCavern_Room9_Text_23546F: @ 823546F
+	.string "ARCHIE: There’s something wrong…\p"
+	.string "The RED ORB is supposed to awaken\n"
+	.string "and control KYOGRE…\p"
+	.string "But… Why?\n"
+	.string "Why did KYOGRE disappear?\p"
+	.string "Why?!$"
+
+SeafloorCavern_Room9_Text_2354F0: @ 82354F0
+	.string "MAXIE: What have you wrought?\p"
+	.string "ARCHIE… You’ve finally awoken KYOGRE,\n"
+	.string "haven’t you?\p"
+	.string "What will happen to the world if this\n"
+	.string "downpour continues for all eternity?\p"
+	.string "The world’s landmass will drown in\n"
+	.string "the deepening sea…$"
+
+SeafloorCavern_Room9_Text_2355C2: @ 82355C2
+	.string "ARCHIE: W-what?!\n"
+	.string "Don’t get all high and mighty with me!\p"
+	.string "Wasn’t it you, TEAM MAGMA, that\n"
+	.string "infuriated GROUDON?\p"
+	.string "So long as I have this RED ORB,\n"
+	.string "I should be able to control KYOGRE…\p"
+	.string "I should be able to control it…$"
+
+SeafloorCavern_Room9_Text_235692: @ 8235692
+	.string "MAXIE: We don’t have the time to\n"
+	.string "argue about it here!\p"
+	.string "Get outside and see for yourself!\p"
+	.string "See if what you’ve wrought is the\n"
+	.string "world that we desired!$"
+
+SeafloorCavern_Room9_Text_235723: @ 8235723
+	.string "MAXIE: {PLAYER}, come on, you have\n"
+	.string "to get out of here, too!$"
+
diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc
new file mode 100644
index 000000000..dd331570e
--- /dev/null
+++ b/data/maps/SealedChamber_InnerRoom/events.inc
@@ -0,0 +1,17 @@
+SealedChamber_InnerRoom_MapWarps: @ 8536F00
+	warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM
+
+SealedChamber_InnerRoom_MapBGEvents: @ 8536F08
+	bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8
+	bg_event 6, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239255
+	bg_event 14, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_23925F
+	bg_event 4, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239269
+	bg_event 16, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239273
+	bg_event 6, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_23927D
+	bg_event 14, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239287
+	bg_event 9, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8
+	bg_event 11, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8
+
+SealedChamber_InnerRoom_MapEvents:: @ 8536F74
+	map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents
+
diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc
index 87b73cfa1..4a26587bc 100644
--- a/data/maps/SealedChamber_InnerRoom/header.inc
+++ b/data/maps/SealedChamber_InnerRoom/header.inc
@@ -1,5 +1,5 @@
 SealedChamber_InnerRoom: @ 84846A0
-	.4byte SealedChamber_InnerRoom_MapAttributes
+	.4byte SealedChamber_InnerRoom_Layout
 	.4byte SealedChamber_InnerRoom_MapEvents
 	.4byte SealedChamber_InnerRoom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc
index 9cd3727bb..9cd3727bb 100644
--- a/data/scripts/maps/SealedChamber_InnerRoom.inc
+++ b/data/maps/SealedChamber_InnerRoom/scripts.inc
diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc
new file mode 100644
index 000000000..0181f3193
--- /dev/null
+++ b/data/maps/SealedChamber_OuterRoom/events.inc
@@ -0,0 +1,37 @@
+SealedChamber_OuterRoom_MapWarps: @ 8536D88
+	warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM
+
+SealedChamber_OuterRoom_MapBGEvents: @ 8536D90
+	bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C
+	bg_event 5, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176
+	bg_event 5, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180
+	bg_event 5, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A
+	bg_event 11, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194
+	bg_event 11, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E
+	bg_event 11, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8
+	bg_event 11, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC
+	bg_event 16, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391B2
+	bg_event 16, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391C6
+	bg_event 10, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391D0
+	bg_event 6, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C
+	bg_event 4, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C
+	bg_event 4, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176
+	bg_event 6, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176
+	bg_event 4, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180
+	bg_event 6, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180
+	bg_event 4, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A
+	bg_event 6, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A
+	bg_event 10, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194
+	bg_event 12, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194
+	bg_event 10, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E
+	bg_event 12, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E
+	bg_event 10, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8
+	bg_event 12, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8
+	bg_event 10, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC
+	bg_event 12, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC
+	bg_event 9, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391ED
+	bg_event 11, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391ED
+
+SealedChamber_OuterRoom_MapEvents:: @ 8536EEC
+	map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents
+
diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc
index fc55dd8d2..fd5fe39f3 100644
--- a/data/maps/SealedChamber_OuterRoom/header.inc
+++ b/data/maps/SealedChamber_OuterRoom/header.inc
@@ -1,5 +1,5 @@
 SealedChamber_OuterRoom: @ 8484684
-	.4byte SealedChamber_OuterRoom_MapAttributes
+	.4byte SealedChamber_OuterRoom_Layout
 	.4byte SealedChamber_OuterRoom_MapEvents
 	.4byte SealedChamber_OuterRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc
new file mode 100644
index 000000000..e9e79d1e9
--- /dev/null
+++ b/data/maps/SealedChamber_OuterRoom/scripts.inc
@@ -0,0 +1,132 @@
+SealedChamber_OuterRoom_MapScripts:: @ 8239106
+	map_script 5, SealedChamber_OuterRoom_MapScript1_239116
+	map_script 3, SealedChamber_OuterRoom_MapScript1_239127
+	map_script 1, SealedChamber_OuterRoom_MapScript1_23912B
+	.byte 0
+
+SealedChamber_OuterRoom_MapScript1_239116: @ 8239116
+	setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44
+	setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44
+	end
+
+SealedChamber_OuterRoom_MapScript1_239127: @ 8239127
+	setflag FLAG_LANDMARK_SEALED_CHAMBER
+	end
+
+SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B
+	checkflag FLAG_SYS_BRAILLE_DIG
+	call_if 0, SealedChamber_OuterRoom_EventScript_239135
+	end
+
+SealedChamber_OuterRoom_EventScript_239135:: @ 8239135
+	setmetatile 9, 1, 553, 1
+	setmetatile 10, 1, 553, 1
+	setmetatile 11, 1, 553, 1
+	setmetatile 9, 2, 565, 1
+	setmetatile 10, 2, 565, 1
+	setmetatile 11, 2, 565, 1
+	return
+
+SealedChamber_OuterRoom_EventScript_23916C:: @ 823916C
+	lockall
+	braillemessage SealedChamber_OuterRoom_Braille_2A6B27
+	waitbuttonpress
+	hidebox2
+	releaseall
+	end
+
+SealedChamber_OuterRoom_EventScript_239176:: @ 8239176
+	lockall
+	braillemessage SealedChamber_OuterRoom_Braille_2A6B31
+	waitbuttonpress
+	hidebox2
+	releaseall
+	end
+
+SealedChamber_OuterRoom_EventScript_239180:: @ 8239180
+	lockall
+	braillemessage SealedChamber_OuterRoom_Braille_2A6B3B
+	waitbuttonpress
+	hidebox2
+	releaseall
+	end
+
+SealedChamber_OuterRoom_EventScript_23918A:: @ 823918A
+	lockall
+	braillemessage SealedChamber_OuterRoom_Braille_2A6B45
+	waitbuttonpress
+	hidebox2
+	releaseall
+	end
+
+SealedChamber_OuterRoom_EventScript_239194:: @ 8239194
+	lockall
+	braillemessage SealedChamber_OuterRoom_Braille_2A6B4F
+	waitbuttonpress
+	hidebox2
+	releaseall
+	end
+
+SealedChamber_OuterRoom_EventScript_23919E:: @ 823919E
+	lockall
+	braillemessage SealedChamber_OuterRoom_Braille_2A6B59
+	waitbuttonpress
+	hidebox2
+	releaseall
+	end
+
+SealedChamber_OuterRoom_EventScript_2391A8:: @ 82391A8
+	lockall
+	braillemessage SealedChamber_OuterRoom_Braille_2A6B63
+	waitbuttonpress
+	hidebox2
+	releaseall
+	end
+
+SealedChamber_OuterRoom_EventScript_2391B2:: @ 82391B2
+	lockall
+	braillemessage SealedChamber_OuterRoom_Braille_2A6B6E
+	waitbuttonpress
+	hidebox2
+	releaseall
+	end
+
+SealedChamber_OuterRoom_EventScript_2391BC:: @ 82391BC
+	lockall
+	braillemessage SealedChamber_OuterRoom_Braille_2A6B76
+	waitbuttonpress
+	hidebox2
+	releaseall
+	end
+
+SealedChamber_OuterRoom_EventScript_2391C6:: @ 82391C6
+	lockall
+	braillemessage SealedChamber_OuterRoom_Braille_2A6B81
+	waitbuttonpress
+	hidebox2
+	releaseall
+	end
+
+SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0
+	lockall
+	checkflag FLAG_SYS_BRAILLE_DIG
+	goto_eq SealedChamber_OuterRoom_EventScript_2391E3
+	braillemessage SealedChamber_OuterRoom_Braille_2A6B89
+	waitbuttonpress
+	hidebox2
+	releaseall
+	end
+
+SealedChamber_OuterRoom_EventScript_2391E3:: @ 82391E3
+	msgbox gUnknown_0827304E, 4
+	releaseall
+	end
+
+SealedChamber_OuterRoom_EventScript_2391ED:: @ 82391ED
+	lockall
+	braillemessage SealedChamber_OuterRoom_Braille_2A6B89
+	waitbuttonpress
+	hidebox2
+	releaseall
+	end
+
diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc
new file mode 100644
index 000000000..2905764cf
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave1/events.inc
@@ -0,0 +1,23 @@
+SecretBase_BlueCave1_EventObjects: @ 8537BEC
+	object_event 1, 255, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_BlueCave1_MapWarps: @ 8537D54
+	warp_def 5, 7, 0, 126, MAP_NONE
+
+SecretBase_BlueCave1_MapEvents:: @ 8537D5C
+	map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc
index 8914ffdc5..4e987702c 100644
--- a/data/maps/SecretBase_BlueCave1/header.inc
+++ b/data/maps/SecretBase_BlueCave1/header.inc
@@ -1,5 +1,5 @@
 SecretBase_BlueCave1: @ 8484AC8
-	.4byte SecretBase_BlueCave1_MapAttributes
+	.4byte SecretBase_BlueCave1_Layout
 	.4byte SecretBase_BlueCave1_MapEvents
 	.4byte SecretBase_BlueCave1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/scripts.inc
index a7f979bde..a7f979bde 100644
--- a/data/scripts/maps/SecretBase_BlueCave1.inc
+++ b/data/maps/SecretBase_BlueCave1/scripts.inc
diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc
new file mode 100644
index 000000000..8202b7a42
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave2/events.inc
@@ -0,0 +1,23 @@
+SecretBase_BlueCave2_EventObjects: @ 8538504
+	object_event 1, 255, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_BlueCave2_MapWarps: @ 853866C
+	warp_def 7, 5, 0, 126, MAP_NONE
+
+SecretBase_BlueCave2_MapEvents:: @ 8538674
+	map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc
index e36e3dc8e..ed22bbb04 100644
--- a/data/maps/SecretBase_BlueCave2/header.inc
+++ b/data/maps/SecretBase_BlueCave2/header.inc
@@ -1,5 +1,5 @@
 SecretBase_BlueCave2: @ 8484B70
-	.4byte SecretBase_BlueCave2_MapAttributes
+	.4byte SecretBase_BlueCave2_Layout
 	.4byte SecretBase_BlueCave2_MapEvents
 	.4byte SecretBase_BlueCave2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/scripts.inc
index cb4ad3565..cb4ad3565 100644
--- a/data/scripts/maps/SecretBase_BlueCave2.inc
+++ b/data/maps/SecretBase_BlueCave2/scripts.inc
diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc
new file mode 100644
index 000000000..733b674b7
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave3/events.inc
@@ -0,0 +1,23 @@
+SecretBase_BlueCave3_EventObjects: @ 8538E1C
+	object_event 1, 255, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_BlueCave3_MapWarps: @ 8538F84
+	warp_def 4, 15, 0, 126, MAP_NONE
+
+SecretBase_BlueCave3_MapEvents:: @ 8538F8C
+	map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc
index a1cbd4c33..412d1f4af 100644
--- a/data/maps/SecretBase_BlueCave3/header.inc
+++ b/data/maps/SecretBase_BlueCave3/header.inc
@@ -1,5 +1,5 @@
 SecretBase_BlueCave3: @ 8484C18
-	.4byte SecretBase_BlueCave3_MapAttributes
+	.4byte SecretBase_BlueCave3_Layout
 	.4byte SecretBase_BlueCave3_MapEvents
 	.4byte SecretBase_BlueCave3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/scripts.inc
index f49ff6dc1..f49ff6dc1 100644
--- a/data/scripts/maps/SecretBase_BlueCave3.inc
+++ b/data/maps/SecretBase_BlueCave3/scripts.inc
diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc
new file mode 100644
index 000000000..afd1622b8
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave4/events.inc
@@ -0,0 +1,23 @@
+SecretBase_BlueCave4_EventObjects: @ 8539734
+	object_event 1, 255, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_BlueCave4_MapWarps: @ 853989C
+	warp_def 4, 15, 0, 126, MAP_NONE
+
+SecretBase_BlueCave4_MapEvents:: @ 85398A4
+	map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc
index 4fb353150..542df3954 100644
--- a/data/maps/SecretBase_BlueCave4/header.inc
+++ b/data/maps/SecretBase_BlueCave4/header.inc
@@ -1,5 +1,5 @@
 SecretBase_BlueCave4: @ 8484CC0
-	.4byte SecretBase_BlueCave4_MapAttributes
+	.4byte SecretBase_BlueCave4_Layout
 	.4byte SecretBase_BlueCave4_MapEvents
 	.4byte SecretBase_BlueCave4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/scripts.inc
index faa808545..faa808545 100644
--- a/data/scripts/maps/SecretBase_BlueCave4.inc
+++ b/data/maps/SecretBase_BlueCave4/scripts.inc
diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc
new file mode 100644
index 000000000..e4fffab49
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave1/events.inc
@@ -0,0 +1,23 @@
+SecretBase_BrownCave1_EventObjects: @ 8537A68
+	object_event 1, 255, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_BrownCave1_MapWarps: @ 8537BD0
+	warp_def 5, 7, 0, 126, MAP_NONE
+
+SecretBase_BrownCave1_MapEvents:: @ 8537BD8
+	map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc
index 57f27c823..aceddbfda 100644
--- a/data/maps/SecretBase_BrownCave1/header.inc
+++ b/data/maps/SecretBase_BrownCave1/header.inc
@@ -1,5 +1,5 @@
 SecretBase_BrownCave1: @ 8484AAC
-	.4byte SecretBase_BrownCave1_MapAttributes
+	.4byte SecretBase_BrownCave1_Layout
 	.4byte SecretBase_BrownCave1_MapEvents
 	.4byte SecretBase_BrownCave1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/scripts.inc
index 9d2925611..9d2925611 100644
--- a/data/scripts/maps/SecretBase_BrownCave1.inc
+++ b/data/maps/SecretBase_BrownCave1/scripts.inc
diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc
new file mode 100644
index 000000000..29e90b592
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave2/events.inc
@@ -0,0 +1,23 @@
+SecretBase_BrownCave2_EventObjects: @ 8538380
+	object_event 1, 255, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_BrownCave2_MapWarps: @ 85384E8
+	warp_def 1, 7, 0, 126, MAP_NONE
+
+SecretBase_BrownCave2_MapEvents:: @ 85384F0
+	map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc
index 3c8bf24d7..de95374ba 100644
--- a/data/maps/SecretBase_BrownCave2/header.inc
+++ b/data/maps/SecretBase_BrownCave2/header.inc
@@ -1,5 +1,5 @@
 SecretBase_BrownCave2: @ 8484B54
-	.4byte SecretBase_BrownCave2_MapAttributes
+	.4byte SecretBase_BrownCave2_Layout
 	.4byte SecretBase_BrownCave2_MapEvents
 	.4byte SecretBase_BrownCave2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/scripts.inc
index e9c497fac..e9c497fac 100644
--- a/data/scripts/maps/SecretBase_BrownCave2.inc
+++ b/data/maps/SecretBase_BrownCave2/scripts.inc
diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc
new file mode 100644
index 000000000..3322b9d5a
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave3/events.inc
@@ -0,0 +1,23 @@
+SecretBase_BrownCave3_EventObjects: @ 8538C98
+	object_event 1, 255, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_BrownCave3_MapWarps: @ 8538E00
+	warp_def 11, 9, 0, 126, MAP_NONE
+
+SecretBase_BrownCave3_MapEvents:: @ 8538E08
+	map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc
index 78ebb6fd8..8535b1e89 100644
--- a/data/maps/SecretBase_BrownCave3/header.inc
+++ b/data/maps/SecretBase_BrownCave3/header.inc
@@ -1,5 +1,5 @@
 SecretBase_BrownCave3: @ 8484BFC
-	.4byte SecretBase_BrownCave3_MapAttributes
+	.4byte SecretBase_BrownCave3_Layout
 	.4byte SecretBase_BrownCave3_MapEvents
 	.4byte SecretBase_BrownCave3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/scripts.inc
index 284262d91..284262d91 100644
--- a/data/scripts/maps/SecretBase_BrownCave3.inc
+++ b/data/maps/SecretBase_BrownCave3/scripts.inc
diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc
new file mode 100644
index 000000000..310033947
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave4/events.inc
@@ -0,0 +1,23 @@
+SecretBase_BrownCave4_EventObjects: @ 85395B0
+	object_event 1, 255, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_BrownCave4_MapWarps: @ 8539718
+	warp_def 2, 8, 0, 126, MAP_NONE
+
+SecretBase_BrownCave4_MapEvents:: @ 8539720
+	map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc
index 4d92c301c..d73f38257 100644
--- a/data/maps/SecretBase_BrownCave4/header.inc
+++ b/data/maps/SecretBase_BrownCave4/header.inc
@@ -1,5 +1,5 @@
 SecretBase_BrownCave4: @ 8484CA4
-	.4byte SecretBase_BrownCave4_MapAttributes
+	.4byte SecretBase_BrownCave4_Layout
 	.4byte SecretBase_BrownCave4_MapEvents
 	.4byte SecretBase_BrownCave4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/scripts.inc
index 84f685508..84f685508 100644
--- a/data/scripts/maps/SecretBase_BrownCave4.inc
+++ b/data/maps/SecretBase_BrownCave4/scripts.inc
diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc
new file mode 100644
index 000000000..eba992586
--- /dev/null
+++ b/data/maps/SecretBase_RedCave1/events.inc
@@ -0,0 +1,23 @@
+SecretBase_RedCave1_EventObjects: @ 85378E4
+	object_event 1, 255, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_RedCave1_MapWarps: @ 8537A4C
+	warp_def 5, 7, 0, 126, MAP_NONE
+
+SecretBase_RedCave1_MapEvents:: @ 8537A54
+	map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc
index 8e730661d..1cb6c4f5e 100644
--- a/data/maps/SecretBase_RedCave1/header.inc
+++ b/data/maps/SecretBase_RedCave1/header.inc
@@ -1,5 +1,5 @@
 SecretBase_RedCave1: @ 8484A90
-	.4byte SecretBase_RedCave1_MapAttributes
+	.4byte SecretBase_RedCave1_Layout
 	.4byte SecretBase_RedCave1_MapEvents
 	.4byte SecretBase_RedCave1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/scripts.inc
index f9c55a2b5..f9c55a2b5 100644
--- a/data/scripts/maps/SecretBase_RedCave1.inc
+++ b/data/maps/SecretBase_RedCave1/scripts.inc
diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc
new file mode 100644
index 000000000..c6f534965
--- /dev/null
+++ b/data/maps/SecretBase_RedCave2/events.inc
@@ -0,0 +1,23 @@
+SecretBase_RedCave2_EventObjects: @ 85381FC
+	object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_RedCave2_MapWarps: @ 8538364
+	warp_def 3, 14, 0, 126, MAP_NONE
+
+SecretBase_RedCave2_MapEvents:: @ 853836C
+	map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc
index b86e69ecf..744e8b24e 100644
--- a/data/maps/SecretBase_RedCave2/header.inc
+++ b/data/maps/SecretBase_RedCave2/header.inc
@@ -1,5 +1,5 @@
 SecretBase_RedCave2: @ 8484B38
-	.4byte SecretBase_RedCave2_MapAttributes
+	.4byte SecretBase_RedCave2_Layout
 	.4byte SecretBase_RedCave2_MapEvents
 	.4byte SecretBase_RedCave2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/scripts.inc
index e7e0c7ba5..e7e0c7ba5 100644
--- a/data/scripts/maps/SecretBase_RedCave2.inc
+++ b/data/maps/SecretBase_RedCave2/scripts.inc
diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc
new file mode 100644
index 000000000..dda054b44
--- /dev/null
+++ b/data/maps/SecretBase_RedCave3/events.inc
@@ -0,0 +1,23 @@
+SecretBase_RedCave3_EventObjects: @ 8538B14
+	object_event 1, 255, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_RedCave3_MapWarps: @ 8538C7C
+	warp_def 3, 6, 0, 126, MAP_NONE
+
+SecretBase_RedCave3_MapEvents:: @ 8538C84
+	map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc
index 9d4f26d36..c153e74c6 100644
--- a/data/maps/SecretBase_RedCave3/header.inc
+++ b/data/maps/SecretBase_RedCave3/header.inc
@@ -1,5 +1,5 @@
 SecretBase_RedCave3: @ 8484BE0
-	.4byte SecretBase_RedCave3_MapAttributes
+	.4byte SecretBase_RedCave3_Layout
 	.4byte SecretBase_RedCave3_MapEvents
 	.4byte SecretBase_RedCave3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/scripts.inc
index 512f7f92a..512f7f92a 100644
--- a/data/scripts/maps/SecretBase_RedCave3.inc
+++ b/data/maps/SecretBase_RedCave3/scripts.inc
diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc
new file mode 100644
index 000000000..54e33dc3d
--- /dev/null
+++ b/data/maps/SecretBase_RedCave4/events.inc
@@ -0,0 +1,23 @@
+SecretBase_RedCave4_EventObjects: @ 853942C
+	object_event 1, 255, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_RedCave4_MapWarps: @ 8539594
+	warp_def 2, 12, 0, 126, MAP_NONE
+
+SecretBase_RedCave4_MapEvents:: @ 853959C
+	map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc
index 163780567..be475a7ad 100644
--- a/data/maps/SecretBase_RedCave4/header.inc
+++ b/data/maps/SecretBase_RedCave4/header.inc
@@ -1,5 +1,5 @@
 SecretBase_RedCave4: @ 8484C88
-	.4byte SecretBase_RedCave4_MapAttributes
+	.4byte SecretBase_RedCave4_Layout
 	.4byte SecretBase_RedCave4_MapEvents
 	.4byte SecretBase_RedCave4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/scripts.inc
index 98e79f89f..98e79f89f 100644
--- a/data/scripts/maps/SecretBase_RedCave4.inc
+++ b/data/maps/SecretBase_RedCave4/scripts.inc
diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc
new file mode 100644
index 000000000..acdac9692
--- /dev/null
+++ b/data/maps/SecretBase_Shrub1/events.inc
@@ -0,0 +1,23 @@
+SecretBase_Shrub1_EventObjects: @ 8538078
+	object_event 1, 255, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_Shrub1_MapWarps: @ 85381E0
+	warp_def 5, 7, 0, 126, MAP_NONE
+
+SecretBase_Shrub1_MapEvents:: @ 85381E8
+	map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc
index 8f5fd7198..6ab9f9d94 100644
--- a/data/maps/SecretBase_Shrub1/header.inc
+++ b/data/maps/SecretBase_Shrub1/header.inc
@@ -1,5 +1,5 @@
 SecretBase_Shrub1: @ 8484B1C
-	.4byte SecretBase_Shrub1_MapAttributes
+	.4byte SecretBase_Shrub1_Layout
 	.4byte SecretBase_Shrub1_MapEvents
 	.4byte SecretBase_Shrub1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/scripts.inc
index 24b8685a0..24b8685a0 100644
--- a/data/scripts/maps/SecretBase_Shrub1.inc
+++ b/data/maps/SecretBase_Shrub1/scripts.inc
diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc
new file mode 100644
index 000000000..a370d2e72
--- /dev/null
+++ b/data/maps/SecretBase_Shrub2/events.inc
@@ -0,0 +1,23 @@
+SecretBase_Shrub2_EventObjects: @ 8538990
+	object_event 1, 255, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_Shrub2_MapWarps: @ 8538AF8
+	warp_def 7, 5, 0, 126, MAP_NONE
+
+SecretBase_Shrub2_MapEvents:: @ 8538B00
+	map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc
index 77b3ae833..760781e47 100644
--- a/data/maps/SecretBase_Shrub2/header.inc
+++ b/data/maps/SecretBase_Shrub2/header.inc
@@ -1,5 +1,5 @@
 SecretBase_Shrub2: @ 8484BC4
-	.4byte SecretBase_Shrub2_MapAttributes
+	.4byte SecretBase_Shrub2_Layout
 	.4byte SecretBase_Shrub2_MapEvents
 	.4byte SecretBase_Shrub2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/scripts.inc
index dad94f46d..dad94f46d 100644
--- a/data/scripts/maps/SecretBase_Shrub2.inc
+++ b/data/maps/SecretBase_Shrub2/scripts.inc
diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc
new file mode 100644
index 000000000..942be3617
--- /dev/null
+++ b/data/maps/SecretBase_Shrub3/events.inc
@@ -0,0 +1,23 @@
+SecretBase_Shrub3_EventObjects: @ 85392A8
+	object_event 1, 255, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_Shrub3_MapWarps: @ 8539410
+	warp_def 6, 9, 0, 126, MAP_NONE
+
+SecretBase_Shrub3_MapEvents:: @ 8539418
+	map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc
index 7fb14ec94..cef2a4597 100644
--- a/data/maps/SecretBase_Shrub3/header.inc
+++ b/data/maps/SecretBase_Shrub3/header.inc
@@ -1,5 +1,5 @@
 SecretBase_Shrub3: @ 8484C6C
-	.4byte SecretBase_Shrub3_MapAttributes
+	.4byte SecretBase_Shrub3_Layout
 	.4byte SecretBase_Shrub3_MapEvents
 	.4byte SecretBase_Shrub3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/scripts.inc
index 22c67c939..22c67c939 100644
--- a/data/scripts/maps/SecretBase_Shrub3.inc
+++ b/data/maps/SecretBase_Shrub3/scripts.inc
diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc
new file mode 100644
index 000000000..a027b266b
--- /dev/null
+++ b/data/maps/SecretBase_Shrub4/events.inc
@@ -0,0 +1,23 @@
+SecretBase_Shrub4_EventObjects: @ 8539BC0
+	object_event 1, 255, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_Shrub4_MapWarps: @ 8539D28
+	warp_def 11, 8, 0, 126, MAP_NONE
+
+SecretBase_Shrub4_MapEvents:: @ 8539D30
+	map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc
index 10a4d4ca4..12fa26c3c 100644
--- a/data/maps/SecretBase_Shrub4/header.inc
+++ b/data/maps/SecretBase_Shrub4/header.inc
@@ -1,5 +1,5 @@
 SecretBase_Shrub4: @ 8484D14
-	.4byte SecretBase_Shrub4_MapAttributes
+	.4byte SecretBase_Shrub4_Layout
 	.4byte SecretBase_Shrub4_MapEvents
 	.4byte SecretBase_Shrub4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/scripts.inc
index 1a9952232..1a9952232 100644
--- a/data/scripts/maps/SecretBase_Shrub4.inc
+++ b/data/maps/SecretBase_Shrub4/scripts.inc
diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc
new file mode 100644
index 000000000..3379e8ecb
--- /dev/null
+++ b/data/maps/SecretBase_Tree1/events.inc
@@ -0,0 +1,23 @@
+SecretBase_Tree1_EventObjects: @ 8537EF4
+	object_event 1, 255, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_Tree1_MapWarps: @ 853805C
+	warp_def 5, 7, 0, 126, MAP_NONE
+
+SecretBase_Tree1_MapEvents:: @ 8538064
+	map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc
index 157173fbb..c5b5a2aed 100644
--- a/data/maps/SecretBase_Tree1/header.inc
+++ b/data/maps/SecretBase_Tree1/header.inc
@@ -1,5 +1,5 @@
 SecretBase_Tree1: @ 8484B00
-	.4byte SecretBase_Tree1_MapAttributes
+	.4byte SecretBase_Tree1_Layout
 	.4byte SecretBase_Tree1_MapEvents
 	.4byte SecretBase_Tree1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/scripts.inc
index 7e7704d6a..7e7704d6a 100644
--- a/data/scripts/maps/SecretBase_Tree1.inc
+++ b/data/maps/SecretBase_Tree1/scripts.inc
diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc
new file mode 100644
index 000000000..e330951cf
--- /dev/null
+++ b/data/maps/SecretBase_Tree2/events.inc
@@ -0,0 +1,23 @@
+SecretBase_Tree2_EventObjects: @ 853880C
+	object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_Tree2_MapWarps: @ 8538974
+	warp_def 3, 14, 0, 126, MAP_NONE
+
+SecretBase_Tree2_MapEvents:: @ 853897C
+	map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc
index 6708af92b..ddea5c0bc 100644
--- a/data/maps/SecretBase_Tree2/header.inc
+++ b/data/maps/SecretBase_Tree2/header.inc
@@ -1,5 +1,5 @@
 SecretBase_Tree2: @ 8484BA8
-	.4byte SecretBase_Tree2_MapAttributes
+	.4byte SecretBase_Tree2_Layout
 	.4byte SecretBase_Tree2_MapEvents
 	.4byte SecretBase_Tree2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/scripts.inc
index b30a6ec74..b30a6ec74 100644
--- a/data/scripts/maps/SecretBase_Tree2.inc
+++ b/data/maps/SecretBase_Tree2/scripts.inc
diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc
new file mode 100644
index 000000000..b4a8c2eb3
--- /dev/null
+++ b/data/maps/SecretBase_Tree3/events.inc
@@ -0,0 +1,23 @@
+SecretBase_Tree3_EventObjects: @ 8539124
+	object_event 1, 255, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_Tree3_MapWarps: @ 853928C
+	warp_def 8, 6, 0, 126, MAP_NONE
+
+SecretBase_Tree3_MapEvents:: @ 8539294
+	map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc
index fd0c56856..630dbb6e3 100644
--- a/data/maps/SecretBase_Tree3/header.inc
+++ b/data/maps/SecretBase_Tree3/header.inc
@@ -1,5 +1,5 @@
 SecretBase_Tree3: @ 8484C50
-	.4byte SecretBase_Tree3_MapAttributes
+	.4byte SecretBase_Tree3_Layout
 	.4byte SecretBase_Tree3_MapEvents
 	.4byte SecretBase_Tree3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/scripts.inc
index 9512bbb80..9512bbb80 100644
--- a/data/scripts/maps/SecretBase_Tree3.inc
+++ b/data/maps/SecretBase_Tree3/scripts.inc
diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc
new file mode 100644
index 000000000..4c57fcdfd
--- /dev/null
+++ b/data/maps/SecretBase_Tree4/events.inc
@@ -0,0 +1,23 @@
+SecretBase_Tree4_EventObjects: @ 8539A3C
+	object_event 1, 255, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_Tree4_MapWarps: @ 8539BA4
+	warp_def 7, 12, 0, 126, MAP_NONE
+
+SecretBase_Tree4_MapEvents:: @ 8539BAC
+	map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc
index c2f0b3350..bc6f84664 100644
--- a/data/maps/SecretBase_Tree4/header.inc
+++ b/data/maps/SecretBase_Tree4/header.inc
@@ -1,5 +1,5 @@
 SecretBase_Tree4: @ 8484CF8
-	.4byte SecretBase_Tree4_MapAttributes
+	.4byte SecretBase_Tree4_Layout
 	.4byte SecretBase_Tree4_MapEvents
 	.4byte SecretBase_Tree4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/scripts.inc
index 62f41627f..62f41627f 100644
--- a/data/scripts/maps/SecretBase_Tree4.inc
+++ b/data/maps/SecretBase_Tree4/scripts.inc
diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc
new file mode 100644
index 000000000..e7f4ed7ce
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave1/events.inc
@@ -0,0 +1,23 @@
+SecretBase_YellowCave1_EventObjects: @ 8537D70
+	object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_YellowCave1_MapWarps: @ 8537ED8
+	warp_def 5, 7, 0, 126, MAP_NONE
+
+SecretBase_YellowCave1_MapEvents:: @ 8537EE0
+	map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc
index 77a446dbd..9a6ae5438 100644
--- a/data/maps/SecretBase_YellowCave1/header.inc
+++ b/data/maps/SecretBase_YellowCave1/header.inc
@@ -1,5 +1,5 @@
 SecretBase_YellowCave1: @ 8484AE4
-	.4byte SecretBase_YellowCave1_MapAttributes
+	.4byte SecretBase_YellowCave1_Layout
 	.4byte SecretBase_YellowCave1_MapEvents
 	.4byte SecretBase_YellowCave1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/scripts.inc
index fa56be0eb..fa56be0eb 100644
--- a/data/scripts/maps/SecretBase_YellowCave1.inc
+++ b/data/maps/SecretBase_YellowCave1/scripts.inc
diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc
new file mode 100644
index 000000000..84aabf3d4
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave2/events.inc
@@ -0,0 +1,23 @@
+SecretBase_YellowCave2_EventObjects: @ 8538688
+	object_event 1, 255, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_YellowCave2_MapWarps: @ 85387F0
+	warp_def 12, 7, 0, 126, MAP_NONE
+
+SecretBase_YellowCave2_MapEvents:: @ 85387F8
+	map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc
index ae9200fc1..da1949abe 100644
--- a/data/maps/SecretBase_YellowCave2/header.inc
+++ b/data/maps/SecretBase_YellowCave2/header.inc
@@ -1,5 +1,5 @@
 SecretBase_YellowCave2: @ 8484B8C
-	.4byte SecretBase_YellowCave2_MapAttributes
+	.4byte SecretBase_YellowCave2_Layout
 	.4byte SecretBase_YellowCave2_MapEvents
 	.4byte SecretBase_YellowCave2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/scripts.inc
index 86c3c876f..86c3c876f 100644
--- a/data/scripts/maps/SecretBase_YellowCave2.inc
+++ b/data/maps/SecretBase_YellowCave2/scripts.inc
diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc
new file mode 100644
index 000000000..2e1d61708
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave3/events.inc
@@ -0,0 +1,23 @@
+SecretBase_YellowCave3_EventObjects: @ 8538FA0
+	object_event 1, 255, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_YellowCave3_MapWarps: @ 8539108
+	warp_def 5, 9, 0, 126, MAP_NONE
+
+SecretBase_YellowCave3_MapEvents:: @ 8539110
+	map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc
index d63751987..8bfeff0f5 100644
--- a/data/maps/SecretBase_YellowCave3/header.inc
+++ b/data/maps/SecretBase_YellowCave3/header.inc
@@ -1,5 +1,5 @@
 SecretBase_YellowCave3: @ 8484C34
-	.4byte SecretBase_YellowCave3_MapAttributes
+	.4byte SecretBase_YellowCave3_Layout
 	.4byte SecretBase_YellowCave3_MapEvents
 	.4byte SecretBase_YellowCave3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/scripts.inc
index 26311e6c5..26311e6c5 100644
--- a/data/scripts/maps/SecretBase_YellowCave3.inc
+++ b/data/maps/SecretBase_YellowCave3/scripts.inc
diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc
new file mode 100644
index 000000000..07ac363ac
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave4/events.inc
@@ -0,0 +1,23 @@
+SecretBase_YellowCave4_EventObjects: @ 85398B8
+	object_event 1, 255, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_YellowCave4_MapWarps: @ 8539A20
+	warp_def 6, 12, 0, 126, MAP_NONE
+
+SecretBase_YellowCave4_MapEvents:: @ 8539A28
+	map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc
index 1a5c43da5..baf6b7d89 100644
--- a/data/maps/SecretBase_YellowCave4/header.inc
+++ b/data/maps/SecretBase_YellowCave4/header.inc
@@ -1,5 +1,5 @@
 SecretBase_YellowCave4: @ 8484CDC
-	.4byte SecretBase_YellowCave4_MapAttributes
+	.4byte SecretBase_YellowCave4_Layout
 	.4byte SecretBase_YellowCave4_MapEvents
 	.4byte SecretBase_YellowCave4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/scripts.inc
index 32da39388..32da39388 100644
--- a/data/scripts/maps/SecretBase_YellowCave4.inc
+++ b/data/maps/SecretBase_YellowCave4/scripts.inc
diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc
index e04abe693..e04abe693 100644
--- a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
index 5694fead4..2f3f34b43 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
@@ -1,5 +1,5 @@
 ShoalCave_HighTideEntranceRoom: @ 8484438
-	.4byte ShoalCave_HighTideEntranceRoom_MapAttributes
+	.4byte ShoalCave_HighTideEntranceRoom_Layout
 	.4byte ShoalCave_HighTideEntranceRoom_MapEvents
 	.4byte ShoalCave_HighTideEntranceRoom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc
index d2a93f8e9..d2a93f8e9 100644
--- a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc
diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc
index 20d59a56f..20d59a56f 100644
--- a/data/maps/events/ShoalCave_HighTideInnerRoom.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/events.inc
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
index a6fd687b2..673bc6bec 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
@@ -1,5 +1,5 @@
 ShoalCave_HighTideInnerRoom: @ 8484454
-	.4byte ShoalCave_HighTideInnerRoom_MapAttributes
+	.4byte ShoalCave_HighTideInnerRoom_Layout
 	.4byte ShoalCave_HighTideInnerRoom_MapEvents
 	.4byte ShoalCave_HighTideInnerRoom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc
index 6045f80a6..6045f80a6 100644
--- a/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
new file mode 100644
index 000000000..1f4a008e3
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
@@ -0,0 +1,13 @@
+ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, 9, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0
+
+ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC
+	warp_def 20, 30, 3, 0, MAP_ROUTE125
+	warp_def 19, 5, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+	warp_def 6, 2, 3, 6, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+	warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+
+ShoalCave_LowTideEntranceRoom_MapEvents:: @ 85362CC
+	map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
index b109f1f4b..c742d2b8c 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideEntranceRoom: @ 84843C8
-	.4byte ShoalCave_LowTideEntranceRoom_MapAttributes
+	.4byte ShoalCave_LowTideEntranceRoom_Layout
 	.4byte ShoalCave_LowTideEntranceRoom_MapEvents
 	.4byte ShoalCave_LowTideEntranceRoom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
index f57a27c1d..f57a27c1d 100644
--- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc
new file mode 100644
index 000000000..57922e322
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc
@@ -0,0 +1,10 @@
+ShoalCave_LowTideIceRoom_EventObjects: @ 8537100
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113
+
+ShoalCave_LowTideIceRoom_MapWarps: @ 8537130
+	warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
+
+ShoalCave_LowTideIceRoom_MapEvents:: @ 8537138
+	map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc
index 6a34db69e..6571068ce 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideIceRoom: @ 84847D4
-	.4byte ShoalCave_LowTideIceRoom_MapAttributes
+	.4byte ShoalCave_LowTideIceRoom_Layout
 	.4byte ShoalCave_LowTideIceRoom_MapEvents
 	.4byte ShoalCave_LowTideIceRoom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc
index 3f7a5cce8..3f7a5cce8 100644
--- a/data/scripts/maps/ShoalCave_LowTideIceRoom.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc
new file mode 100644
index 000000000..f1d894264
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc
@@ -0,0 +1,24 @@
+ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, 1, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082
+
+ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8
+	warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
+	warp_def 38, 15, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM
+	warp_def 42, 4, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM
+	warp_def 19, 14, 4, 0, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
+	warp_def 15, 19, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
+	warp_def 30, 25, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
+	warp_def 14, 33, 5, 2, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
+	warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
+
+ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338
+	bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23708C
+	bg_event 14, 26, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2370C8
+	bg_event 41, 20, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_236FBA
+	bg_event 41, 10, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_236FF6
+	bg_event 6, 9, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_237028
+	bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23705A
+
+ShoalCave_LowTideInnerRoom_MapEvents:: @ 8536380
+	map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents
+
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
index cf40979a5..b6de02c7d 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideInnerRoom: @ 84843E4
-	.4byte ShoalCave_LowTideInnerRoom_MapAttributes
+	.4byte ShoalCave_LowTideInnerRoom_Layout
 	.4byte ShoalCave_LowTideInnerRoom_MapEvents
 	.4byte ShoalCave_LowTideInnerRoom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
index 94505a96d..94505a96d 100644
--- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc
new file mode 100644
index 000000000..d3d656452
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc
@@ -0,0 +1,16 @@
+ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, 1, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, 2, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0
+
+ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C
+	warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+	warp_def 2, 6, 3, 4, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+	warp_def 19, 11, 3, 5, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+	warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM
+
+ShoalCave_LowTideLowerRoom_MapBGEvents: @ 853642C
+	bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_237176
+
+ShoalCave_LowTideLowerRoom_MapEvents:: @ 8536438
+	map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents
+
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
index abc2554de..719a92c3e 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideLowerRoom: @ 848441C
-	.4byte ShoalCave_LowTideLowerRoom_MapAttributes
+	.4byte ShoalCave_LowTideLowerRoom_Layout
 	.4byte ShoalCave_LowTideLowerRoom_MapEvents
 	.4byte ShoalCave_LowTideLowerRoom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
index 9883bf3da..9883bf3da 100644
--- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc
new file mode 100644
index 000000000..875f337a5
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc
@@ -0,0 +1,13 @@
+ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083
+
+ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC
+	warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+	warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+
+ShoalCave_LowTideStairsRoom_MapBGEvents: @ 85363BC
+	bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_23711A
+
+ShoalCave_LowTideStairsRoom_MapEvents:: @ 85363C8
+	map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents
+
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
index aff87bf3d..74d0ec94f 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideStairsRoom: @ 8484400
-	.4byte ShoalCave_LowTideStairsRoom_MapAttributes
+	.4byte ShoalCave_LowTideStairsRoom_Layout
 	.4byte ShoalCave_LowTideStairsRoom_MapEvents
 	.4byte ShoalCave_LowTideStairsRoom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
index e8c87bd98..e8c87bd98 100644
--- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc
new file mode 100644
index 000000000..4ef0de89f
--- /dev/null
+++ b/data/maps/SingleBattleColosseum/events.inc
@@ -0,0 +1,14 @@
+SingleBattleColosseum_EventObjects: @ 8539D44
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0
+
+SingleBattleColosseum_MapWarps: @ 8539D5C
+	warp_def 6, 8, 3, 127, MAP_NONE
+	warp_def 7, 8, 3, 127, MAP_NONE
+
+SingleBattleColosseum_MapCoordEvents: @ 8539D6C
+	coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277374
+	coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827737E
+
+SingleBattleColosseum_MapEvents:: @ 8539D8C
+	map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0
+
diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc
index d5be84526..54d003c27 100644
--- a/data/maps/SingleBattleColosseum/header.inc
+++ b/data/maps/SingleBattleColosseum/header.inc
@@ -1,5 +1,5 @@
 SingleBattleColosseum: @ 8484D30
-	.4byte SingleBattleColosseum_MapAttributes
+	.4byte SingleBattleColosseum_Layout
 	.4byte SingleBattleColosseum_MapEvents
 	.4byte SingleBattleColosseum_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/scripts.inc
index 06ed3ef16..06ed3ef16 100644
--- a/data/scripts/maps/SingleBattleColosseum.inc
+++ b/data/maps/SingleBattleColosseum/scripts.inc
diff --git a/data/maps/SkyPillar_1F/events.inc b/data/maps/SkyPillar_1F/events.inc
new file mode 100644
index 000000000..59ac1aac0
--- /dev/null
+++ b/data/maps/SkyPillar_1F/events.inc
@@ -0,0 +1,8 @@
+SkyPillar_1F_MapWarps: @ 8537058
+	warp_def 6, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE
+	warp_def 7, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE
+	warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_2F
+
+SkyPillar_1F_MapEvents:: @ 8537070
+	map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc
index 4ec895011..3a47df473 100644
--- a/data/maps/SkyPillar_1F/header.inc
+++ b/data/maps/SkyPillar_1F/header.inc
@@ -1,5 +1,5 @@
 SkyPillar_1F: @ 8484764
-	.4byte SkyPillar_1F_MapAttributes
+	.4byte SkyPillar_1F_Layout
 	.4byte SkyPillar_1F_MapEvents
 	.4byte SkyPillar_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/scripts.inc
index 6afc5aa64..6afc5aa64 100644
--- a/data/scripts/maps/SkyPillar_1F.inc
+++ b/data/maps/SkyPillar_1F/scripts.inc
diff --git a/data/maps/SkyPillar_2F/events.inc b/data/maps/SkyPillar_2F/events.inc
new file mode 100644
index 000000000..780db9ccc
--- /dev/null
+++ b/data/maps/SkyPillar_2F/events.inc
@@ -0,0 +1,7 @@
+SkyPillar_2F_MapWarps: @ 8537084
+	warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F
+	warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F
+
+SkyPillar_2F_MapEvents:: @ 8537094
+	map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc
index acdc054e4..a1cc8fb8f 100644
--- a/data/maps/SkyPillar_2F/header.inc
+++ b/data/maps/SkyPillar_2F/header.inc
@@ -1,5 +1,5 @@
 SkyPillar_2F: @ 8484780
-	.4byte SkyPillar_2F_MapAttributes
+	.4byte SkyPillar_2F_Layout
 	.4byte SkyPillar_2F_MapEvents
 	.4byte SkyPillar_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc
new file mode 100644
index 000000000..c15f1f8c4
--- /dev/null
+++ b/data/maps/SkyPillar_2F/scripts.inc
@@ -0,0 +1,21 @@
+SkyPillar_2F_MapScripts:: @ 823962B
+	map_script 2, SkyPillar_2F_MapScript2_2A8327
+	map_script 3, SkyPillar_2F_MapScript1_23963B
+	map_script 5, SkyPillar_2F_MapScript1_239650
+	.byte 0
+
+SkyPillar_2F_MapScript1_23963B: @ 823963B
+	compare VAR_0x40CA, 2
+	call_if 0, SkyPillar_2F_EventScript_23964C
+	copyvar VAR_ICE_STEP_COUNT, 0x1
+	end
+
+SkyPillar_2F_EventScript_23964C:: @ 823964C
+	setmaplayoutindex 434
+	return
+
+SkyPillar_2F_MapScript1_239650: @ 8239650
+	setstepcallback 7
+	setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0
+	end
+
diff --git a/data/maps/SkyPillar_3F/events.inc b/data/maps/SkyPillar_3F/events.inc
new file mode 100644
index 000000000..2e7697395
--- /dev/null
+++ b/data/maps/SkyPillar_3F/events.inc
@@ -0,0 +1,8 @@
+SkyPillar_3F_MapWarps: @ 85370A8
+	warp_def 3, 1, 3, 1, MAP_SKY_PILLAR_2F
+	warp_def 11, 1, 3, 0, MAP_SKY_PILLAR_4F
+	warp_def 7, 1, 3, 1, MAP_SKY_PILLAR_4F
+
+SkyPillar_3F_MapEvents:: @ 85370C0
+	map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc
index 21ac1c545..81ac3046d 100644
--- a/data/maps/SkyPillar_3F/header.inc
+++ b/data/maps/SkyPillar_3F/header.inc
@@ -1,5 +1,5 @@
 SkyPillar_3F: @ 848479C
-	.4byte SkyPillar_3F_MapAttributes
+	.4byte SkyPillar_3F_Layout
 	.4byte SkyPillar_3F_MapEvents
 	.4byte SkyPillar_3F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/scripts.inc
index 0ddae05b2..0ddae05b2 100644
--- a/data/scripts/maps/SkyPillar_3F.inc
+++ b/data/maps/SkyPillar_3F/scripts.inc
diff --git a/data/maps/SkyPillar_4F/events.inc b/data/maps/SkyPillar_4F/events.inc
new file mode 100644
index 000000000..248e36f95
--- /dev/null
+++ b/data/maps/SkyPillar_4F/events.inc
@@ -0,0 +1,8 @@
+SkyPillar_4F_MapWarps: @ 85370D4
+	warp_def 11, 1, 3, 1, MAP_SKY_PILLAR_3F
+	warp_def 7, 1, 3, 2, MAP_SKY_PILLAR_3F
+	warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_5F
+
+SkyPillar_4F_MapEvents:: @ 85370EC
+	map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc
index 977442c27..10a68ddc2 100644
--- a/data/maps/SkyPillar_4F/header.inc
+++ b/data/maps/SkyPillar_4F/header.inc
@@ -1,5 +1,5 @@
 SkyPillar_4F: @ 84847B8
-	.4byte SkyPillar_4F_MapAttributes
+	.4byte SkyPillar_4F_Layout
 	.4byte SkyPillar_4F_MapEvents
 	.4byte SkyPillar_4F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc
new file mode 100644
index 000000000..3884864d7
--- /dev/null
+++ b/data/maps/SkyPillar_4F/scripts.inc
@@ -0,0 +1,21 @@
+SkyPillar_4F_MapScripts:: @ 8239671
+	map_script 2, SkyPillar_4F_MapScript2_2A8327
+	map_script 3, SkyPillar_4F_MapScript1_239681
+	map_script 5, SkyPillar_4F_MapScript1_239696
+	.byte 0
+
+SkyPillar_4F_MapScript1_239681: @ 8239681
+	compare VAR_0x40CA, 2
+	call_if 0, SkyPillar_4F_EventScript_239692
+	copyvar VAR_ICE_STEP_COUNT, 0x1
+	end
+
+SkyPillar_4F_EventScript_239692:: @ 8239692
+	setmaplayoutindex 436
+	return
+
+SkyPillar_4F_MapScript1_239696: @ 8239696
+	setstepcallback 7
+	setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0
+	end
+
diff --git a/data/maps/SkyPillar_5F/events.inc b/data/maps/SkyPillar_5F/events.inc
new file mode 100644
index 000000000..c0acb14c0
--- /dev/null
+++ b/data/maps/SkyPillar_5F/events.inc
@@ -0,0 +1,7 @@
+SkyPillar_5F_MapWarps: @ 853714C
+	warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F
+	warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP
+
+SkyPillar_5F_MapEvents:: @ 853715C
+	map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc
index 1df2963b5..bb38a2d5d 100644
--- a/data/maps/SkyPillar_5F/header.inc
+++ b/data/maps/SkyPillar_5F/header.inc
@@ -1,5 +1,5 @@
 SkyPillar_5F: @ 84847F0
-	.4byte SkyPillar_5F_MapAttributes
+	.4byte SkyPillar_5F_Layout
 	.4byte SkyPillar_5F_MapEvents
 	.4byte SkyPillar_5F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/scripts.inc
index 8e08fb2bd..8e08fb2bd 100644
--- a/data/scripts/maps/SkyPillar_5F.inc
+++ b/data/maps/SkyPillar_5F/scripts.inc
diff --git a/data/maps/SkyPillar_Entrance/events.inc b/data/maps/SkyPillar_Entrance/events.inc
new file mode 100644
index 000000000..92cf0da9b
--- /dev/null
+++ b/data/maps/SkyPillar_Entrance/events.inc
@@ -0,0 +1,7 @@
+SkyPillar_Entrance_MapWarps: @ 8536FF8
+	warp_def 6, 16, 3, 0, MAP_ROUTE131
+	warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE
+
+SkyPillar_Entrance_MapEvents:: @ 8537008
+	map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc
index b6b697d46..8031521e9 100644
--- a/data/maps/SkyPillar_Entrance/header.inc
+++ b/data/maps/SkyPillar_Entrance/header.inc
@@ -1,5 +1,5 @@
 SkyPillar_Entrance: @ 848472C
-	.4byte SkyPillar_Entrance_MapAttributes
+	.4byte SkyPillar_Entrance_Layout
 	.4byte SkyPillar_Entrance_MapEvents
 	.4byte SkyPillar_Entrance_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/scripts.inc
index 09ee9eae2..09ee9eae2 100644
--- a/data/scripts/maps/SkyPillar_Entrance.inc
+++ b/data/maps/SkyPillar_Entrance/scripts.inc
diff --git a/data/maps/SkyPillar_Outside/events.inc b/data/maps/SkyPillar_Outside/events.inc
new file mode 100644
index 000000000..4fb4cc010
--- /dev/null
+++ b/data/maps/SkyPillar_Outside/events.inc
@@ -0,0 +1,10 @@
+SkyPillar_Outside_EventObjects: @ 853701C
+	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, 8, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855
+
+SkyPillar_Outside_MapWarps: @ 8537034
+	warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE
+	warp_def 14, 5, 0, 0, MAP_SKY_PILLAR_1F
+
+SkyPillar_Outside_MapEvents:: @ 8537044
+	map_events SkyPillar_Outside_EventObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc
index 49c5c14e1..38bb57bae 100644
--- a/data/maps/SkyPillar_Outside/header.inc
+++ b/data/maps/SkyPillar_Outside/header.inc
@@ -1,5 +1,5 @@
 SkyPillar_Outside: @ 8484748
-	.4byte SkyPillar_Outside_MapAttributes
+	.4byte SkyPillar_Outside_Layout
 	.4byte SkyPillar_Outside_MapEvents
 	.4byte SkyPillar_Outside_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/scripts.inc
index e9fbf4ad6..e9fbf4ad6 100644
--- a/data/scripts/maps/SkyPillar_Outside.inc
+++ b/data/maps/SkyPillar_Outside/scripts.inc
diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc
new file mode 100644
index 000000000..26bccf67f
--- /dev/null
+++ b/data/maps/SkyPillar_Top/events.inc
@@ -0,0 +1,13 @@
+SkyPillar_Top_EventObjects: @ 8537170
+	object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, 8, 1, 1, 0, 0, 0x0, 773
+	object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, 8, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, 80
+
+SkyPillar_Top_MapWarps: @ 85371A0
+	warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F
+
+SkyPillar_Top_MapCoordEvents: @ 85371A8
+	coord_event 14, 9, 3, 0, VAR_0x40D7, 0, 0, SkyPillar_Top_EventScript_23979A
+
+SkyPillar_Top_MapEvents:: @ 85371B8
+	map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0
+
diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc
index 97fb4edf4..3836ab067 100644
--- a/data/maps/SkyPillar_Top/header.inc
+++ b/data/maps/SkyPillar_Top/header.inc
@@ -1,5 +1,5 @@
 SkyPillar_Top: @ 848480C
-	.4byte SkyPillar_Top_MapAttributes
+	.4byte SkyPillar_Top_Layout
 	.4byte SkyPillar_Top_MapEvents
 	.4byte SkyPillar_Top_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/scripts.inc
index 334acc8ac..334acc8ac 100644
--- a/data/scripts/maps/SkyPillar_Top.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc
index d8544954a..1485b313b 100644
--- a/data/maps/SlateportCity/connections.inc
+++ b/data/maps/SlateportCity/connections.inc
@@ -1,7 +1,7 @@
 SlateportCity_MapConnectionsList: @ 84866F4
-	connection up, 0, ROUTE_110, 0
-	connection down, 0, ROUTE_109, 0
-	connection right, 0, ROUTE_134, 0
+	connection up, 0, MAP_ROUTE110
+	connection down, 0, MAP_ROUTE109
+	connection right, 0, MAP_ROUTE134
 
 SlateportCity_MapConnections: @ 8486718
 	.4byte 0x3
diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc
new file mode 100644
index 000000000..b8480dfb6
--- /dev/null
+++ b/data/maps/SlateportCity/events.inc
@@ -0,0 +1,71 @@
+SlateportCity_EventObjects: @ 85261CC
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_1DCED9, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 5, 13, 3, 2, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882
+	object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, 1, 1, 1, 0, 0, SlateportCity_EventScript_1DCE63, 0
+	object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_1DCE84, 0
+	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835
+	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835
+	object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840
+	object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0
+	object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_1DCFF7, 0
+	object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_1DD000, 0
+	object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_1DCFBB, 0
+	object_event 17, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0
+	object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882
+	object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882
+	object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0
+	object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0
+	object_event 22, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0
+	object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, 948
+	object_event 25, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_1DCDBD, 0
+	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, 882
+	object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, 882
+	object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, 882
+	object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, 882
+	object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, 882
+	object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, 882
+	object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, 882
+	object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, 882
+	object_event 34, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 37, 3, 9, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0
+	object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, 8, 1, 2, 0, 0, 0x0, 749
+
+SlateportCity_MapWarps: @ 8526514
+	warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F
+	warp_def 13, 26, 0, 0, MAP_SLATEPORT_CITY_MART
+	warp_def 26, 38, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F
+	warp_def 10, 12, 0, 0, MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY
+	warp_def 4, 26, 0, 0, MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB
+	warp_def 30, 26, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
+	warp_def 5, 19, 0, 0, MAP_SLATEPORT_CITY_HOUSE1
+	warp_def 31, 26, 0, 1, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
+	warp_def 28, 12, 0, 0, MAP_SLATEPORT_CITY_HARBOR
+	warp_def 40, 7, 0, 2, MAP_SLATEPORT_CITY_HARBOR
+	warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2
+
+SlateportCity_MapCoordEvents: @ 852656C
+	coord_event 10, 13, 3, 0, VAR_0x40D2, 2, 0, SlateportCity_EventScript_1DD5DC
+
+SlateportCity_MapBGEvents: @ 852657C
+	bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_1DCFB2
+	bg_event 20, 19, 0, 1, 0, SlateportCity_EventScript_271E73
+	bg_event 21, 19, 0, 1, 0, SlateportCity_EventScript_271E73
+	bg_event 14, 26, 0, 1, 0, SlateportCity_EventScript_271E6A
+	bg_event 24, 12, 0, 0, 0, SlateportCity_EventScript_1DCF94
+	bg_event 15, 26, 0, 1, 0, SlateportCity_EventScript_271E6A
+	bg_event 14, 51, 0, 0, 0, SlateportCity_EventScript_1DCF8B
+	bg_event 26, 26, 0, 0, 0, SlateportCity_EventScript_1DCF79
+	bg_event 16, 22, 0, 0, 0, SlateportCity_EventScript_1DCF82
+	bg_event 8, 26, 0, 0, 0, SlateportCity_EventScript_1DCF70
+	bg_event 7, 13, 0, 0, 0, SlateportCity_EventScript_1DCF36
+	bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_1DCF3F
+	bg_event 10, 36, 0, 1, 0, SlateportCity_EventScript_1DD643
+
+SlateportCity_MapEvents:: @ 8526618
+	map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents
+
diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc
index 0ff430ff2..7ac123723 100644
--- a/data/maps/SlateportCity/header.inc
+++ b/data/maps/SlateportCity/header.inc
@@ -1,5 +1,5 @@
 SlateportCity: @ 84824D4
-	.4byte SlateportCity_MapAttributes
+	.4byte SlateportCity_Layout
 	.4byte SlateportCity_MapEvents
 	.4byte SlateportCity_MapScripts
 	.4byte SlateportCity_MapConnections
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
new file mode 100644
index 000000000..9a5e41b15
--- /dev/null
+++ b/data/maps/SlateportCity/scripts.inc
@@ -0,0 +1,1383 @@
+SlateportCity_MapScripts:: @ 81DCC61
+	map_script 3, SlateportCity_MapScript1_1DCC6C
+	map_script 2, SlateportCity_MapScript2_1DCD12
+	.byte 0
+
+SlateportCity_MapScript1_1DCC6C: @ 81DCC6C
+	setvar VAR_0x40AA, 0
+	call SlateportCity_EventScript_1DCC8D
+	compare VAR_0x4058, 1
+	call_if 1, SlateportCity_EventScript_1DCC99
+	compare VAR_0x40D2, 1
+	call_if 1, SlateportCity_EventScript_1DCCE7
+	end
+
+SlateportCity_EventScript_1DCC8D:: @ 81DCC8D
+	setflag FLAG_VISITED_SLATEPORT_CITY
+	setvar VAR_0x4086, 0
+	setflag FLAG_0x323
+	return
+
+SlateportCity_EventScript_1DCC99:: @ 81DCC99
+	setobjectxyperm 11, 28, 13
+	setobjectxyperm 7, 25, 13
+	setobjectxyperm 3, 25, 14
+	setobjectxyperm 6, 27, 16
+	setobjectxyperm 8, 28, 16
+	setobjectxyperm 1, 29, 16
+	setobjectxyperm 2, 31, 14
+	setobjectmovementtype 11, 8
+	setobjectmovementtype 7, 18
+	setobjectmovementtype 3, 16
+	setobjectmovementtype 6, 7
+	setobjectmovementtype 8, 7
+	setobjectmovementtype 1, 7
+	setobjectmovementtype 2, 9
+	return
+
+SlateportCity_EventScript_1DCCE7:: @ 81DCCE7
+	setflag FLAG_SPECIAL_FLAG_0x4000
+	getplayerxy VAR_0x8004, VAR_0x8005
+	compare VAR_0x8004, 30
+	goto_eq SlateportCity_EventScript_1DCD06
+	setobjectxyperm 35, 23, 27
+	setobjectmovementtype 35, 10
+	return
+
+SlateportCity_EventScript_1DCD06:: @ 81DCD06
+	setobjectxyperm 35, 22, 27
+	setobjectmovementtype 35, 10
+	return
+
+SlateportCity_MapScript2_1DCD12: @ 81DCD12
+	map_script_2 VAR_0x40D2, 1, SlateportCity_EventScript_1DCD1C
+	.2byte 0
+
+SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
+	lockall
+	addobject 35
+	applymovement 255, SlateportCity_Movement_1DCDA8
+	applymovement 35, SlateportCity_Movement_1DCDAC
+	waitmovement 0
+	msgbox SlateportCity_Text_1DF032, 4
+	closemessage
+	applymovement 35, SlateportCity_Movement_2725A4
+	waitmovement 0
+	delay 60
+	msgbox SlateportCity_Text_1DF0FE, 4
+	applymovement 35, SlateportCity_Movement_2725A8
+	waitmovement 0
+	msgbox SlateportCity_Text_1DF12B, 4
+	closemessage
+	delay 30
+	playfanfare MUS_ME_TORE_EYE
+	msgbox SlateportCity_Text_1DF1A6, 4
+	waitfanfare
+	closemessage
+	delay 30
+	setflag FLAG_0x0D7
+	msgbox SlateportCity_Text_1DF1D3, 4
+	closemessage
+	applymovement 35, SlateportCity_Movement_1DCDB4
+	waitmovement 0
+	removeobject 35
+	setobjectxyperm 35, 10, 12
+	setobjectmovementtype 35, 8
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	setvar VAR_0x40D2, 2
+	addvar VAR_0x40D1, 1
+	releaseall
+	end
+
+SlateportCity_Movement_1DCDA8: @ 81DCDA8
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
+	step_end
+
+SlateportCity_Movement_1DCDAC: @ 81DCDAC
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+SlateportCity_Movement_1DCDB4: @ 81DCDB4
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+SlateportCity_EventScript_1DCDBD:: @ 81DCDBD
+	lock
+	faceplayer
+	message SlateportCity_Text_1DD64A
+	waitmessage
+	pokemart SlateportCity_Pokemart_1DCDD4
+	msgbox gUnknown_08272A3F, 4
+	release
+	end
+
+SlateportCity_Pokemart_1DCDD4: @ 81DCDD4
+	.2byte ITEM_PROTEIN
+	.2byte ITEM_IRON
+	.2byte ITEM_CARBOS
+	.2byte ITEM_ZINC
+	.2byte ITEM_CALCIUM
+	.2byte ITEM_HP_UP
+	.2byte ITEM_NONE
+	release
+	end
+
+SlateportCity_EventScript_1DCDE4:: @ 81DCDE4
+	lock
+	faceplayer
+	bufferleadmonspeciesname 0
+	msgbox SlateportCity_Text_1DD68A, 4
+	specialvar VAR_RESULT, LeadMonHasEffortRibbon
+	compare VAR_RESULT, 1
+	call_if 1, SlateportCity_EventScript_1DCE38
+	specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut
+	compare VAR_RESULT, 0
+	call_if 1, SlateportCity_EventScript_1DCE2E
+	msgbox SlateportCity_Text_1DD697, 4
+	playfanfare MUS_FANFA4
+	message SlateportCity_Text_1DD6E3
+	waitfanfare
+	msgbox SlateportCity_Text_1DD702, 4
+	special GiveLeadMonEffortRibbon
+	release
+	end
+
+SlateportCity_EventScript_1DCE2E:: @ 81DCE2E
+	msgbox SlateportCity_Text_1DD722, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCE38:: @ 81DCE38
+	msgbox SlateportCity_Text_1DD77B, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCE42:: @ 81DCE42
+	lock
+	faceplayer
+	compare VAR_0x4058, 1
+	call_if 1, SlateportCity_EventScript_1DCE59
+	msgbox SlateportCity_Text_1DD81A, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCE59:: @ 81DCE59
+	msgbox SlateportCity_Text_1DE3E2, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCE63:: @ 81DCE63
+	lock
+	faceplayer
+	compare VAR_0x4058, 1
+	call_if 1, SlateportCity_EventScript_1DCE7A
+	msgbox SlateportCity_Text_1DD8A6, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCE7A:: @ 81DCE7A
+	msgbox SlateportCity_Text_1DE28E, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCE84:: @ 81DCE84
+	lock
+	faceplayer
+	compare VAR_0x4058, 1
+	call_if 1, SlateportCity_EventScript_1DCEA4
+	checkflag FLAG_0x060
+	goto_eq SlateportCity_EventScript_1DCEAE
+	msgbox SlateportCity_Text_1DD93D, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCEA4:: @ 81DCEA4
+	msgbox SlateportCity_Text_1DE30C, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCEAE:: @ 81DCEAE
+	msgbox SlateportCity_Text_1DD999, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCEB8:: @ 81DCEB8
+	lock
+	faceplayer
+	compare VAR_0x4058, 1
+	call_if 1, SlateportCity_EventScript_1DCECF
+	msgbox SlateportCity_Text_1DDA34, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCECF:: @ 81DCECF
+	msgbox SlateportCity_Text_1DE376, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCED9:: @ 81DCED9
+	compare VAR_0x4058, 1
+	goto_eq SlateportCity_EventScript_1DCEED
+	msgbox SlateportCity_Text_1DDA9A, 2
+	end
+
+SlateportCity_EventScript_1DCEED:: @ 81DCEED
+	msgbox SlateportCity_Text_1DE43D, 3
+	end
+
+SlateportCity_EventScript_1DCEF6:: @ 81DCEF6
+	lock
+	faceplayer
+	compare VAR_0x4058, 1
+	call_if 1, SlateportCity_EventScript_1DCF0D
+	msgbox SlateportCity_Text_1DDB21, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCF0D:: @ 81DCF0D
+	msgbox SlateportCity_Text_1DE460, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCF17:: @ 81DCF17
+	lock
+	faceplayer
+	checkflag FLAG_0x094
+	goto_eq SlateportCity_EventScript_1DCF2C
+	msgbox SlateportCity_Text_1DDBAC, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCF2C:: @ 81DCF2C
+	msgbox SlateportCity_Text_1DDBD5, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCF36:: @ 81DCF36
+	msgbox SlateportCity_Text_1DE8BC, 3
+	end
+
+SlateportCity_EventScript_1DCF3F:: @ 81DCF3F
+	lockall
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq SlateportCity_EventScript_1DCF66
+	checkflag FLAG_BADGE07_GET
+	goto_eq SlateportCity_EventScript_1DCF5C
+	msgbox SlateportCity_Text_1DE8F8, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_1DCF5C:: @ 81DCF5C
+	msgbox SlateportCity_Text_1DE940, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_1DCF66:: @ 81DCF66
+	msgbox SlateportCity_Text_1DE9AA, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_1DCF70:: @ 81DCF70
+	msgbox SlateportCity_Text_1DEA0B, 3
+	end
+
+SlateportCity_EventScript_1DCF79:: @ 81DCF79
+	msgbox SlateportCity_Text_1DEA3B, 3
+	end
+
+SlateportCity_EventScript_1DCF82:: @ 81DCF82
+	msgbox SlateportCity_Text_1DEA6F, 3
+	end
+
+SlateportCity_EventScript_1DCF8B:: @ 81DCF8B
+	msgbox SlateportCity_Text_1DEAAF, 3
+	end
+
+SlateportCity_EventScript_1DCF94:: @ 81DCF94
+	lockall
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq SlateportCity_EventScript_1DCFA8
+	msgbox SlateportCity_Text_1DEAE3, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_1DCFA8:: @ 81DCFA8
+	msgbox SlateportCity_Text_1DEB5A, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_1DCFB2:: @ 81DCFB2
+	msgbox SlateportCity_Text_1DEBA0, 3
+	end
+
+SlateportCity_EventScript_1DCFBB:: @ 81DCFBB
+	lock
+	faceplayer
+	compare VAR_0x4058, 1
+	call_if 1, SlateportCity_EventScript_1DCFD2
+	msgbox SlateportCity_Text_1DE10E, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCFD2:: @ 81DCFD2
+	msgbox SlateportCity_Text_1DE10E, 4
+	release
+	end
+
+SlateportCity_EventScript_1DCFDC:: @ 81DCFDC
+	msgbox SlateportCity_Text_1DE16C, 2
+	end
+
+SlateportCity_EventScript_1DCFE5:: @ 81DCFE5
+	msgbox SlateportCity_Text_1DDFF7, 2
+	end
+
+SlateportCity_EventScript_1DCFEE:: @ 81DCFEE
+	msgbox SlateportCity_Text_1DE04B, 2
+	end
+
+SlateportCity_EventScript_1DCFF7:: @ 81DCFF7
+	msgbox SlateportCity_Text_1DE0D2, 2
+	end
+
+SlateportCity_EventScript_1DD000:: @ 81DD000
+	msgbox SlateportCity_Text_1DE1EC, 2
+	end
+
+SlateportCity_EventScript_1DD009:: @ 81DD009
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_1DDC4F, 4
+	closemessage
+	applymovement 5, SlateportCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_1DD020:: @ 81DD020
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_1DDC8A, 4
+	closemessage
+	applymovement 18, SlateportCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_1DD037:: @ 81DD037
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_1DDCD5, 4
+	closemessage
+	applymovement 19, SlateportCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_1DD04E:: @ 81DD04E
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_1DDD18, 4
+	closemessage
+	applymovement 26, SlateportCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_1DD065:: @ 81DD065
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_1DDD7D, 4
+	closemessage
+	applymovement 27, SlateportCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_1DD07C:: @ 81DD07C
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_1DDDC0, 4
+	closemessage
+	applymovement 28, SlateportCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_1DD093:: @ 81DD093
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_1DDDDF, 4
+	closemessage
+	applymovement 29, SlateportCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_1DD0AA:: @ 81DD0AA
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_1DDE2F, 4
+	closemessage
+	applymovement 30, SlateportCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_1DD0C1:: @ 81DD0C1
+	lock
+	faceplayer
+	playse SE_PIN
+	applymovement 31, SlateportCity_Movement_272598
+	waitmovement 0
+	applymovement 31, SlateportCity_Movement_27259A
+	waitmovement 0
+	msgbox SlateportCity_Text_1DDE6E, 4
+	closemessage
+	applymovement 31, SlateportCity_Movement_2725A2
+	waitmovement 0
+	applymovement 31, SlateportCity_Movement_1DD147
+	waitmovement 0
+	applymovement 31, SlateportCity_Movement_27259E
+	waitmovement 0
+	msgbox SlateportCity_Text_1DDE86, 4
+	closemessage
+	applymovement 31, SlateportCity_Movement_2725A2
+	waitmovement 0
+	applymovement 31, SlateportCity_Movement_1DD147
+	waitmovement 0
+	msgbox SlateportCity_Text_1DDEB8, 4
+	closemessage
+	applymovement 31, SlateportCity_Movement_27259E
+	waitmovement 0
+	applymovement 31, SlateportCity_Movement_1DD147
+	waitmovement 0
+	applymovement 31, SlateportCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SlateportCity_Movement_1DD147: @ 81DD147
+	delay_16
+	delay_16
+	step_end
+
+SlateportCity_EventScript_1DD14A:: @ 81DD14A
+	msgbox SlateportCity_Text_1DDF32, 3
+	end
+
+SlateportCity_EventScript_1DD153:: @ 81DD153
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_1DDF8D, 4
+	closemessage
+	applymovement 33, SlateportCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_1DD16A:: @ 81DD16A
+	lock
+	faceplayer
+	message gUnknown_08272A21
+	waitmessage
+	pokemartdecoration SlateportCity_PokemartDecor_1DD184
+	msgbox gUnknown_08272A3F, 4
+	release
+	end
+
+	.align 2
+SlateportCity_PokemartDecor_1DD184: @ 81DD184
+	.2byte 95
+	.2byte 78
+	.2byte 96
+	.2byte 0
+	release
+	end
+
+SlateportCity_EventScript_1DD18E:: @ 81DD18E
+	msgbox gUnknown_08272E30, 4
+	release
+	end
+
+SlateportCity_EventScript_1DD198:: @ 81DD198
+	lock
+	faceplayer
+	checkflag FLAG_0x060
+	goto_if 0, SlateportCity_EventScript_1DD18E
+	message gUnknown_08272A21
+	waitmessage
+	pokemartdecoration SlateportCity_PokemartDecor_1DD1B8
+	msgbox gUnknown_08272A3F, 4
+	release
+	end
+
+SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8
+	.2byte 25
+	.2byte 27
+	.2byte 26
+	.2byte 28
+	.2byte 29
+	.2byte 30
+	.2byte 51
+	.2byte 52
+	.2byte 53
+	.2byte 54
+	.2byte 55
+	.2byte 56
+	.2byte 57
+	.2byte 58
+	.2byte 0
+	release
+	end
+
+SlateportCity_EventScript_1DD1D8:: @ 81DD1D8
+	lock
+	faceplayer
+	message gUnknown_08272A21
+	waitmessage
+	pokemart SlateportCity_Pokemart_1DD1F0
+	msgbox gUnknown_08272A3F, 4
+	release
+	end
+
+	.align 2
+SlateportCity_Pokemart_1DD1F0: @ 81DD1F0
+	.2byte ITEM_TM10
+	.2byte ITEM_TM43
+	.2byte ITEM_NONE
+	release
+	end
+
+SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
+	lockall
+	msgbox SlateportCity_Text_1DE502, 4
+	msgbox SlateportCity_Text_1DE54A, 4
+	closemessage
+	applymovement 10, SlateportCity_Movement_2725A8
+	waitmovement 0
+	delay 10
+	applymovement 9, SlateportCity_Movement_2725AA
+	waitmovement 0
+	delay 25
+	applymovement 11, SlateportCity_Movement_1DD33C
+	applymovement 255, SlateportCity_Movement_1DD34A
+	applymovement 10, SlateportCity_Movement_1DD319
+	applymovement 9, SlateportCity_Movement_1DD326
+	waitmovement 0
+	removeobject 10
+	removeobject 9
+	msgbox SlateportCity_Text_1DE5F7, 4
+	applymovement 11, SlateportCity_Movement_2725A6
+	waitmovement 0
+	msgbox SlateportCity_Text_1DE64F, 4
+	playbgm MUS_AQA_0, 0
+	msgbox SlateportCity_Text_1DE724, 4
+	applymovement 6, SlateportCity_Movement_2725A4
+	applymovement 1, SlateportCity_Movement_2725A4
+	applymovement 7, SlateportCity_Movement_1DD309
+	applymovement 3, SlateportCity_Movement_272596
+	applymovement 2, SlateportCity_Movement_1DD311
+	waitmovement 0
+	applymovement 11, SlateportCity_Movement_2725AA
+	waitmovement 0
+	msgbox SlateportCity_Text_1DE7F7, 4
+	playse SE_PIN
+	applymovement 11, SlateportCity_Movement_272598
+	waitmovement 0
+	applymovement 11, SlateportCity_Movement_27259A
+	waitmovement 0
+	applymovement 11, SlateportCity_Movement_2725A6
+	waitmovement 0
+	msgbox SlateportCity_Text_1DE860, 4
+	msgbox SlateportCity_Text_1DE8A0, 4
+	closemessage
+	applymovement 11, SlateportCity_Movement_1DD337
+	applymovement 255, SlateportCity_Movement_1DD344
+	waitmovement 0
+	removeobject 11
+	clearflag FLAG_0x349
+	clearflag FLAG_0x350
+	clearflag FLAG_0x34D
+	clearflag FLAG_0x34E
+	setvar VAR_0x4058, 2
+	warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14
+	waitstate
+	releaseall
+	end
+
+SlateportCity_Movement_1DD309: @ 81DD309
+	delay_16
+	delay_16
+	emote_question_mark
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	step_end
+
+SlateportCity_Movement_1DD311: @ 81DD311
+	emote_question_mark
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	step_end
+
+SlateportCity_Movement_1DD319: @ 81DD319
+	delay_16
+	walk_left
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+SlateportCity_Movement_1DD326: @ 81DD326
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+SlateportCity_Movement_1DD334: @ 81DD334
+	walk_down
+	walk_in_place_fastest_up
+	step_end
+
+SlateportCity_Movement_1DD337: @ 81DD337
+	walk_right
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+SlateportCity_Movement_1DD33C: @ 81DD33C
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_left
+	step_end
+
+SlateportCity_Movement_1DD344: @ 81DD344
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_right
+	walk_up
+	step_end
+
+SlateportCity_Movement_1DD34A: @ 81DD34A
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
+	step_end
+
+SlateportCity_EventScript_1DD353:: @ 81DD353
+	msgbox SlateportCity_Text_1DE491, 3
+	end
+
+SlateportCity_EventScript_1DD35C:: @ 81DD35C
+	msgbox SlateportCity_Text_1DE4C4, 3
+	end
+
+SlateportCity_EventScript_1DD365:: @ 81DD365
+	msgbox SlateportCity_Text_1DD7AD, 2
+	end
+
+SlateportCity_EventScript_1DD36E:: @ 81DD36E
+	lock
+	faceplayer
+	checkflag FLAG_0x151
+	goto_eq SlateportCity_EventScript_1DD39A
+	msgbox SlateportCity_Text_1DEBCE, 4
+	giveitem_std ITEM_POWDER_JAR
+	setflag FLAG_0x151
+	msgbox SlateportCity_Text_1DED27, 4
+	release
+	end
+
+SlateportCity_EventScript_1DD39A:: @ 81DD39A
+	setvar VAR_0x8004, 1
+	specialvar VAR_RESULT, sub_80246D4
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_EventScript_1DD3C0
+	msgbox SlateportCity_Text_1DEE40, 4
+	special sub_80248B0
+	goto SlateportCity_EventScript_1DD3CA
+	end
+
+SlateportCity_EventScript_1DD3C0:: @ 81DD3C0
+	msgbox SlateportCity_Text_1DED27, 4
+	release
+	end
+
+SlateportCity_EventScript_1DD3CA:: @ 81DD3CA
+	message SlateportCity_Text_1DEE67
+	waitmessage
+	setvar VAR_0x8004, 7
+	special sub_813A128
+	waitstate
+	switch VAR_RESULT
+	case 0, SlateportCity_EventScript_1DD46E
+	case 1, SlateportCity_EventScript_1DD482
+	case 2, SlateportCity_EventScript_1DD496
+	case 3, SlateportCity_EventScript_1DD4AA
+	case 4, SlateportCity_EventScript_1DD4BE
+	case 5, SlateportCity_EventScript_1DD4D2
+	case 6, SlateportCity_EventScript_1DD4E6
+	case 7, SlateportCity_EventScript_1DD4FA
+	case 8, SlateportCity_EventScript_1DD50E
+	case 9, SlateportCity_EventScript_1DD522
+	case 10, SlateportCity_EventScript_1DD536
+	case 11, SlateportCity_EventScript_1DD54A
+	case 127, SlateportCity_EventScript_1DD54A
+	end
+
+SlateportCity_EventScript_1DD46E:: @ 81DD46E
+	bufferitemname 0, ITEM_ENERGY_POWDER
+	setvar VAR_0x8008, 30
+	setvar VAR_0x8009, 50
+	goto SlateportCity_EventScript_1DD557
+	end
+
+SlateportCity_EventScript_1DD482:: @ 81DD482
+	bufferitemname 0, ITEM_ENERGY_ROOT
+	setvar VAR_0x8008, 31
+	setvar VAR_0x8009, 80
+	goto SlateportCity_EventScript_1DD557
+	end
+
+SlateportCity_EventScript_1DD496:: @ 81DD496
+	bufferitemname 0, ITEM_HEAL_POWDER
+	setvar VAR_0x8008, 32
+	setvar VAR_0x8009, 50
+	goto SlateportCity_EventScript_1DD557
+	end
+
+SlateportCity_EventScript_1DD4AA:: @ 81DD4AA
+	bufferitemname 0, ITEM_REVIVAL_HERB
+	setvar VAR_0x8008, 33
+	setvar VAR_0x8009, 300
+	goto SlateportCity_EventScript_1DD557
+	end
+
+SlateportCity_EventScript_1DD4BE:: @ 81DD4BE
+	bufferitemname 0, ITEM_PROTEIN
+	setvar VAR_0x8008, 64
+	setvar VAR_0x8009, 1000
+	goto SlateportCity_EventScript_1DD557
+	end
+
+SlateportCity_EventScript_1DD4D2:: @ 81DD4D2
+	bufferitemname 0, ITEM_IRON
+	setvar VAR_0x8008, 65
+	setvar VAR_0x8009, 1000
+	goto SlateportCity_EventScript_1DD557
+	end
+
+SlateportCity_EventScript_1DD4E6:: @ 81DD4E6
+	bufferitemname 0, ITEM_CARBOS
+	setvar VAR_0x8008, 66
+	setvar VAR_0x8009, 1000
+	goto SlateportCity_EventScript_1DD557
+	end
+
+SlateportCity_EventScript_1DD4FA:: @ 81DD4FA
+	bufferitemname 0, ITEM_CALCIUM
+	setvar VAR_0x8008, 67
+	setvar VAR_0x8009, 1000
+	goto SlateportCity_EventScript_1DD557
+	end
+
+SlateportCity_EventScript_1DD50E:: @ 81DD50E
+	bufferitemname 0, ITEM_ZINC
+	setvar VAR_0x8008, 70
+	setvar VAR_0x8009, 1000
+	goto SlateportCity_EventScript_1DD557
+	end
+
+SlateportCity_EventScript_1DD522:: @ 81DD522
+	bufferitemname 0, ITEM_HP_UP
+	setvar VAR_0x8008, 63
+	setvar VAR_0x8009, 1000
+	goto SlateportCity_EventScript_1DD557
+	end
+
+SlateportCity_EventScript_1DD536:: @ 81DD536
+	bufferitemname 0, ITEM_PP_UP
+	setvar VAR_0x8008, 69
+	setvar VAR_0x8009, 3000
+	goto SlateportCity_EventScript_1DD557
+	end
+
+SlateportCity_EventScript_1DD54A:: @ 81DD54A
+	msgbox SlateportCity_Text_1DEFBC, 4
+	special sub_8024918
+	release
+	end
+
+SlateportCity_EventScript_1DD557:: @ 81DD557
+	msgbox SlateportCity_Text_1DEE90, 5
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_EventScript_1DD3CA
+	copyvar VAR_0x8004, VAR_0x8009
+	specialvar VAR_RESULT, sub_80246D4
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_EventScript_1DD5CE
+	giveitem_std VAR_0x8008
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_EventScript_1DD5C1
+	copyvar VAR_0x8004, VAR_0x8009
+	special sub_802477C
+	special sub_802488C
+	msgbox SlateportCity_Text_1DEEF7, 5
+	compare VAR_RESULT, 1
+	goto_eq SlateportCity_EventScript_1DD3CA
+	msgbox SlateportCity_Text_1DEF79, 4
+	special sub_8024918
+	release
+	end
+
+SlateportCity_EventScript_1DD5C1:: @ 81DD5C1
+	msgbox gUnknown_08272A89, 4
+	special sub_8024918
+	release
+	end
+
+SlateportCity_EventScript_1DD5CE:: @ 81DD5CE
+	msgbox SlateportCity_Text_1DEEC9, 4
+	goto SlateportCity_EventScript_1DD3CA
+	end
+
+SlateportCity_EventScript_1DD5DC:: @ 81DD5DC
+	lockall
+	applymovement 255, SlateportCity_Movement_2725B2
+	waitmovement 0
+	opendoor 10, 12
+	waitdooranim
+	addobject 35
+	applymovement 255, SlateportCity_Movement_1DD630
+	applymovement 35, SlateportCity_Movement_1DD637
+	waitmovement 0
+	closedoor 10, 12
+	waitdooranim
+	msgbox SlateportCity_Text_1DF28C, 4
+	closemessage
+	applymovement 255, SlateportCity_Movement_1DD634
+	applymovement 35, SlateportCity_Movement_1DD63A
+	waitmovement 0
+	removeobject 35
+	addvar VAR_0x40D1, 1
+	setvar VAR_0x40D2, 3
+	releaseall
+	end
+
+SlateportCity_Movement_1DD630: @ 81DD630
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
+	step_end
+
+SlateportCity_Movement_1DD634: @ 81DD634
+	delay_16
+	walk_in_place_fastest_right
+	step_end
+
+SlateportCity_Movement_1DD637: @ 81DD637
+	delay_8
+	walk_down
+	step_end
+
+SlateportCity_Movement_1DD63A: @ 81DD63A
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+SlateportCity_EventScript_1DD643:: @ 81DD643
+	lockall
+	special sub_80224D0
+	waitstate
+	releaseall
+	end
+
+SlateportCity_Text_1DD64A: @ 81DD64A
+	.string "I’m the ENERGY GURU! I’ll go for it and\n"
+	.string "sell you what you need!$"
+
+SlateportCity_Text_1DD68A: @ 81DD68A
+	.string "Oh?\n"
+	.string "Your {STR_VAR_1}…$"
+
+SlateportCity_Text_1DD697: @ 81DD697
+	.string "Went for it stupendously!\p"
+	.string "As its reward, please give it this\n"
+	.string "EFFORT RIBBON.$"
+
+SlateportCity_Text_1DD6E3: @ 81DD6E3
+	.string "{PLAYER} received the EFFORT RIBBON.$"
+
+SlateportCity_Text_1DD702: @ 81DD702
+	.string "{PLAYER} put the EFFORT RIBBON\n"
+	.string "on {STR_VAR_1}.$"
+
+SlateportCity_Text_1DD722: @ 81DD722
+	.string "You have to go for it a little harder.\p"
+	.string "If you do, I’ll give your POKéMON\n"
+	.string "something nice.$"
+
+SlateportCity_Text_1DD77B: @ 81DD77B
+	.string "Oh! Your {STR_VAR_1}, that EFFORT\n"
+	.string "RIBBON looks good on it!$"
+
+SlateportCity_Text_1DD7AD: @ 81DD7AD
+	.string "The light of the lighthouse reaches\n"
+	.string "dozens of miles away.\p"
+	.string "I wonder if it doesn’t startle POKéMON\n"
+	.string "in the sea.$"
+
+SlateportCity_Text_1DD81A: @ 81DD81A
+	.string "Ooh, look at this!\p"
+	.string "The seaweed you can get around these\n"
+	.string "parts is fresh and full of life.\p"
+	.string "Why, it looks like it can even rear up\n"
+	.string "and attack!$"
+
+SlateportCity_Text_1DD8A6: @ 81DD8A6
+	.string "Where the water is clean, the fruits\n"
+	.string "of bountiful harvest gather.\p"
+	.string "And where people gather, a market\n"
+	.string "soon starts.\p"
+	.string "That is how a town is born and grows.$"
+
+SlateportCity_Text_1DD93D: @ 81DD93D
+	.string "Shopping where you can breathe the\n"
+	.string "scent of the ocean…\p"
+	.string "SLATEPORT is such a wonderful place!$"
+
+SlateportCity_Text_1DD999: @ 81DD999
+	.string "If you put DOLLS or CUSHIONS on\n"
+	.string "the floor, they’ll get dirty.\p"
+	.string "I’m going to buy some BRICKS so my\n"
+	.string "DOLLS and CUSHIONS won’t get dirty\l"
+	.string "when I leave them out.$"
+
+SlateportCity_Text_1DDA34: @ 81DDA34
+	.string "Wroooar! I’m going to compete in\n"
+	.string "the BATTLE TENT, too!\p"
+	.string "But before that, I need to catch\n"
+	.string "some POKéMON!$"
+
+SlateportCity_Text_1DDA9A: @ 81DDA9A
+	.string "Whew… I’m just bushed…\p"
+	.string "I hiked over from MAUVILLE CITY.\n"
+	.string "But, boy, this city’s huge.\p"
+	.string "If I’d known this, I would’ve ridden\n"
+	.string "my BIKE here.$"
+
+SlateportCity_Text_1DDB21: @ 81DDB21
+	.string "STERN, the fellow who built the\n"
+	.string "MUSEUM, also happens to be the leader\l"
+	.string "of an undersea exploration team.\p"
+	.string "So, everyone calls him CAPT. STERN.$"
+
+SlateportCity_Text_1DDBAC: @ 81DDBAC
+	.string "What is that over there?\n"
+	.string "That long line…$"
+
+SlateportCity_Text_1DDBD5: @ 81DDBD5
+	.string "When I was a child, I visited\n"
+	.string "the MUSEUM often.\p"
+	.string "I used to dream about the mysteries of\n"
+	.string "the sea after seeing the exhibits.$"
+
+SlateportCity_Text_1DDC4F: @ 81DDC4F
+	.string "Hey, there! Quit pushing!\n"
+	.string "This is the line, can’t you see?$"
+
+SlateportCity_Text_1DDC8A: @ 81DDC8A
+	.string "TEAM AQUA has a policy of\n"
+	.string "assembling and dispersing at\l"
+	.string "the operation site.$"
+
+SlateportCity_Text_1DDCD5: @ 81DDCD5
+	.string "Our BOSS is brilliant.\p"
+	.string "What would he want to do with\n"
+	.string "a MUSEUM now?$"
+
+SlateportCity_Text_1DDD18: @ 81DDD18
+	.string "What’s the new scheme, I wonder?\p"
+	.string "Our BOSS is scary when he’s mad, so\n"
+	.string "I’d better not screw things up…$"
+
+SlateportCity_Text_1DDD7D: @ 81DDD7D
+	.string "If there’s something we need in\n"
+	.string "the MUSEUM, we should take it all!$"
+
+SlateportCity_Text_1DDDC0: @ 81DDDC0
+	.string "Hey, you there!\n"
+	.string "Don’t butt in!$"
+
+SlateportCity_Text_1DDDDF: @ 81DDDDF
+	.string "A long line, huh?\p"
+	.string "It reminds me of the times I lined up to\n"
+	.string "buy smash-hit games…$"
+
+SlateportCity_Text_1DDE2F: @ 81DDE2F
+	.string "Why are we even lining up and paying?\n"
+	.string "We should just march in!$"
+
+SlateportCity_Text_1DDE6E: @ 81DDE6E
+	.string "What?\n"
+	.string "What do you want?$"
+
+SlateportCity_Text_1DDE86: @ 81DDE86
+	.string "You want to read this sign?\n"
+	.string "I’ll read it for you!$"
+
+SlateportCity_Text_1DDEB8: @ 81DDEB8
+	.string "Let’s see…\p"
+	.string "Um… I think it says something like\n"
+	.string "“the life in the sea is endless.”\p"
+	.string "Yup, I’m pretty sure that’s what\n"
+	.string "it says.$"
+
+SlateportCity_Text_1DDF32: @ 81DDF32
+	.string "Grumble…\p"
+	.string "I should’ve brought my Game Boy\n"
+	.string "Advance so I wouldn’t get bored in line…\p"
+	.string "Grumble…$"
+
+SlateportCity_Text_1DDF8D: @ 81DDF8D
+	.string "When this operation’s over, I’ll take\n"
+	.string "you to a hot spring spa!\p"
+	.string "That’s what our leader said.\n"
+	.string "I can’t wait!$"
+
+SlateportCity_Text_1DDFF7: @ 81DDFF7
+	.string "The sea is just so vast…\p"
+	.string "Could the sea have been made by\n"
+	.string "the tears shed by POKéMON?$"
+
+SlateportCity_Text_1DE04B: @ 81DE04B
+	.string "Do you know what they do with old\n"
+	.string "ships that become too creaky to sail?\p"
+	.string "They sink them in the sea so they\n"
+	.string "become habitats for POKéMON.$"
+
+SlateportCity_Text_1DE0D2: @ 81DE0D2
+	.string "Whenever I visit here, I get carried\n"
+	.string "away and buy too much.$"
+
+SlateportCity_Text_1DE10E: @ 81DE10E
+	.string "If you want to change your POKéMON’s\n"
+	.string "nickname, you’ll have to get the NAME\l"
+	.string "RATER to help you.$"
+
+SlateportCity_Text_1DE16C: @ 81DE16C
+	.string "Any POKéMON you get in a trade,\n"
+	.string "you can’t change its nickname.\p"
+	.string "The original TRAINER’s love for that\n"
+	.string "POKéMON is in the nickname.$"
+
+SlateportCity_Text_1DE1EC: @ 81DE1EC
+	.string "Recently, a BATTLE TENT was built\n"
+	.string "in SLATEPORT.\p"
+	.string "GYMS are fun, but the BATTLE TENT’s\n"
+	.string "awesome in its own way.\p"
+	.string "You should go find tough POKéMON\n"
+	.string "for the BATTLE TENT!$"
+
+SlateportCity_Text_1DE28E: @ 81DE28E
+	.string "I was hoping that it was a famous star\n"
+	.string "so I could get an autograph.\p"
+	.string "But who’s that being interviewed?\n"
+	.string "Isn’t that CAPT. STERN?$"
+
+SlateportCity_Text_1DE30C: @ 81DE30C
+	.string "That lady interviewer is so cool\n"
+	.string "and pretty.\p"
+	.string "When I grow up, I’m going to be\n"
+	.string "an international journalist!$"
+
+SlateportCity_Text_1DE376: @ 81DE376
+	.string "CAPT. STERN says they discovered\n"
+	.string "something at the bottom of the sea.\p"
+	.string "I wonder what it is?\n"
+	.string "What could it be?$"
+
+SlateportCity_Text_1DE3E2: @ 81DE3E2
+	.string "What’s going on here?\p"
+	.string "Did the good CAPTAIN come back with\n"
+	.string "a big fish from the ocean floor?$"
+
+SlateportCity_Text_1DE43D: @ 81DE43D
+	.string "Hey! Are you watching?\n"
+	.string "Am I on TV?$"
+
+SlateportCity_Text_1DE460: @ 81DE460
+	.string "A TV interview! Here!\n"
+	.string "The CAPTAIN’s a celebrity!$"
+
+SlateportCity_Text_1DE491: @ 81DE491
+	.string "TY: Okay, CAPT. STERN, a big smile\n"
+	.string "for the camera!$"
+
+SlateportCity_Text_1DE4C4: @ 81DE4C4
+	.string "GABBY: I see, I see. You’ve had a most\n"
+	.string "invaluable experience…$"
+
+SlateportCity_Text_1DE502: @ 81DE502
+	.string "CAPT. STERN: Yes, indeed. We intend to\n"
+	.string "move ahead with our exploration.$"
+
+SlateportCity_Text_1DE54A: @ 81DE54A
+	.string "GABBY: That’s wonderful, CAPT. STERN!\n"
+	.string "Thank you for taking the time from\l"
+	.string "your busy schedule to talk to us.\p"
+	.string "We hope we can interview you again\n"
+	.string "with news of more discoveries!$"
+
+SlateportCity_Text_1DE5F7: @ 81DE5F7
+	.string "CAPT. STERN: Whew…\p"
+	.string "That was my first time to be filmed for\n"
+	.string "TV. That was nerve-wracking.$"
+
+SlateportCity_Text_1DE64F: @ 81DE64F
+	.string "Oh! {PLAYER}{KUN}!\n"
+	.string "You’re looking great!\p"
+	.string "We made a huge discovery on our last\n"
+	.string "seafloor exploration.\p"
+	.string "We found an underwater cavern on\n"
+	.string "ROUTE 128.\p"
+	.string "We think it’s the habitat of a POKéMON\n"
+	.string "that’s said to have been long extinct.$"
+
+SlateportCity_Text_1DE724: @ 81DE724
+	.string "Fufufu…\n"
+	.string "CAPT. STERN, I presume.\p"
+	.string "We of TEAM AQUA will assume\n"
+	.string "control of your submarine!\p"
+	.string "Your objections are meaningless!\n"
+	.string "We expect your total cooperation!\p"
+	.string "Fufufu…\n"
+	.string "Just watch and learn what TEAM\l"
+	.string "AQUA has planned!$"
+
+SlateportCity_Text_1DE7F7: @ 81DE7F7
+	.string "CAPT. STERN: What was that all about?\p"
+	.string "It sounded like someone using\n"
+	.string "a megaphone…\p"
+	.string "Where did it come from?$"
+
+SlateportCity_Text_1DE860: @ 81DE860
+	.string "It’s from the HARBOR!\p"
+	.string "The submarine!\n"
+	.string "They’re trying to take it!$"
+
+SlateportCity_Text_1DE8A0: @ 81DE8A0
+	.string "{PLAYER}{KUN}!\n"
+	.string "Please, come with me!$"
+
+SlateportCity_Text_1DE8BC: @ 81DE8BC
+	.string "BATTLE TENT SLATEPORT SITE\n"
+	.string "“Find it! The ultimate POKéMON!”$"
+
+SlateportCity_Text_1DE8F8: @ 81DE8F8
+	.string "STERN’S SHIPYARD\p"
+	.string "“Wanted: A sailor capable of sailing\n"
+	.string "in all currents.”$"
+
+SlateportCity_Text_1DE940: @ 81DE940
+	.string "STERN’S SHIPYARD\p"
+	.string "“The ferry S.S. TIDAL nears\n"
+	.string "completion for serving the ports of\l"
+	.string "SLATEPORT and LILYCOVE.”$"
+
+SlateportCity_Text_1DE9AA: @ 81DE9AA
+	.string "STERN’S SHIPYARD\p"
+	.string "“Boarding of the SLATEPORT-LILYCOVE\n"
+	.string "ferry S.S. TIDAL is handled at the\l"
+	.string "HARBOR.”$"
+
+SlateportCity_Text_1DEA0B: @ 81DEA0B
+	.string "POKéMON FAN CLUB\n"
+	.string "“Calling all fans of POKéMON!”$"
+
+SlateportCity_Text_1DEA3B: @ 81DEA3B
+	.string "“The endless sea sustains\n"
+	.string "all life.”\p"
+	.string "OCEANIC MUSEUM$"
+
+SlateportCity_Text_1DEA6F: @ 81DEA6F
+	.string "SLATEPORT CITY\p"
+	.string "“The port where people and POKéMON\n"
+	.string "cross paths.”$"
+
+SlateportCity_Text_1DEAAF: @ 81DEAAF
+	.string "SLATEPORT MARKET\n"
+	.string "“Unique items found nowhere else!”$"
+
+SlateportCity_Text_1DEAE3: @ 81DEAE3
+	.string "SLATEPORT HARBOR\p"
+	.string "“The ferry S.S. TIDAL is under\n"
+	.string "construction in the SHIPYARD.\p"
+	.string "“Service is scheduled to begin\n"
+	.string "shortly.”$"
+
+SlateportCity_Text_1DEB5A: @ 81DEB5A
+	.string "SLATEPORT HARBOR\p"
+	.string "“Enjoy a delightful cruise on\n"
+	.string "the ferry S.S. TIDAL.”$"
+
+SlateportCity_Text_1DEBA0: @ 81DEBA0
+	.string "NAME RATER’S HOUSE\n"
+	.string "“POKéMON nicknames rated.”$"
+
+SlateportCity_Text_1DEBCE: @ 81DEBCE
+	.string "If a wild POKéMON gets hurt, it heals\n"
+	.string "itself by chewing on BERRIES.\p"
+	.string "Did you know that?\p"
+	.string "Somebody saw that and got the idea\n"
+	.string "of making medicine from BERRIES.\p"
+	.string "Did you know that?\p"
+	.string "To turn BERRIES into medicine,\n"
+	.string "they must be crushed into powder.\p"
+	.string "Did you know that?\p"
+	.string "You seem to have an interest\n"
+	.string "in BERRIES!\p"
+	.string "I’ve got something good for someone\n"
+	.string "like you.$"
+
+SlateportCity_Text_1DED27: @ 81DED27
+	.string "I recently had machines installed at\n"
+	.string "POKéMON CENTERS for crushing BERRIES.\p"
+	.string "The BERRY CRUSH machines are at\n"
+	.string "the DIRECT CORNER upstairs.\p"
+	.string "Did you know?\p"
+	.string "Could you make BERRY POWDER for\n"
+	.string "me using those machines?\p"
+	.string "I can make you all sorts of medicine\n"
+	.string "if you bring me lots of BERRY POWDER.$"
+
+SlateportCity_Text_1DEE40: @ 81DEE40
+	.string "Have you brought me some\n"
+	.string "BERRY POWDER?$"
+
+SlateportCity_Text_1DEE67: @ 81DEE67
+	.string "What would you like to exchange\n"
+	.string "it with?$"
+
+SlateportCity_Text_1DEE90: @ 81DEE90
+	.string "Okay, you want to exchange your\n"
+	.string "BERRY POWDER for one {STR_VAR_1}?$"
+
+SlateportCity_Text_1DEEC9: @ 81DEEC9
+	.string "Oh, dear. You don’t have enough\n"
+	.string "BERRY POWDER.$"
+
+SlateportCity_Text_1DEEF7: @ 81DEEF7
+	.string "This is fine BERRY POWDER.\n"
+	.string "It will make excellent medicine.\p"
+	.string "Would you like to trade more of your\n"
+	.string "BERRY POWDER for something else?$"
+
+SlateportCity_Text_1DEF79: @ 81DEF79
+	.string "Okay! When you get some more\n"
+	.string "BERRY POWDER, bring it to me, please!$"
+
+SlateportCity_Text_1DEFBC: @ 81DEFBC
+	.string "Come back if you’d like to trade your\n"
+	.string "BERRY POWDER for some medicine.\p"
+	.string "I’m always running a bazaar here.\p"
+	.string "Did you know?$"
+
+SlateportCity_Text_1DF032: @ 81DF032
+	.string "SCOTT: Huh?\n"
+	.string "I’m sure I met you somewhere before.\p"
+	.string "Have I introduced myself to you?\n"
+	.string "If not, my name’s SCOTT.\p"
+	.string "I just saw TEAM AQUA run away from\n"
+	.string "here like they were stung.\p"
+	.string "Let me guess--you drove them away?$"
+
+SlateportCity_Text_1DF0FE: @ 81DF0FE
+	.string "SCOTT: Hmm…\n"
+	.string "Maybe, just maybe, this TRAINER…$"
+
+SlateportCity_Text_1DF12B: @ 81DF12B
+	.string "SCOTT: All right! I think you’re going\n"
+	.string "to become a good friend.\p"
+	.string "So, let’s register each other in our\n"
+	.string "POKéNAVS.\p"
+	.string "… … … … … …$"
+
+SlateportCity_Text_1DF1A6: @ 81DF1A6
+	.string "Registered this SCOTT person\n"
+	.string "in the POKéNAV.$"
+
+SlateportCity_Text_1DF1D3: @ 81DF1D3
+	.string "SCOTT: What I’d like to do is tag along\n"
+	.string "with you, but I do want to keep an eye\l"
+	.string "on the talents of other people, too.\p"
+	.string "So, I’ll be off to roam other towns\n"
+	.string "a bit more.\p"
+	.string "Be seeing you, {PLAYER}{KUN}!$"
+
+SlateportCity_Text_1DF28C: @ 81DF28C
+	.string "SCOTT: Oh, hey!\n"
+	.string "If it isn’t {PLAYER}{KUN}!\p"
+	.string "{PLAYER}{KUN}, let me guess--you’re going\n"
+	.string "to take the BATTLE TENT challenge?\p"
+	.string "Yeah! That’s a good idea!\n"
+	.string "That’s a really great idea!\p"
+	.string "After all, a tough TRAINER is\n"
+	.string "the perfect fit for the BATTLE TENT!\p"
+	.string "Give it your best effort!$"
+
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc
new file mode 100644
index 000000000..ce13a5899
--- /dev/null
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc
@@ -0,0 +1,8 @@
+SlateportCity_BattleTentBattleRoom_EventObjects: @ 852F4DC
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 0, 10, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, 7, 1, 1, 0, 0, 0x0, 0
+
+SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524
+	map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
index 4245201fb..4c8c94753 100644
--- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_BattleTentBattleRoom: @ 848314C
-	.4byte SlateportCity_BattleTentBattleRoom_MapAttributes
+	.4byte BattleTentBattleRoom_Layout
 	.4byte SlateportCity_BattleTentBattleRoom_MapEvents
 	.4byte SlateportCity_BattleTentBattleRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
new file mode 100644
index 000000000..150cc425b
--- /dev/null
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
@@ -0,0 +1,115 @@
+SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960
+	map_script 3, SlateportCity_BattleTentBattleRoom_MapScript1_209970
+	map_script 4, SlateportCity_BattleTentBattleRoom_MapScript2_20999A
+	map_script 2, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4
+	.byte 0
+
+SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970
+	call SlateportCity_BattleTentBattleRoom_EventScript_209976
+	end
+
+SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_BattleTentBattleRoom_EventScript_20998E
+	compare VAR_RESULT, 1
+	goto_eq SlateportCity_BattleTentBattleRoom_EventScript_209994
+	return
+
+SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E
+	setvar VAR_OBJ_GFX_ID_1, 100
+	return
+
+SlateportCity_BattleTentBattleRoom_EventScript_209994:: @ 8209994
+	setvar VAR_OBJ_GFX_ID_1, 105
+	return
+
+SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A
+	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099A4
+	.2byte 0
+
+SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4
+	setvar VAR_TEMP_1, 1
+	hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
+	hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM
+	end
+
+SlateportCity_BattleTentBattleRoom_MapScript2_2099B4: @ 82099B4
+	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099BE
+	.2byte 0
+
+SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
+	applymovement 3, SlateportCity_BattleTentBattleRoom_Movement_209A99
+	waitmovement 0
+	setvar VAR_0x8004, 11
+	special sub_81A5E74
+	setobjectxyperm 2, 5, 1
+	removeobject 2
+	addobject 2
+	applymovement 2, SlateportCity_BattleTentBattleRoom_Movement_209A9E
+	waitmovement 0
+	setvar VAR_0x8004, 4
+	special sub_81B99B4
+	lockall
+	msgbox 0x2021fc4, 4
+	waitmessage
+	closemessage
+	special HealPlayerParty
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 0
+	special sub_8163AC4
+	waitstate
+	switch VAR_RESULT
+	case 1, SlateportCity_BattleTentBattleRoom_EventScript_209A39
+
+SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 4
+	special sub_81A1780
+	special LoadPlayerParty
+	warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
+	waitstate
+
+SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	addvar VAR_RESULT, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	switch VAR_RESULT
+	case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B
+@ 	case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B
+	setvar VAR_0x8006, 1
+	warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 3
+	waitstate
+
+SlateportCity_BattleTentBattleRoom_EventScript_209A7B:: @ 8209A7B
+SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 3
+	special sub_81A1780
+	special LoadPlayerParty
+	warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
+	waitstate
+@ forced stop
+
+SlateportCity_BattleTentBattleRoom_Movement_209A99: @ 8209A99
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
+	step_end
+
+SlateportCity_BattleTentBattleRoom_Movement_209A9E: @ 8209A9E
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
diff --git a/data/maps/SlateportCity_BattleTentCorridor/events.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc
new file mode 100644
index 000000000..b56b50a0e
--- /dev/null
+++ b/data/maps/SlateportCity_BattleTentCorridor/events.inc
@@ -0,0 +1,6 @@
+SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 7, 1, 1, 0, 0, 0x0, 0
+
+SlateportCity_BattleTentCorridor_MapEvents:: @ 852F4C8
+	map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc
index f399ab26d..7ea7cca9e 100644
--- a/data/maps/SlateportCity_BattleTentCorridor/header.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_BattleTentCorridor: @ 8483130
-	.4byte SlateportCity_BattleTentCorridor_MapAttributes
+	.4byte BattleTentCorridor_Layout
 	.4byte SlateportCity_BattleTentCorridor_MapEvents
 	.4byte SlateportCity_BattleTentCorridor_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
new file mode 100644
index 000000000..0a9eb6cf5
--- /dev/null
+++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
@@ -0,0 +1,280 @@
+SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26
+	map_script 2, SlateportCity_BattleTentCorridor_MapScript2_208E5B
+	map_script 4, SlateportCity_BattleTentCorridor_MapScript2_208E31
+	.byte 0
+
+SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31
+	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentCorridor_EventScript_208E3B
+	.2byte 0
+
+SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B
+	setvar VAR_TEMP_1, 1
+	compare VAR_0x8006, 1
+	goto_if 5, SlateportCity_BattleTentCorridor_EventScript_208E56
+	setobjectxy 1, 2, 2
+	turnobject 1, 1
+
+SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56
+	turnobject 255, 2
+	end
+
+SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B
+	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentCorridor_EventScript_208E65
+	.2byte 0
+
+SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65
+	compare VAR_0x8006, 1
+	goto_eq SlateportCity_BattleTentCorridor_EventScript_208EEE
+	setvar VAR_TEMP_0, 1
+	applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062
+	applymovement 255, SlateportCity_BattleTentCorridor_Movement_209059
+	waitmovement 0
+	compare VAR_0x8006, 2
+	goto_eq SlateportCity_BattleTentCorridor_EventScript_209044
+	setvar VAR_0x8004, 9
+	special sub_81B9D08
+	setvar VAR_0x8004, 8
+	special sub_81B9D08
+	msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, 4
+	fadescreen 1
+	setvar VAR_0x8004, 6
+	special sub_81B9D08
+	waitstate
+
+SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
+	msgbox SlateportCity_BattleTentCorridor_Text_25AB96, 4
+	closemessage
+	applymovement 1, SlateportCity_BattleTentCorridor_Movement_2725A6
+	waitmovement 0
+	opendoor 2, 1
+	waitdooranim
+	applymovement 1, SlateportCity_BattleTentCorridor_Movement_209068
+	applymovement 255, SlateportCity_BattleTentCorridor_Movement_20905E
+	waitmovement 0
+	closedoor 2, 1
+	waitdooranim
+	warp MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4
+	waitstate
+	end
+
+SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE
+	setvar VAR_0x8004, 9
+	special sub_81A5E74
+	setvar VAR_0x8004, 16
+	special sub_81A5E74
+	msgbox SlateportCity_BattleTentCorridor_Text_25A22D, 4
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+
+SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	call_if 1, SlateportCity_BattleTentCorridor_EventScript_209014
+	compare VAR_RESULT, 2
+	call_if 1, SlateportCity_BattleTentCorridor_EventScript_20901B
+	multichoice 20, 6, 104, 1
+	switch VAR_RESULT
+	case 0, SlateportCity_BattleTentCorridor_EventScript_208FBB
+	case 1, SlateportCity_BattleTentCorridor_EventScript_208F5B
+	case 2, SlateportCity_BattleTentCorridor_EventScript_208F89
+
+SlateportCity_BattleTentCorridor_EventScript_208F5B:: @ 8208F5B
+	msgbox SlateportCity_BattleTentCorridor_Text_25A350, 5
+	switch VAR_RESULT
+	case 0, SlateportCity_BattleTentCorridor_EventScript_208F0D
+	case 1, SlateportCity_BattleTentCorridor_EventScript_209022
+	case 127, SlateportCity_BattleTentCorridor_EventScript_208F0D
+
+SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89
+	message SlateportCity_BattleTentCorridor_Text_25A37A
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, SlateportCity_BattleTentCorridor_EventScript_208F0D
+	case 0, SlateportCity_BattleTentCorridor_EventScript_209A1B
+	case 127, SlateportCity_BattleTentCorridor_EventScript_208F0D
+
+SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB
+	setvar VAR_0x8004, 8
+	special sub_81B9D08
+	msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, 5
+	switch VAR_RESULT
+	case 0, SlateportCity_BattleTentCorridor_EventScript_208EB4
+	case 1, SlateportCity_BattleTentCorridor_EventScript_208FF1
+	case 127, SlateportCity_BattleTentCorridor_EventScript_208EB4
+
+SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1
+	fadescreen 1
+	setvar VAR_0x8004, 7
+	special sub_81B9D08
+	waitstate
+	compare VAR_RESULT, 1
+	goto_eq SlateportCity_BattleTentCorridor_EventScript_208EB4
+	msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, 4
+	goto SlateportCity_BattleTentCorridor_EventScript_208EB4
+
+SlateportCity_BattleTentCorridor_EventScript_209014:: @ 8209014
+	message SlateportCity_BattleTentCorridor_Text_25A263
+	waitmessage
+	return
+
+SlateportCity_BattleTentCorridor_EventScript_20901B:: @ 820901B
+	message SlateportCity_BattleTentCorridor_Text_25A289
+	waitmessage
+	return
+
+SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022
+	message SlateportCity_BattleTentCorridor_Text_25ABAE
+	waitmessage
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 2
+	special sub_81B9D08
+	playse SE_SAVE
+	waitse
+	fadescreen 1
+	setvar VAR_0x8004, 4
+	special sub_81A1780
+	end
+
+SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044
+	special SavePlayerParty
+	setvar VAR_0x8004, 10
+	setvar VAR_0x8005, 0
+	special sub_81A5E74
+	goto SlateportCity_BattleTentCorridor_EventScript_208F0D
+
+SlateportCity_BattleTentCorridor_Movement_209059: @ 8209059
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+SlateportCity_BattleTentCorridor_Movement_20905E: @ 820905E
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	step_end
+
+SlateportCity_BattleTentCorridor_Movement_209068: @ 8209068
+	walk_up
+	set_invisible
+	step_end
+
+SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B
+	.string "Want a tasty little bit of advice\n"
+	.string "for CONTESTS?\p"
+	.string "Using a certain move after another\n"
+	.string "certain kind of move sometimes gets\l"
+	.string "you extra attention.\p"
+	.string "If you know what you’re doing,\n"
+	.string "you can score big in appeal.\p"
+	.string "Of course, your opponents might try\n"
+	.string "disrupting your POKéMON’s showing.$"
+
+SlateportCity_BattleTentCorridor_Text_20917A: @ 820917A
+	.string "My papa, he’s a CONTEST JUDGE.\p"
+	.string "I wonder what I should be when I\n"
+	.string "grow up, a JUDGE or a GYM LEADER?$"
+
+SlateportCity_BattleTentCorridor_Text_2091DC: @ 82091DC
+	.string "Hey, man, I’m like majorly cheesed,\n"
+	.string "you know. Like, you know, I just\l"
+	.string "wanted to know why my POKéMON\l"
+	.string "never won, you know, like, hey?\p"
+	.string "So, like, I gave the JUDGE my two\n"
+	.string "cents, you know, they’re free.\p"
+	.string "And he wouldn’t hear me out, like, hey!\n"
+	.string "So, like, total bummer, man!\p"
+	.string "Hey, like, you! Zip it, you know?\n"
+	.string "Just, you know, take this!$"
+
+SlateportCity_BattleTentCorridor_Text_209322: @ 8209322
+	.string "That’s, like, TM41, you know?\n"
+	.string "Hey, it’s TORMENT, you hearing me?\p"
+	.string "Like, it won’t let the other guy\n"
+	.string "use the same move twice in a row, see?\p"
+	.string "Hey, now, you listen here, like,\n"
+	.string "I’m not laying a torment on you!$"
+
+SlateportCity_BattleTentCorridor_Text_2093ED: @ 82093ED
+	.string "MC: Oh, my, my!\n"
+	.string "Now isn’t that a dandy of a POKéMON?\p"
+	.string "Please! Do step right up and take\n"
+	.string "part in our splendid CONTESTS!\p"
+	.string "You’ll do well! I’m sure of it!\n"
+	.string "My eyes have never failed me!$"
+
+SlateportCity_BattleTentCorridor_Text_2094A1: @ 82094A1
+	.string "JUDGE: Well, hello there!\n"
+	.string "I see that you’re a TRAINER!\p"
+	.string "Then, it just wouldn’t do for you\n"
+	.string "to miss a POKéMON CONTEST!\p"
+	.string "Get a CONTEST PASS in VERDANTURF\n"
+	.string "CITY and enter anytime!$"
+
+SlateportCity_BattleTentCorridor_Text_20954E: @ 820954E
+	.string "It’s appeal time!\n"
+	.string "What should I lead with?$"
+
+SlateportCity_BattleTentCorridor_Text_209579: @ 8209579
+	.string "They didn’t pay much attention to\n"
+	.string "my POKéMON’s appeal…\p"
+	.string "Humph, that JUDGE, he doesn’t know\n"
+	.string "a good thing when he sees it.$"
+
+SlateportCity_BattleTentCorridor_Text_2095F1: @ 82095F1
+	.string "Oh, hi! You must be a serious fan to get\n"
+	.string "this close to the action.\p"
+	.string "I’ll reward your enthusiasm with\n"
+	.string "this sage advice.\p"
+	.string "If a move goes over really well,\n"
+	.string "the audience will get excited.\p"
+	.string "The POKéMON that makes its appeal\n"
+	.string "right when everyone’s excited…\p"
+	.string "Well, you’d think something good has\n"
+	.string "to happen!$"
+
+SlateportCity_BattleTentCorridor_Text_209718: @ 8209718
+	.string "I can’t do this! I’m more freaked out\n"
+	.string "than my POKéMON.\p"
+	.string "I’m shivering and my heart is racing!$"
+
+SlateportCity_BattleTentCorridor_Text_209775: @ 8209775
+	.string "A battle and a CONTEST aren’t the\n"
+	.string "same, but they are alike, too.\p"
+	.string "You need to work hard and believe\n"
+	.string "in the POKéMON you’ve raised.$"
+
+SlateportCity_BattleTentCorridor_Text_2097F6: @ 82097F6
+	.string "That POKéMON looks like it’s on top\n"
+	.string "of its game, huh?\p"
+	.string "A POKéMON that does good in the\n"
+	.string "secondary judging seems to be more\l"
+	.string "relaxed when it’s doing appeals.$"
+
+SlateportCity_BattleTentCorridor_Text_209890: @ 8209890
+	.string "Will you look at that sorry sight?\p"
+	.string "Heh, my POKéMON’s absolutely better\n"
+	.string "than that lot!$"
+
+SlateportCity_BattleTentCorridor_Text_2098E6: @ 82098E6
+	.string "Don’t you get the urge to move with\n"
+	.string "POKéMON if they’re putting on an\l"
+	.string "energetic appeal?$"
+
+SlateportCity_BattleTentCorridor_Text_20993D: @ 820993D
+	.string "POKéMON CONTESTS\n"
+	.string "HYPER RANK STAGE!$"
+
diff --git a/data/maps/SlateportCity_BattleTentLobby/events.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc
new file mode 100644
index 000000000..0ceca119b
--- /dev/null
+++ b/data/maps/SlateportCity_BattleTentLobby/events.inc
@@ -0,0 +1,17 @@
+SlateportCity_BattleTentLobby_EventObjects: @ 852F408
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 8, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, 2, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 3, 7, 3, 7, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, 1, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 8, 3, 9, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0
+
+SlateportCity_BattleTentLobby_MapWarps: @ 852F480
+	warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY
+	warp_def 7, 9, 0, 3, MAP_SLATEPORT_CITY
+
+SlateportCity_BattleTentLobby_MapBGEvents: @ 852F490
+	bg_event 4, 5, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A99
+
+SlateportCity_BattleTentLobby_MapEvents:: @ 852F49C
+	map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents
+
diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc
index 4a654fd25..1a809a567 100644
--- a/data/maps/SlateportCity_BattleTentLobby/header.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_BattleTentLobby: @ 8483114
-	.4byte SlateportCity_BattleTentLobby_MapAttributes
+	.4byte BattleTentLobby_Layout
 	.4byte SlateportCity_BattleTentLobby_MapEvents
 	.4byte SlateportCity_BattleTentLobby_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
new file mode 100644
index 000000000..fc66d7387
--- /dev/null
+++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
@@ -0,0 +1,357 @@
+SlateportCity_BattleTentLobby_MapScripts:: @ 8208730
+	map_script 2, SlateportCity_BattleTentLobby_MapScript2_20874F
+	map_script 4, SlateportCity_BattleTentLobby_MapScript2_20873B
+	.byte 0
+
+SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B
+	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentLobby_EventScript_208745
+	.2byte 0
+
+SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F
+	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentLobby_EventScript_208779
+	map_script_2 VAR_TEMP_0, 1, SlateportCity_BattleTentLobby_EventScript_208782
+	map_script_2 VAR_TEMP_0, 2, SlateportCity_BattleTentLobby_EventScript_208871
+	map_script_2 VAR_TEMP_0, 3, SlateportCity_BattleTentLobby_EventScript_2087B7
+	map_script_2 VAR_TEMP_0, 4, SlateportCity_BattleTentLobby_EventScript_208837
+	.2byte 0
+
+SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779
+	setvar VAR_0x8004, 0
+	special sub_81A1780
+	end
+
+SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782
+	lockall
+	msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, 4
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	releaseall
+	end
+
+SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7
+	lockall
+	message SlateportCity_BattleTentLobby_Text_2C5C6F
+	waitmessage
+	setvar VAR_0x8004, 4
+	special sub_81B9D08
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 0
+	special sub_81B9D08
+	playse SE_SAVE
+	waitse
+
+SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9
+	msgbox SlateportCity_BattleTentLobby_Text_2C5D14, 4
+	setvar VAR_0x8004, 5
+	special sub_81B9D08
+	switch VAR_RESULT
+	case 0, SlateportCity_BattleTentLobby_EventScript_20882A
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	message SlateportCity_BattleTentLobby_Text_23F68C
+	waitmessage
+	playfanfare MUS_FANFA4
+	waitfanfare
+	goto SlateportCity_BattleTentLobby_EventScript_208861
+
+SlateportCity_BattleTentLobby_EventScript_20882A:: @ 820882A
+	msgbox SlateportCity_BattleTentLobby_Text_2C5D52, 4
+	goto SlateportCity_BattleTentLobby_EventScript_208861
+
+SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837
+	lockall
+	message SlateportCity_BattleTentLobby_Text_2C5BA2
+	waitmessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 0
+	special sub_81B9D08
+	playse SE_SAVE
+	waitse
+
+SlateportCity_BattleTentLobby_EventScript_208861:: @ 8208861
+	msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871
+	lockall
+	message SlateportCity_BattleTentLobby_Text_2C5DA7
+	waitmessage
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 1
+	special sub_81B9D08
+	playse SE_SAVE
+	waitse
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	setvar VAR_0x8006, 2
+	goto SlateportCity_BattleTentLobby_EventScript_2089AC
+
+SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA
+	lock
+	faceplayer
+	setvar VAR_0x8004, 1
+	special sub_81B9D08
+	compare VAR_RESULT, 0
+	goto_if 5, SlateportCity_BattleTentLobby_EventScript_2087E9
+	special SavePlayerParty
+	msgbox SlateportCity_BattleTentLobby_Text_2C5810, 4
+
+SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA
+	message SlateportCity_BattleTentLobby_Text_2C586A
+	waitmessage
+	multichoice 17, 6, 23, 0
+	switch VAR_RESULT
+	case 0, SlateportCity_BattleTentLobby_EventScript_208906
+	case 1, SlateportCity_BattleTentLobby_EventScript_208A07
+	case 2, SlateportCity_BattleTentLobby_EventScript_208A2E
+	case 127, SlateportCity_BattleTentLobby_EventScript_208A2E
+
+SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906
+	setvar VAR_FRONTIER_FACILITY, 4
+	setvar VAR_0x40CE, 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 2
+	special sub_81A1780
+	msgbox SlateportCity_BattleTentLobby_Text_2C5B06, 5
+	switch VAR_RESULT
+	case 0, SlateportCity_BattleTentLobby_EventScript_208A2B
+	case 1, SlateportCity_BattleTentLobby_EventScript_208950
+	case 127, SlateportCity_BattleTentLobby_EventScript_208A2B
+
+SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950
+	setvar VAR_TEMP_0, 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	special sub_81A1780
+	setvar VAR_0x8004, 0
+	special sub_81B9D08
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	closemessage
+	delay 2
+	call SlateportCity_BattleTentLobby_EventScript_27134F
+	setvar VAR_TEMP_0, 255
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_BattleTentLobby_EventScript_208A14
+	setvar VAR_0x8006, 0
+
+SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC
+	msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, 4
+	closemessage
+	call SlateportCity_BattleTentLobby_EventScript_2089C9
+	warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7
+	setvar VAR_TEMP_0, 0
+	waitstate
+	end
+
+SlateportCity_BattleTentLobby_EventScript_2089C9:: @ 82089C9
+	applymovement 1, SlateportCity_BattleTentLobby_Movement_2089F8
+	applymovement 255, SlateportCity_BattleTentLobby_Movement_2089FF
+	waitmovement 0
+	opendoor 6, 1
+	waitdooranim
+	applymovement 1, SlateportCity_BattleTentLobby_Movement_2089FC
+	applymovement 255, SlateportCity_BattleTentLobby_Movement_208A03
+	waitmovement 0
+	closedoor 6, 1
+	waitdooranim
+	return
+
+SlateportCity_BattleTentLobby_Movement_2089F8: @ 82089F8
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+SlateportCity_BattleTentLobby_Movement_2089FC: @ 82089FC
+	walk_up
+	set_invisible
+	step_end
+
+SlateportCity_BattleTentLobby_Movement_2089FF: @ 82089FF
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07
+	msgbox SlateportCity_BattleTentLobby_Text_2C589C, 4
+	goto SlateportCity_BattleTentLobby_EventScript_2088CA
+
+SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	goto SlateportCity_BattleTentLobby_EventScript_208A2E
+
+SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B
+	special LoadPlayerParty
+
+SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E
+	msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4
+	release
+	end
+
+SlateportCity_BattleTentLobby_Movement_208A38:: @ 8208A38
+	walk_up
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D
+	lock
+	faceplayer
+	checkflag FLAG_0x109
+	goto_eq SlateportCity_BattleTentLobby_EventScript_208A74
+	msgbox SlateportCity_BattleTentLobby_Text_208B4E, 4
+	giveitem_std ITEM_TM41
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_BattleTentLobby_EventScript_272054
+	setflag FLAG_0x109
+	msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4
+	release
+	end
+
+SlateportCity_BattleTentLobby_EventScript_208A74:: @ 8208A74
+	msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4
+	release
+	end
+
+SlateportCity_BattleTentLobby_EventScript_208A7E:: @ 8208A7E
+	msgbox SlateportCity_BattleTentLobby_Text_208D27, 2
+	end
+
+SlateportCity_BattleTentLobby_EventScript_208A87:: @ 8208A87
+	msgbox SlateportCity_BattleTentLobby_Text_208DA6, 2
+	end
+
+SlateportCity_BattleTentLobby_EventScript_208A90:: @ 8208A90
+	msgbox SlateportCity_BattleTentLobby_Text_208DF1, 2
+	end
+
+SlateportCity_BattleTentLobby_EventScript_208A99:: @ 8208A99
+	lockall
+	msgbox SlateportCity_BattleTentLobby_Text_259721, 4
+	goto SlateportCity_BattleTentLobby_EventScript_208AA8
+	end
+
+SlateportCity_BattleTentLobby_EventScript_208AA8:: @ 8208AA8
+	message SlateportCity_BattleTentLobby_Text_259743
+	waitmessage
+	multichoice 17, 0, 111, 0
+	switch VAR_RESULT
+	case 0, SlateportCity_BattleTentLobby_EventScript_208B06
+	case 1, SlateportCity_BattleTentLobby_EventScript_208B14
+	case 2, SlateportCity_BattleTentLobby_EventScript_208B22
+	case 3, SlateportCity_BattleTentLobby_EventScript_208B30
+	case 4, SlateportCity_BattleTentLobby_EventScript_208B3E
+	case 5, SlateportCity_BattleTentLobby_EventScript_208B4C
+	case 127, SlateportCity_BattleTentLobby_EventScript_208B4C
+	end
+
+SlateportCity_BattleTentLobby_EventScript_208B06:: @ 8208B06
+	msgbox SlateportCity_BattleTentLobby_Text_2C5F08, 4
+	goto SlateportCity_BattleTentLobby_EventScript_208AA8
+	end
+
+SlateportCity_BattleTentLobby_EventScript_208B14:: @ 8208B14
+	msgbox SlateportCity_BattleTentLobby_Text_2C5F9D, 4
+	goto SlateportCity_BattleTentLobby_EventScript_208AA8
+	end
+
+SlateportCity_BattleTentLobby_EventScript_208B22:: @ 8208B22
+	msgbox SlateportCity_BattleTentLobby_Text_2C6020, 4
+	goto SlateportCity_BattleTentLobby_EventScript_208AA8
+	end
+
+SlateportCity_BattleTentLobby_EventScript_208B30:: @ 8208B30
+	msgbox SlateportCity_BattleTentLobby_Text_2C60C0, 4
+	goto SlateportCity_BattleTentLobby_EventScript_208AA8
+	end
+
+SlateportCity_BattleTentLobby_EventScript_208B3E:: @ 8208B3E
+	msgbox SlateportCity_BattleTentLobby_Text_2C61FE, 4
+	goto SlateportCity_BattleTentLobby_EventScript_208AA8
+	end
+
+SlateportCity_BattleTentLobby_EventScript_208B4C:: @ 8208B4C
+	releaseall
+	end
+
+SlateportCity_BattleTentLobby_Text_208B4E: @ 8208B4E
+	.string "So, like, I couldn’t find myself any\n"
+	.string "POKéMON that were, like, for me.\p"
+	.string "So, I figured, like, hey, I should file\n"
+	.string "a complaint to the guy there?\p"
+	.string "And he wouldn’t hear me out, like, hey!\n"
+	.string "So, like, total bummer, man!\p"
+	.string "Hey, like, you! Zip it, you know?\n"
+	.string "Just, you know, take this!$"
+
+SlateportCity_BattleTentLobby_Text_208C5C: @ 8208C5C
+	.string "That’s, like, TM41, you know?\n"
+	.string "Hey, it’s TORMENT, you hearing me?\p"
+	.string "Like, it won’t let the other guy\n"
+	.string "use the same move twice in a row, see?\p"
+	.string "Hey, now, you listen here, like,\n"
+	.string "I’m not laying a torment on you!$"
+
+SlateportCity_BattleTentLobby_Text_208D27: @ 8208D27
+	.string "I don’t really like BUG POKéMON,\n"
+	.string "but maybe I’ll try using some for\l"
+	.string "a change of pace.\p"
+	.string "Who knows, I might even get to like\n"
+	.string "them!$"
+
+SlateportCity_BattleTentLobby_Text_208DA6: @ 8208DA6
+	.string "You can battle all you want here even\n"
+	.string "if you don’t have any tough POKéMON.$"
+
+SlateportCity_BattleTentLobby_Text_208DF1: @ 8208DF1
+	.string "Wouldn’t it be nice if they had more of\n"
+	.string "a selection?$"
+
diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc
new file mode 100644
index 000000000..af274e22f
--- /dev/null
+++ b/data/maps/SlateportCity_Harbor/events.inc
@@ -0,0 +1,25 @@
+SlateportCity_Harbor_EventObjects: @ 852FA68
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905
+	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841
+	object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 860
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, 845
+	object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, 846
+	object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848
+
+SlateportCity_Harbor_MapWarps: @ 852FB28
+	warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY
+	warp_def 12, 14, 0, 8, MAP_SLATEPORT_CITY
+	warp_def 19, 15, 0, 9, MAP_SLATEPORT_CITY
+	warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY
+
+SlateportCity_Harbor_MapCoordEvents: @ 852FB48
+	coord_event 8, 11, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9BB
+	coord_event 8, 12, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9C7
+	coord_event 8, 13, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9D3
+	coord_event 8, 14, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9DF
+
+SlateportCity_Harbor_MapEvents:: @ 852FB88
+	map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0
+
diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc
index ca013f6f2..7f214b54c 100644
--- a/data/maps/SlateportCity_Harbor/header.inc
+++ b/data/maps/SlateportCity_Harbor/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_Harbor: @ 84831D8
-	.4byte SlateportCity_Harbor_MapAttributes
+	.4byte Harbor_Layout
 	.4byte SlateportCity_Harbor_MapEvents
 	.4byte SlateportCity_Harbor_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc
new file mode 100644
index 000000000..e1f373bb2
--- /dev/null
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -0,0 +1,567 @@
+SlateportCity_Harbor_MapScripts:: @ 820C97D
+	map_script 3, SlateportCity_Harbor_MapScript1_20C983
+	.byte 0
+
+SlateportCity_Harbor_MapScript1_20C983: @ 820C983
+	setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13
+	setvar VAR_TEMP_1, 0
+	compare VAR_0x40A0, 1
+	call_if 1, SlateportCity_Harbor_EventScript_20C9A9
+	checkflag FLAG_SYS_GAME_CLEAR
+	call_if 1, SlateportCity_Harbor_EventScript_20C9A5
+	end
+
+SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5
+	clearflag FLAG_0x35C
+	return
+
+SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9
+	savebgm MUS_AQA_0
+	setobjectxyperm 4, 12, 13
+	setobjectmovementtype 4, 9
+	setflag FLAG_0x389
+	return
+
+SlateportCity_Harbor_EventScript_20C9BB:: @ 820C9BB
+	lockall
+	setvar VAR_0x8008, 0
+	goto SlateportCity_Harbor_EventScript_20C9F5
+	end
+
+SlateportCity_Harbor_EventScript_20C9C7:: @ 820C9C7
+	lockall
+	setvar VAR_0x8008, 1
+	goto SlateportCity_Harbor_EventScript_20C9F5
+	end
+
+SlateportCity_Harbor_EventScript_20C9D3:: @ 820C9D3
+	lockall
+	setvar VAR_0x8008, 2
+	goto SlateportCity_Harbor_EventScript_20C9F5
+	end
+
+SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF
+	lockall
+	setvar VAR_0x8008, 3
+	applymovement 255, SlateportCity_Harbor_Movement_20CAEF
+	waitmovement 0
+	goto SlateportCity_Harbor_EventScript_20C9F5
+	end
+
+SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
+	applymovement 7, SlateportCity_Harbor_Movement_2725AA
+	waitmovement 0
+	applymovement 6, SlateportCity_Harbor_Movement_2725AA
+	applymovement 255, SlateportCity_Harbor_Movement_2725A6
+	waitmovement 0
+	msgbox SlateportCity_Harbor_Text_20D291, 4
+	closemessage
+	applymovement 6, SlateportCity_Harbor_Movement_20CAC8
+	applymovement 7, SlateportCity_Harbor_Movement_20CAC8
+	applymovement 8, SlateportCity_Harbor_Movement_20CAD2
+	waitmovement 0
+	removeobject 6
+	removeobject 7
+	removeobject 8
+	setvar VAR_0x40A0, 2
+	setflag FLAG_0x061
+	setflag FLAG_0x313
+	compare VAR_0x8008, 0
+	call_if 1, SlateportCity_Harbor_EventScript_20CA89
+	compare VAR_0x8008, 1
+	call_if 1, SlateportCity_Harbor_EventScript_20CA9E
+	compare VAR_0x8008, 2
+	call_if 1, SlateportCity_Harbor_EventScript_20CAB3
+	compare VAR_0x8008, 3
+	call_if 1, SlateportCity_Harbor_EventScript_20CAB3
+	msgbox SlateportCity_Harbor_Text_20D35A, 4
+	closemessage
+	setflag FLAG_0x335
+	setflag FLAG_0x336
+	moveobjectoffscreen 4
+	setobjectmovementtype 4, 10
+	releaseall
+	end
+
+SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89
+	applymovement 4, SlateportCity_Harbor_Movement_20CAE0
+	waitmovement 0
+	applymovement 255, SlateportCity_Harbor_Movement_2725AA
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E
+	applymovement 4, SlateportCity_Harbor_Movement_20CAE6
+	waitmovement 0
+	applymovement 255, SlateportCity_Harbor_Movement_2725A8
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3
+	applymovement 4, SlateportCity_Harbor_Movement_20CAEB
+	waitmovement 0
+	applymovement 255, SlateportCity_Harbor_Movement_2725A8
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_Movement_20CAC8: @ 820CAC8
+	delay_16
+	delay_16
+	jump_up
+	set_invisible
+	step_end
+
+SlateportCity_Harbor_Movement_20CACD: @ 820CACD
+	delay_16
+	delay_16
+	jump_up
+	set_invisible
+	step_end
+
+SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	step_end
+
+SlateportCity_Harbor_Movement_20CAE0: @ 820CAE0
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	step_end
+
+SlateportCity_Harbor_Movement_20CAE6: @ 820CAE6
+	walk_left
+	walk_left
+	walk_up
+	walk_left
+	step_end
+
+SlateportCity_Harbor_Movement_20CAEB: @ 820CAEB
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+SlateportCity_Harbor_Movement_20CAEF: @ 820CAEF
+	walk_up
+	step_end
+
+SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1
+	lock
+	faceplayer
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq SlateportCity_Harbor_EventScript_20CB06
+	msgbox SlateportCity_Harbor_Text_20CE20, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06
+	msgbox SlateportCity_Harbor_Text_20CE87, 4
+	message SlateportCity_Harbor_Text_20CF1C
+	waitmessage
+	goto SlateportCity_Harbor_EventScript_20CB1A
+	end
+
+SlateportCity_Harbor_EventScript_20CB1A:: @ 820CB1A
+	checkflag FLAG_0x1D0
+	goto_eq SlateportCity_Harbor_EventScript_20CB50
+	multichoicedefault 18, 8, 56, 2, 0
+	switch VAR_RESULT
+	case 0, SlateportCity_Harbor_EventScript_20CB92
+	case 1, SlateportCity_Harbor_EventScript_20CC2D
+	case 127, SlateportCity_Harbor_EventScript_20CC2D
+	end
+
+SlateportCity_Harbor_EventScript_20CB50:: @ 820CB50
+	multichoicedefault 17, 6, 52, 2, 0
+	switch VAR_RESULT
+	case 0, SlateportCity_Harbor_EventScript_20CB92
+	case 1, SlateportCity_Harbor_EventScript_20CBBA
+	case 2, SlateportCity_Harbor_EventScript_20CC2D
+	case 127, SlateportCity_Harbor_EventScript_20CC2D
+	end
+
+SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88
+	msgbox SlateportCity_Harbor_Text_20CEC1, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92
+	msgbox SlateportCity_Harbor_Text_20CF93, 5
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_Harbor_EventScript_20CBDD
+	setvar VAR_PORTHOLE, 1
+	call SlateportCity_Harbor_EventScript_20CBE9
+	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
+	waitstate
+	release
+	end
+
+SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA
+	msgbox SlateportCity_Harbor_Text_20CFAE, 5
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_Harbor_EventScript_20CBDD
+	call SlateportCity_Harbor_EventScript_20CBE9
+	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
+	waitstate
+	release
+	end
+
+SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD
+	message SlateportCity_Harbor_Text_20CFFA
+	waitmessage
+	goto SlateportCity_Harbor_EventScript_20CB1A
+	end
+
+SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9
+	msgbox SlateportCity_Harbor_Text_20CFCB, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6
+	waitmovement 0
+	delay 30
+	hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR
+	compare VAR_FACING, 2
+	call_if 1, SlateportCity_Harbor_EventScript_20CC42
+	compare VAR_FACING, 4
+	call_if 1, SlateportCity_Harbor_EventScript_20CC37
+	delay 30
+	hideobjectat 255, MAP_PETALBURG_CITY
+	setvar VAR_0x8004, 5
+	call SlateportCity_Harbor_EventScript_2721E2
+	return
+
+SlateportCity_Harbor_EventScript_20CC2D:: @ 820CC2D
+	msgbox SlateportCity_Harbor_Text_20CF71, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_20CC37:: @ 820CC37
+	applymovement 255, SlateportCity_Harbor_Movement_20CC4D
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_EventScript_20CC42:: @ 820CC42
+	applymovement 255, SlateportCity_Harbor_Movement_20CC50
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_Movement_20CC4D: @ 820CC4D
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+SlateportCity_Harbor_Movement_20CC50: @ 820CC50
+	walk_up
+	step_end
+
+SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52
+	lock
+	faceplayer
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_if 0, SlateportCity_Harbor_EventScript_20CC89
+	setvar VAR_0x8004, 0
+	checkflag FLAG_0x1BE
+	call_if 1, SlateportCity_Harbor_EventScript_20CC93
+	checkflag FLAG_0x1BF
+	call_if 1, SlateportCity_Harbor_EventScript_20CC93
+	compare VAR_0x8004, 2
+	goto_eq SlateportCity_Harbor_EventScript_20CC89
+	msgbox SlateportCity_Harbor_Text_20D08E, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_20CC89:: @ 820CC89
+	msgbox SlateportCity_Harbor_Text_20D01C, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_20CC93:: @ 820CC93
+	addvar VAR_0x8004, 1
+	return
+
+SlateportCity_Harbor_EventScript_20CC99:: @ 820CC99
+	msgbox SlateportCity_Harbor_Text_20D194, 2
+	end
+
+SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2
+	lock
+	faceplayer
+	checkflag FLAG_BADGE07_GET
+	goto_eq SlateportCity_Harbor_EventScript_20CD00
+	checkflag FLAG_0x10F
+	goto_eq SlateportCity_Harbor_EventScript_20CCF6
+	checkflag FLAG_0x070
+	goto_eq SlateportCity_Harbor_EventScript_20CCE9
+	compare VAR_0x40A0, 2
+	goto_eq SlateportCity_Harbor_EventScript_20CCDF
+	msgbox SlateportCity_Harbor_Text_20D232, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SlateportCity_Harbor_EventScript_20CCDF:: @ 820CCDF
+	msgbox SlateportCity_Harbor_Text_20D35A, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_20CCE9:: @ 820CCE9
+	setflag FLAG_0x10F
+	msgbox SlateportCity_Harbor_Text_20D42B, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6
+	msgbox SlateportCity_Harbor_Text_20D58A, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00
+	compare VAR_TEMP_1, 1
+	goto_eq SlateportCity_Harbor_EventScript_20CE11
+	checkitem ITEM_SCANNER, 1
+	compare VAR_RESULT, 1
+	goto_eq SlateportCity_Harbor_EventScript_20CD38
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq SlateportCity_Harbor_EventScript_20CD2E
+	msgbox SlateportCity_Harbor_Text_20D65C, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_20CD2E:: @ 820CD2E
+	msgbox SlateportCity_Harbor_Text_20D6CB, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_20CD38:: @ 820CD38
+	message SlateportCity_Harbor_Text_20D76C
+	waitmessage
+	goto SlateportCity_Harbor_EventScript_20CD44
+	end
+
+SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44
+	multichoice 0, 0, 46, 0
+	switch VAR_RESULT
+	case 0, SlateportCity_Harbor_EventScript_20CD7B
+	case 1, SlateportCity_Harbor_EventScript_20CDBB
+	case 2, SlateportCity_Harbor_EventScript_20CDFB
+	case 127, SlateportCity_Harbor_EventScript_20CDFB
+	end
+
+SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B
+	msgbox SlateportCity_Harbor_Text_20D8BC, 5
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_Harbor_EventScript_20CE05
+	giveitem_std ITEM_DEEP_SEA_TOOTH
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_Harbor_EventScript_272054
+	takeitem ITEM_SCANNER, 1
+	msgbox SlateportCity_Harbor_Text_20D94A, 4
+	setflag FLAG_0x126
+	goto SlateportCity_Harbor_EventScript_20CE11
+	end
+
+SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB
+	msgbox SlateportCity_Harbor_Text_20D8F1, 5
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_Harbor_EventScript_20CE05
+	giveitem_std ITEM_DEEP_SEA_SCALE
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_Harbor_EventScript_272054
+	takeitem ITEM_SCANNER, 1
+	msgbox SlateportCity_Harbor_Text_20D94A, 4
+	setflag FLAG_0x126
+	goto SlateportCity_Harbor_EventScript_20CE11
+	end
+
+SlateportCity_Harbor_EventScript_20CDFB:: @ 820CDFB
+	msgbox SlateportCity_Harbor_Text_20D841, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_20CE05:: @ 820CE05
+	message SlateportCity_Harbor_Text_20D926
+	waitmessage
+	goto SlateportCity_Harbor_EventScript_20CD44
+	end
+
+SlateportCity_Harbor_EventScript_20CE11:: @ 820CE11
+	setvar VAR_TEMP_1, 1
+	msgbox SlateportCity_Harbor_Text_20D970, 4
+	release
+	end
+
+SlateportCity_Harbor_Text_20CE20: @ 820CE20
+	.string "I beg your pardon?\n"
+	.string "You’re looking for a ship?\p"
+	.string "I’m sorry, the ferry service isn’t\n"
+	.string "available at present…$"
+
+SlateportCity_Harbor_Text_20CE87: @ 820CE87
+	.string "Hello, are you here for the ferry?\n"
+	.string "May I see your TICKET?$"
+
+
+SlateportCity_Harbor_Text_20CEC1: @ 820CEC1
+	.string "{PLAYER} doesn’t have the TICKET…\p"
+	.string "I’m terribly sorry.\p"
+	.string "You must have a TICKET to board\n"
+	.string "the ferry.$"
+
+SlateportCity_Harbor_Text_20CF1C: @ 820CF1C
+	.string "{PLAYER} flashed the TICKET.\p"
+	.string "Perfect! That’s all you need!\p"
+	.string "And where would you like to go?$"
+
+SlateportCity_Harbor_Text_20CF71: @ 820CF71
+	.string "Please sail with us another time!$"
+
+SlateportCity_Harbor_Text_20CF93: @ 820CF93
+	.string "LILYCOVE CITY it is, then!$"
+
+SlateportCity_Harbor_Text_20CFAE: @ 820CFAE
+	.string "BATTLE FRONTIER it is, then!$"
+
+SlateportCity_Harbor_Text_20CFCB: @ 820CFCB
+	.string "Please board the ferry and wait for\n"
+	.string "departure.$"
+
+SlateportCity_Harbor_Text_20CFFA: @ 820CFFA
+	.string "Then, where would you like to go?$"
+
+SlateportCity_Harbor_Text_20D01C: @ 820D01C
+	.string "A journey to the bottom of the sea…\n"
+	.string "I wonder what it’d be like?\p"
+	.string "I’d love to go deep underwater like\n"
+	.string "that someday.$"
+
+SlateportCity_Harbor_Text_20D08E: @ 820D08E
+	.string "For a ship to sail safely, we need to\n"
+	.string "know about the weather!\p"
+	.string "Speaking of weather, I heard something\n"
+	.string "from a guy at the WEATHER INSTITUTE.\p"
+	.string "He was saying abnormal weather has\n"
+	.string "been reported all over the place!\p"
+	.string "You should visit the WEATHER INSTITUTE\n"
+	.string "and ask around!$"
+
+SlateportCity_Harbor_Text_20D194: @ 820D194
+	.string "I wanted to go with CAPT. STERN on\n"
+	.string "the ocean floor exploration.\p"
+	.string "But the sub’s too small for me.\p"
+	.string "If I squeezed in, there wouldn’t be\n"
+	.string "any room for the CAPTAIN…$"
+
+SlateportCity_Harbor_Text_20D232: @ 820D232
+	.string "CAPT. STERN: Those thugs…\p"
+	.string "They’re the same lot who tried to rob\n"
+	.string "the DEVON GOODS at the MUSEUM.$"
+
+SlateportCity_Harbor_Text_20D291: @ 820D291
+	.string "ARCHIE: Oh?\n"
+	.string "Not you again…\p"
+	.string "You are tenacious to track us here,\n"
+	.string "that much I will give you.\p"
+	.string "But now…\n"
+	.string "No one can stop us! No one!\p"
+	.string "Or, will you follow us back to our\n"
+	.string "HIDEOUT in LILYCOVE CITY?\p"
+	.string "Fwahahahaha…$"
+
+SlateportCity_Harbor_Text_20D35A: @ 820D35A
+	.string "CAPT. STERN: Why…\p"
+	.string "Why would TEAM AQUA steal my\n"
+	.string "SUBMARINE EXPLORER 1?\p"
+	.string "They can’t be after the slumbering\n"
+	.string "POKéMON at the bottom of the sea…\p"
+	.string "But even if I were to chase them,\n"
+	.string "I don’t stand a chance against them…$"
+
+SlateportCity_Harbor_Text_20D42B: @ 820D42B
+	.string "CAPT. STERN: Oh, {PLAYER}{KUN}…\p"
+	.string "Okay… So TEAM AQUA left before you\n"
+	.string "could stop them…\p"
+	.string "Oh, no, don’t blame yourself.\n"
+	.string "You’re not responsible for this.\p"
+	.string "Trying to catch a submarine…\n"
+	.string "It’s impossible for most people.\p"
+	.string "You would need a POKéMON that knows\n"
+	.string "how to DIVE…\p"
+	.string "Perhaps if you went out to\n"
+	.string "MOSSDEEP CITY…\p"
+	.string "A lot of divers live out there, so\n"
+	.string "someone might teach you…$"
+
+SlateportCity_Harbor_Text_20D58A: @ 820D58A
+	.string "CAPT. STERN: Trying to catch a\n"
+	.string "submarine… It’s impossible.\p"
+	.string "You would need a POKéMON that knows\n"
+	.string "how to DIVE…\p"
+	.string "Perhaps if you went out to\n"
+	.string "MOSSDEEP CITY…\p"
+	.string "A lot of divers live out there, so\n"
+	.string "someone might teach you…$"
+
+SlateportCity_Harbor_Text_20D65C: @ 820D65C
+	.string "CAPT. STERN: Oh, yes.\n"
+	.string "MR. BRINEY came to our SHIPYARD.\p"
+	.string "It won’t be long now before we finish\n"
+	.string "making the ferry!$"
+
+SlateportCity_Harbor_Text_20D6CB: @ 820D6CB
+	.string "CAPT. STERN: {PLAYER}{KUN}!\p"
+	.string "We finally finished making the ferry\n"
+	.string "S.S. TIDAL!\p"
+	.string "We couldn’t have done it without\n"
+	.string "your friend MR. BRINEY.\p"
+	.string "Please go for a short cruise on it!$"
+
+SlateportCity_Harbor_Text_20D76C: @ 820D76C
+	.string "CAPT. STERN: Oh?\n"
+	.string "{PLAYER}{KUN}, that item you have…\p"
+	.string "That’s a SCANNER! That would sure\n"
+	.string "help us on our explorations.\p"
+	.string "{PLAYER}{KUN}, would you trade your\n"
+	.string "SCANNER for something?\p"
+	.string "Like, say, a DEEPSEATOOTH or\n"
+	.string "a DEEPSEASCALE that I have?$"
+
+SlateportCity_Harbor_Text_20D841: @ 820D841
+	.string "CAPT. STERN: Are you certain?\n"
+	.string "It’s useless to you, {PLAYER}{KUN}…\p"
+	.string "Well, okay, then. If you want to trade\n"
+	.string "your SCANNER, let me know.$"
+
+SlateportCity_Harbor_Text_20D8BC: @ 820D8BC
+	.string "CAPT. STERN: So you’ll trade it for\n"
+	.string "my DEEPSEATOOTH?$"
+
+SlateportCity_Harbor_Text_20D8F1: @ 820D8F1
+	.string "CAPT. STERN: So you’ll trade it for\n"
+	.string "my DEEPSEASCALE?$"
+
+SlateportCity_Harbor_Text_20D926: @ 820D926
+	.string "CAPT. STERN: Which one do you want?$"
+
+SlateportCity_Harbor_Text_20D94A: @ 820D94A
+	.string "{PLAYER} handed the SCANNER to\n"
+	.string "CAPT. STERN.$"
+
+SlateportCity_Harbor_Text_20D970: @ 820D970
+	.string "CAPT. STERN: Thanks, {PLAYER}{KUN}!\n"
+	.string "This will help our research a lot!$"
+
diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc
new file mode 100644
index 000000000..493bb2922
--- /dev/null
+++ b/data/maps/SlateportCity_House1/events.inc
@@ -0,0 +1,10 @@
+SlateportCity_House1_EventObjects: @ 852F538
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0
+
+SlateportCity_House1_MapWarps: @ 852F550
+	warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY
+	warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY
+
+SlateportCity_House1_MapEvents:: @ 852F560
+	map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc
index a5cf37a59..4f7bc3f98 100644
--- a/data/maps/SlateportCity_House1/header.inc
+++ b/data/maps/SlateportCity_House1/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_House1: @ 8483168
-	.4byte SlateportCity_House1_MapAttributes
+	.4byte HouseWithBed_Layout
 	.4byte SlateportCity_House1_MapEvents
 	.4byte SlateportCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/scripts.inc
index 8ecc859f7..8ecc859f7 100644
--- a/data/scripts/maps/SlateportCity_House1.inc
+++ b/data/maps/SlateportCity_House1/scripts.inc
diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc
new file mode 100644
index 000000000..42d0e3660
--- /dev/null
+++ b/data/maps/SlateportCity_House2/events.inc
@@ -0,0 +1,11 @@
+SlateportCity_House2_EventObjects: @ 852FB9C
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0
+
+SlateportCity_House2_MapWarps: @ 852FBCC
+	warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY
+	warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY
+
+SlateportCity_House2_MapEvents:: @ 852FBDC
+	map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc
index 1c1ed9f6a..12389ed44 100644
--- a/data/maps/SlateportCity_House2/header.inc
+++ b/data/maps/SlateportCity_House2/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_House2: @ 84831F4
-	.4byte SlateportCity_House2_MapAttributes
+	.4byte House2_Layout
 	.4byte SlateportCity_House2_MapEvents
 	.4byte SlateportCity_House2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/scripts.inc
index 28a05ed38..28a05ed38 100644
--- a/data/scripts/maps/SlateportCity_House2.inc
+++ b/data/maps/SlateportCity_House2/scripts.inc
diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc
new file mode 100644
index 000000000..d6391598e
--- /dev/null
+++ b/data/maps/SlateportCity_Mart/events.inc
@@ -0,0 +1,12 @@
+SlateportCity_Mart_EventObjects: @ 852FCF0
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0
+
+SlateportCity_Mart_MapWarps: @ 852FD38
+	warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY
+	warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY
+
+SlateportCity_Mart_MapEvents:: @ 852FD48
+	map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc
index 8b0bd21a3..e13692bba 100644
--- a/data/maps/SlateportCity_Mart/header.inc
+++ b/data/maps/SlateportCity_Mart/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_Mart: @ 8483248
-	.4byte SlateportCity_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte SlateportCity_Mart_MapEvents
 	.4byte SlateportCity_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/scripts.inc
index da217f809..da217f809 100644
--- a/data/scripts/maps/SlateportCity_Mart.inc
+++ b/data/maps/SlateportCity_Mart/scripts.inc
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
new file mode 100644
index 000000000..cfe385a3c
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
@@ -0,0 +1,43 @@
+SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883
+	object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883
+	object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961
+	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961
+	object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961
+	object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961
+	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, 21, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965
+	object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961
+
+SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0
+	warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY
+	warp_def 10, 8, 0, 7, MAP_SLATEPORT_CITY
+	warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F
+
+SlateportCity_OceanicMuseum_1F_MapCoordEvents: @ 852F7D8
+	coord_event 9, 7, 3, 0, VAR_0x40AA, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F
+	coord_event 10, 7, 3, 0, VAR_0x40AA, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20ADB0
+
+SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8
+	bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE83
+	bg_event 2, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE8C
+	bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE95
+	bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E
+	bg_event 10, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE95
+	bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E
+	bg_event 15, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEA7
+	bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEB0
+	bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEB9
+	bg_event 2, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2
+	bg_event 3, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2
+	bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AECB
+	bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AECB
+
+SlateportCity_OceanicMuseum_1F_MapEvents:: @ 852F894
+	map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents
+
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
index b5be36774..4b0224075 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_OceanicMuseum_1F: @ 84831A0
-	.4byte SlateportCity_OceanicMuseum_1F_MapAttributes
+	.4byte SlateportCity_OceanicMuseum_1F_Layout
 	.4byte SlateportCity_OceanicMuseum_1F_MapEvents
 	.4byte SlateportCity_OceanicMuseum_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
index 4464ee582..4464ee582 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
new file mode 100644
index 000000000..dc0c8a8d9
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
@@ -0,0 +1,38 @@
+SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887
+	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 886
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 884
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 885
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961
+	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961
+
+SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950
+	warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
+
+SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958
+	bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A
+	bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD13
+	bg_event 4, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD52
+	bg_event 4, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD52
+	bg_event 3, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
+	bg_event 2, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
+	bg_event 3, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
+	bg_event 3, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
+	bg_event 4, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
+	bg_event 13, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B
+	bg_event 14, 7, 3, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B
+	bg_event 18, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD37
+	bg_event 19, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD37
+	bg_event 15, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E
+	bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E
+	bg_event 8, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD25
+	bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD25
+	bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C
+	bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C
+	bg_event 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
+	bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
+
+SlateportCity_OceanicMuseum_2F_MapEvents:: @ 852FA54
+	map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents
+
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
index 6d9439419..7d4272d09 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_OceanicMuseum_2F: @ 84831BC
-	.4byte SlateportCity_OceanicMuseum_2F_MapAttributes
+	.4byte SlateportCity_OceanicMuseum_2F_Layout
 	.4byte SlateportCity_OceanicMuseum_2F_MapEvents
 	.4byte SlateportCity_OceanicMuseum_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index 4172c47ef..4172c47ef 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..f59413aba
--- /dev/null
+++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,13 @@
+SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0
+
+SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38
+	warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY
+	warp_def 6, 8, 3, 0, MAP_SLATEPORT_CITY
+	warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F
+
+SlateportCity_PokemonCenter_1F_MapEvents:: @ 852FC50
+	map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
index c19ff9c4b..8d1e8cc17 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_PokemonCenter_1F: @ 8483210
-	.4byte SlateportCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte SlateportCity_PokemonCenter_1F_MapEvents
 	.4byte SlateportCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
index 404804c57..404804c57 100644
--- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..f59512311
--- /dev/null
+++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702
+
+SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4
+	warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+SlateportCity_PokemonCenter_2F_MapEvents:: @ 852FCDC
+	map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
index 345e8632a..7bf64b603 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_PokemonCenter_2F: @ 848322C
-	.4byte SlateportCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte SlateportCity_PokemonCenter_2F_MapEvents
 	.4byte SlateportCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
index 3138f20d6..3138f20d6 100644
--- a/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc
new file mode 100644
index 000000000..92974f5b4
--- /dev/null
+++ b/data/maps/SlateportCity_PokemonFanClub/events.inc
@@ -0,0 +1,18 @@
+SlateportCity_PokemonFanClub_EventObjects: @ 852F574
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, 3, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0
+	object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0
+	object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0
+	object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 3, 9, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0
+	object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0
+	object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 11, 8, 0, 9, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0
+
+SlateportCity_PokemonFanClub_MapWarps: @ 852F64C
+	warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY
+	warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY
+
+SlateportCity_PokemonFanClub_MapEvents:: @ 852F65C
+	map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc
index 70d0dc41c..87a6c0c5b 100644
--- a/data/maps/SlateportCity_PokemonFanClub/header.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_PokemonFanClub: @ 8483184
-	.4byte SlateportCity_PokemonFanClub_MapAttributes
+	.4byte SlateportCity_PokemonFanClub_Layout
 	.4byte SlateportCity_PokemonFanClub_MapEvents
 	.4byte SlateportCity_PokemonFanClub_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
index 307f42af5..307f42af5 100644
--- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
new file mode 100644
index 000000000..b231f9816
--- /dev/null
+++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
@@ -0,0 +1,14 @@
+SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, 2, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869
+
+SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378
+	warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY
+	warp_def 3, 14, 0, 2, MAP_SLATEPORT_CITY
+	warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F
+
+SlateportCity_SternsShipyard_1F_MapEvents:: @ 852F390
+	map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
index f30894e60..c04b411f1 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_SternsShipyard_1F: @ 84830DC
-	.4byte SlateportCity_SternsShipyard_1F_MapAttributes
+	.4byte SlateportCity_SternsShipyard_1F_Layout
 	.4byte SlateportCity_SternsShipyard_1F_MapEvents
 	.4byte SlateportCity_SternsShipyard_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
index 8197eb873..8197eb873 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc
new file mode 100644
index 000000000..450f40fe7
--- /dev/null
+++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc
@@ -0,0 +1,11 @@
+SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0
+
+SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC
+	warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F
+
+SlateportCity_SternsShipyard_2F_MapEvents:: @ 852F3F4
+	map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
index c409b3df7..e3b36f4ed 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_SternsShipyard_2F: @ 84830F8
-	.4byte SlateportCity_SternsShipyard_2F_MapAttributes
+	.4byte SlateportCity_SternsShipyard_2F_Layout
 	.4byte SlateportCity_SternsShipyard_2F_MapEvents
 	.4byte SlateportCity_SternsShipyard_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
index a599ac9b8..a599ac9b8 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc
new file mode 100644
index 000000000..96aaefd9c
--- /dev/null
+++ b/data/maps/SootopolisCity/events.inc
@@ -0,0 +1,46 @@
+SootopolisCity_EventObjects: @ 8527314
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 31, 18, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 33, 0, 9, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854
+	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839
+	object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, 973
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, 3, 1, 1, 0, 0, SootopolisCity_EventScript_1E6038, 0
+	object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, 80, 1, 1, 0, 0, 0x0, 998
+	object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, 79, 1, 1, 0, 0, 0x0, 997
+	object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, 10, 1, 1, 0, 0, 0x0, 996
+	object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, 854
+	object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, 854
+	object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, 854
+	object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, 854
+	object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, 827
+	object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, 826
+	object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, 816
+
+SootopolisCity_MapWarps: @ 85274C4
+	warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F
+	warp_def 17, 29, 0, 0, MAP_SOOTOPOLIS_CITY_MART
+	warp_def 31, 32, 0, 0, MAP_SOOTOPOLIS_CITY_GYM_1F
+	warp_def 31, 16, 3, 0, MAP_CAVE_OF_ORIGIN_ENTRANCE
+	warp_def 9, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE1
+	warp_def 45, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE2
+	warp_def 9, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE3
+	warp_def 44, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE4
+	warp_def 9, 26, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE5
+	warp_def 53, 28, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE6
+	warp_def 8, 35, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE7
+	warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE
+	warp_def 51, 36, 0, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F
+
+SootopolisCity_MapBGEvents: @ 852752C
+	bg_event 33, 34, 3, 0, 0, SootopolisCity_EventScript_1E614B
+	bg_event 19, 29, 0, 1, 0, SootopolisCity_EventScript_271E6A
+	bg_event 44, 31, 0, 1, 0, SootopolisCity_EventScript_271E73
+	bg_event 45, 31, 0, 1, 0, SootopolisCity_EventScript_271E73
+	bg_event 18, 29, 0, 1, 0, SootopolisCity_EventScript_271E6A
+	bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_1E6154
+
+SootopolisCity_MapEvents:: @ 8527574
+	map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents
+
diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc
index cb8f65244..74469da7c 100644
--- a/data/maps/SootopolisCity/header.inc
+++ b/data/maps/SootopolisCity/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity: @ 848257C
-	.4byte SootopolisCity_MapAttributes
+	.4byte SootopolisCity_Layout
 	.4byte SootopolisCity_MapEvents
 	.4byte SootopolisCity_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
new file mode 100644
index 000000000..5de8c7d12
--- /dev/null
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -0,0 +1,1784 @@
+SootopolisCity_MapScripts:: @ 81E565C
+	map_script 1, SootopolisCity_MapScript1_1E5676
+	map_script 3, SootopolisCity_MapScript1_1E56EF
+	map_script 5, SootopolisCity_MapScript1_1E590B
+	map_script 2, SootopolisCity_MapScript2_1E5914
+	map_script 4, SootopolisCity_MapScript2_1E58DB
+	.byte 0
+
+SootopolisCity_MapScript1_1E5676: @ 81E5676
+	checkflag FLAG_0x09E
+	call_if 0, SootopolisCity_EventScript_1E56E5
+	checkflag FLAG_0x081
+	goto_if 0, SootopolisCity_EventScript_1E5692
+	checkflag FLAG_0x09E
+	call_if 0, SootopolisCity_EventScript_1E5693
+	end
+
+SootopolisCity_EventScript_1E5692:: @ 81E5692
+	end
+
+SootopolisCity_EventScript_1E5693:: @ 81E5693
+	setmetatile 9, 6, 584, 1
+	setmetatile 9, 17, 584, 1
+	setmetatile 9, 26, 584, 1
+	setmetatile 44, 17, 584, 1
+	setmetatile 8, 35, 584, 1
+	setmetatile 53, 28, 584, 1
+	setmetatile 45, 6, 584, 1
+	setmetatile 48, 25, 584, 1
+	setmetatile 51, 36, 584, 1
+	return
+
+SootopolisCity_EventScript_1E56E5:: @ 81E56E5
+	setmetatile 31, 32, 592, 1
+	return
+
+SootopolisCity_MapScript1_1E56EF: @ 81E56EF
+	setflag FLAG_VISITED_SOOTOPOLIS_CITY
+	compare VAR_0x405E, 1
+	call_if 1, SootopolisCity_EventScript_1E5781
+	compare VAR_0x40CA, 1
+	call_if 1, SootopolisCity_EventScript_1E5781
+	call SootopolisCity_EventScript_1E5805
+	call SootopolisCity_EventScript_1E57B2
+	compare VAR_0x405E, 1
+	call_if 1, SootopolisCity_EventScript_1E5785
+	compare VAR_0x405E, 2
+	call_if 1, SootopolisCity_EventScript_1E5785
+	compare VAR_0x405E, 3
+	call_if 1, SootopolisCity_EventScript_1E5785
+	compare VAR_0x405E, 4
+	call_if 1, SootopolisCity_EventScript_1E5785
+	compare VAR_0x405E, 5
+	call_if 1, SootopolisCity_EventScript_1E5785
+	compare VAR_0x405E, 2
+	call_if 1, SootopolisCity_EventScript_1E5842
+	compare VAR_0x405E, 3
+	call_if 1, SootopolisCity_EventScript_1E5842
+	compare VAR_0x405E, 4
+	call_if 1, SootopolisCity_EventScript_1E585B
+	compare VAR_0x405E, 5
+	call_if 1, SootopolisCity_EventScript_1E5871
+	compare VAR_0x405E, 6
+	call_if 1, SootopolisCity_EventScript_1E58D3
+	end
+
+SootopolisCity_EventScript_1E5781:: @ 81E5781
+	setflag FLAG_SPECIAL_FLAG_0x4000
+	return
+
+SootopolisCity_EventScript_1E5785:: @ 81E5785
+	setobjectxyperm 3, 13, 48
+	setobjectxyperm 5, 46, 32
+	setobjectxyperm 4, 48, 41
+	setobjectxyperm 8, 45, 43
+	setobjectmovementtype 3, 7
+	setobjectmovementtype 5, 9
+	setobjectmovementtype 4, 9
+	setobjectmovementtype 8, 9
+	return
+
+SootopolisCity_EventScript_1E57B2:: @ 81E57B2
+	compare VAR_0x405E, 0
+	goto_eq SootopolisCity_EventScript_1E5800
+	compare VAR_0x405E, 6
+	goto_if 4, SootopolisCity_EventScript_1E5800
+	compare VAR_0x405E, 1
+	goto_eq SootopolisCity_EventScript_1E5801
+	compare VAR_0x405E, 2
+	goto_eq SootopolisCity_EventScript_1E5801
+	compare VAR_0x405E, 3
+	goto_eq SootopolisCity_EventScript_1E5801
+	compare VAR_0x405E, 4
+	goto_eq SootopolisCity_EventScript_1E5801
+	compare VAR_0x40CA, 1
+	goto_if 3, SootopolisCity_EventScript_1E5801
+	return
+
+SootopolisCity_EventScript_1E5800:: @ 81E5800
+	return
+
+SootopolisCity_EventScript_1E5801:: @ 81E5801
+	setmaplayoutindex 357
+	return
+
+SootopolisCity_EventScript_1E5805:: @ 81E5805
+	compare VAR_0x405E, 0
+	goto_eq SootopolisCity_EventScript_1E583D
+	compare VAR_0x405E, 6
+	goto_if 4, SootopolisCity_EventScript_1E583D
+	compare VAR_0x405E, 1
+	goto_eq SootopolisCity_EventScript_1E583E
+	compare VAR_0x40CA, 1
+	goto_eq SootopolisCity_EventScript_1E583E
+	compare VAR_0x40CA, 1
+	goto_if 3, SootopolisCity_EventScript_27207A
+	return
+
+SootopolisCity_EventScript_1E583D:: @ 81E583D
+	return
+
+SootopolisCity_EventScript_1E583E:: @ 81E583E
+	setweather 13
+	return
+
+SootopolisCity_EventScript_1E5842:: @ 81E5842
+	checkflag FLAG_0x133
+	goto_eq SootopolisCity_EventScript_1E584C
+	return
+
+SootopolisCity_EventScript_1E584C:: @ 81E584C
+	setobjectxyperm 1, 30, 18
+	setobjectxyperm 7, 32, 18
+	return
+
+SootopolisCity_EventScript_1E585B:: @ 81E585B
+	setobjectxyperm 1, 30, 18
+	setobjectxyperm 18, 31, 18
+	setobjectxyperm 7, 32, 18
+	end
+
+SootopolisCity_EventScript_1E5871:: @ 81E5871
+	setobjectxyperm 1, 31, 18
+	setobjectxyperm 7, 29, 33
+	setobjectxyperm 16, 33, 35
+	setobjectxyperm 17, 34, 35
+	compare VAR_0x40D8, 0
+	call_if 1, SootopolisCity_EventScript_1E58AF
+	compare VAR_0x40D8, 1
+	call_if 1, SootopolisCity_EventScript_1E58BB
+	compare VAR_0x40D8, 2
+	call_if 1, SootopolisCity_EventScript_1E58C7
+	return
+
+SootopolisCity_EventScript_1E58AF:: @ 81E58AF
+	setobjectxyperm 18, 31, 33
+	setobjectmovementtype 18, 8
+	return
+
+SootopolisCity_EventScript_1E58BB:: @ 81E58BB
+	setobjectxyperm 18, 32, 33
+	setobjectmovementtype 18, 8
+	return
+
+SootopolisCity_EventScript_1E58C7:: @ 81E58C7
+	setobjectxyperm 18, 30, 33
+	setobjectmovementtype 18, 8
+	return
+
+SootopolisCity_EventScript_1E58D3:: @ 81E58D3
+	setobjectxyperm 1, 31, 18
+	return
+
+SootopolisCity_MapScript2_1E58DB: @ 81E58DB
+	map_script_2 VAR_0x405E, 5, SootopolisCity_EventScript_1E58E5
+	.2byte 0
+
+SootopolisCity_EventScript_1E58E5:: @ 81E58E5
+	compare VAR_0x40CA, 1
+	call_if 1, SootopolisCity_EventScript_1E58FC
+	compare VAR_0x40CA, 2
+	call_if 1, SootopolisCity_EventScript_1E5901
+	end
+
+SootopolisCity_EventScript_1E58FC:: @ 81E58FC
+	turnobject 255, 2
+	return
+
+SootopolisCity_EventScript_1E5901:: @ 81E5901
+	turnobject 255, 2
+	setvar VAR_0x40CA, 3
+	return
+
+SootopolisCity_MapScript1_1E590B: @ 81E590B
+	setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6
+	end
+
+SootopolisCity_MapScript2_1E5914: @ 81E5914
+	map_script_2 VAR_0x405E, 1, SootopolisCity_EventScript_1E5926
+	map_script_2 VAR_0x40CA, 1, SootopolisCity_EventScript_1E5BFE
+	.2byte 0
+
+SootopolisCity_EventScript_1E5926:: @ 81E5926
+	lockall
+	special StorePlayerCoordsInVars
+	compare VAR_0x8004, 43
+	goto_if 5, SootopolisCity_EventScript_1E5A82
+	compare VAR_0x8005, 32
+	goto_if 5, SootopolisCity_EventScript_1E5A82
+	goto SootopolisCity_EventScript_1E5946
+	end
+
+SootopolisCity_EventScript_1E5946:: @ 81E5946
+	delay 60
+	special SpawnScriptEventObject
+	applymovement 127, SootopolisCity_Movement_1E5A68
+	waitmovement 0
+	special RemoveScriptEventObject
+	delay 60
+	fadescreenspeed 1, 8
+	setweather 15
+	doweather
+	setvar VAR_0x8004, 0
+	special sub_813B7D8
+	waitstate
+	applymovement 10, SootopolisCity_Movement_2725A4
+	applymovement 9, SootopolisCity_Movement_2725A8
+	waitmovement 0
+	delay 60
+	waitse
+	playmoncry SPECIES_KYOGRE, 2
+	applymovement 10, SootopolisCity_Movement_1E5BB8
+	applymovement 9, SootopolisCity_Movement_1E5BE5
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 8
+	setvar VAR_0x8007, 5
+	special sub_8139560
+	waitstate
+	applymovement 10, SootopolisCity_Movement_1E5BCF
+	applymovement 9, SootopolisCity_Movement_1E5BF0
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_GROUDON, 2
+	applymovement 10, SootopolisCity_Movement_1E5BC2
+	applymovement 9, SootopolisCity_Movement_1E5BDD
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 8
+	setvar VAR_0x8007, 5
+	special sub_8139560
+	waitstate
+	applymovement 10, SootopolisCity_Movement_1E5BCF
+	applymovement 9, SootopolisCity_Movement_1E5BF0
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_KYOGRE, 2
+	applymovement 10, SootopolisCity_Movement_1E5BB8
+	applymovement 9, SootopolisCity_Movement_1E5BE5
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 8
+	setvar VAR_0x8007, 5
+	special sub_8139560
+	waitstate
+	applymovement 10, SootopolisCity_Movement_1E5BCF
+	applymovement 9, SootopolisCity_Movement_1E5BF0
+	waitmovement 0
+	special SpawnScriptEventObject
+	applymovement 10, SootopolisCity_Movement_1E5BD6
+	applymovement 9, SootopolisCity_Movement_1E5BF7
+	applymovement 127, SootopolisCity_Movement_1E5A75
+	waitmovement 0
+	special RemoveScriptEventObject
+	setvar VAR_0x405E, 2
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	releaseall
+	end
+
+SootopolisCity_Movement_1E5A68: @ 81E5A68
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	step_end
+
+SootopolisCity_Movement_1E5A75: @ 81E5A75
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	step_end
+
+SootopolisCity_EventScript_1E5A82:: @ 81E5A82
+	delay 60
+	special SpawnScriptEventObject
+	applymovement 127, SootopolisCity_Movement_1E5BA4
+	waitmovement 0
+	special RemoveScriptEventObject
+	delay 60
+	fadescreenspeed 1, 8
+	setweather 15
+	doweather
+	setvar VAR_0x8004, 0
+	special sub_813B7D8
+	waitstate
+	applymovement 10, SootopolisCity_Movement_2725A4
+	applymovement 9, SootopolisCity_Movement_2725A8
+	waitmovement 0
+	delay 60
+	waitse
+	playmoncry SPECIES_KYOGRE, 2
+	applymovement 10, SootopolisCity_Movement_1E5BB8
+	applymovement 9, SootopolisCity_Movement_1E5BE5
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 8
+	setvar VAR_0x8007, 5
+	special sub_8139560
+	waitstate
+	applymovement 10, SootopolisCity_Movement_1E5BCF
+	applymovement 9, SootopolisCity_Movement_1E5BF0
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_GROUDON, 2
+	applymovement 10, SootopolisCity_Movement_1E5BC2
+	applymovement 9, SootopolisCity_Movement_1E5BDD
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 8
+	setvar VAR_0x8007, 5
+	special sub_8139560
+	waitstate
+	applymovement 10, SootopolisCity_Movement_1E5BCF
+	applymovement 9, SootopolisCity_Movement_1E5BF0
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_KYOGRE, 2
+	applymovement 10, SootopolisCity_Movement_1E5BB8
+	applymovement 9, SootopolisCity_Movement_1E5BE5
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 8
+	setvar VAR_0x8007, 5
+	special sub_8139560
+	waitstate
+	applymovement 10, SootopolisCity_Movement_1E5BCF
+	applymovement 9, SootopolisCity_Movement_1E5BF0
+	waitmovement 0
+	special SpawnScriptEventObject
+	applymovement 10, SootopolisCity_Movement_1E5BD6
+	applymovement 9, SootopolisCity_Movement_1E5BF7
+	applymovement 127, SootopolisCity_Movement_1E5BAE
+	waitmovement 0
+	special RemoveScriptEventObject
+	setvar VAR_0x405E, 2
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	releaseall
+	end
+
+SootopolisCity_Movement_1E5BA4: @ 81E5BA4
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+SootopolisCity_Movement_1E5BAE: @ 81E5BAE
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	step_end
+
+SootopolisCity_Movement_1E5BB8: @ 81E5BB8
+	walk_in_place_slow_left
+	walk_in_place_slow_left
+	walk_in_place_slow_left
+	delay_16
+	delay_16
+	delay_16
+	init_affine_anim
+	walk_left_affine
+	clear_affine_anim
+	step_end
+
+SootopolisCity_Movement_1E5BC2: @ 81E5BC2
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	init_affine_anim
+	walk_left_affine
+	clear_affine_anim
+	step_end
+
+SootopolisCity_Movement_1E5BCF: @ 81E5BCF
+	lock_facing_direction
+	walk_right
+	delay_16
+	delay_16
+	delay_16
+	unlock_facing_direction
+	step_end
+
+SootopolisCity_Movement_1E5BD6: @ 81E5BD6
+	walk_in_place_slow_left
+	walk_in_place_slow_left
+	walk_in_place_slow_left
+	walk_in_place_slow_left
+	walk_in_place_slow_left
+	walk_in_place_slow_left
+	step_end
+
+SootopolisCity_Movement_1E5BDD: @ 81E5BDD
+	walk_in_place_slow_right
+	walk_in_place_slow_right
+	walk_in_place_slow_right
+	delay_16
+	delay_16
+	delay_16
+	walk_fast_right
+	step_end
+
+SootopolisCity_Movement_1E5BE5: @ 81E5BE5
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_fast_right
+	step_end
+
+SootopolisCity_Movement_1E5BF0: @ 81E5BF0
+	lock_facing_direction
+	walk_left
+	delay_16
+	delay_16
+	delay_16
+	unlock_facing_direction
+	step_end
+
+SootopolisCity_Movement_1E5BF7: @ 81E5BF7
+	walk_in_place_slow_right
+	walk_in_place_slow_right
+	walk_in_place_slow_right
+	walk_in_place_slow_right
+	walk_in_place_slow_right
+	walk_in_place_slow_right
+	step_end
+
+SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE
+	lockall
+	special StorePlayerCoordsInVars
+	compare VAR_0x8004, 43
+	goto_if 5, SootopolisCity_EventScript_1E5CCE
+	compare VAR_0x8005, 32
+	goto_if 5, SootopolisCity_EventScript_1E5CCE
+	goto SootopolisCity_EventScript_1E5C1E
+	end
+
+SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
+	delay 60
+	special SpawnScriptEventObject
+	applymovement 127, SootopolisCity_Movement_1E5A68
+	waitmovement 0
+	special RemoveScriptEventObject
+	delay 60
+	fadescreenspeed 1, 8
+	call SootopolisCity_EventScript_1E5D82
+	removeobject 9
+	removeobject 10
+	addobject 11
+	setvar VAR_0x8004, 1
+	special sub_813B7D8
+	waitstate
+	playse SE_T_KAMI
+	special SpawnScriptEventObject
+	applymovement 127, SootopolisCity_Movement_1E5E63
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_RAYQUAZA, 2
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 8
+	setvar VAR_0x8007, 3
+	special sub_8139560
+	waitstate
+	waitse
+	playmoncry SPECIES_RAYQUAZA, 2
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 8
+	setvar VAR_0x8007, 5
+	special sub_8139560
+	waitstate
+	waitmoncry
+	setweather 0
+	doweather
+	applymovement 11, SootopolisCity_Movement_1E5E5B
+	waitmovement 0
+	removeobject 11
+	special WaitWeather
+	waitstate
+	clearflag FLAG_SYS_WEATHER_CTRL
+	setvar VAR_0x40CA, 3
+	clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
+	fadenewbgm MUS_RUNECITY
+	delay 120
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32
+	waitstate
+	end
+
+SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
+	delay 60
+	special SpawnScriptEventObject
+	applymovement 127, SootopolisCity_Movement_1E5BA4
+	waitmovement 0
+	special RemoveScriptEventObject
+	delay 60
+	fadescreenspeed 1, 8
+	call SootopolisCity_EventScript_1E5D82
+	removeobject 9
+	removeobject 10
+	addobject 11
+	setvar VAR_0x8004, 1
+	special sub_813B7D8
+	waitstate
+	special SpawnScriptEventObject
+	applymovement 127, SootopolisCity_Movement_1E5E63
+	applymovement 255, SootopolisCity_Movement_1E5E68
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_RAYQUAZA, 2
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 8
+	setvar VAR_0x8007, 3
+	special sub_8139560
+	waitstate
+	waitse
+	playmoncry SPECIES_RAYQUAZA, 2
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	setvar VAR_0x8006, 8
+	setvar VAR_0x8007, 5
+	special sub_8139560
+	waitstate
+	waitmoncry
+	setweather 0
+	doweather
+	applymovement 11, SootopolisCity_Movement_1E5E5B
+	waitmovement 0
+	removeobject 11
+	special WaitWeather
+	waitstate
+	clearflag FLAG_SYS_WEATHER_CTRL
+	setvar VAR_0x40CA, 2
+	clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
+	fadenewbgm MUS_NAMINORI
+	delay 120
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53
+	waitstate
+	end
+
+SootopolisCity_EventScript_1E5D82:: @ 81E5D82
+	setmetatile 27, 43, 656, 0
+	setmetatile 28, 43, 656, 0
+	setmetatile 29, 43, 656, 0
+	setmetatile 30, 43, 656, 0
+	setmetatile 27, 44, 656, 0
+	setmetatile 28, 44, 656, 0
+	setmetatile 29, 44, 656, 0
+	setmetatile 30, 44, 656, 0
+	setmetatile 27, 45, 656, 0
+	setmetatile 28, 45, 656, 0
+	setmetatile 29, 45, 656, 0
+	setmetatile 30, 45, 656, 0
+	setmetatile 32, 43, 656, 0
+	setmetatile 33, 43, 656, 0
+	setmetatile 34, 43, 656, 0
+	setmetatile 35, 43, 656, 0
+	setmetatile 32, 44, 656, 0
+	setmetatile 33, 44, 656, 0
+	setmetatile 34, 44, 656, 0
+	setmetatile 35, 44, 656, 0
+	setmetatile 32, 45, 656, 0
+	setmetatile 33, 45, 656, 0
+	setmetatile 34, 45, 656, 0
+	setmetatile 35, 45, 656, 0
+	return
+
+SootopolisCity_Movement_1E5E5B: @ 81E5E5B
+	walk_fast_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	step_end
+
+SootopolisCity_Movement_1E5E63: @ 81E5E63
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+SootopolisCity_Movement_1E5E68: @ 81E5E68
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+SootopolisCity_Movement_1E5E6D: @ 81E5E6D
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+SootopolisCity_Movement_1E5E72: @ 81E5E72
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+SootopolisCity_Movement_1E5E7F: @ 81E5E7F
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	step_end
+
+SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D
+	lock
+	faceplayer
+	compare VAR_0x405E, 6
+	goto_if 4, SootopolisCity_EventScript_1E5EC4
+	compare VAR_0x405E, 5
+	goto_eq SootopolisCity_EventScript_1E5ECE
+	compare VAR_0x405E, 2
+	goto_if 4, SootopolisCity_EventScript_1E5EBA
+	msgbox SootopolisCity_Text_1E6D77, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E5EBA:: @ 81E5EBA
+	msgbox SootopolisCity_Text_1E6DFE, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E5EC4:: @ 81E5EC4
+	msgbox SootopolisCity_Text_1E6F38, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE
+	msgbox SootopolisCity_Text_1E6ED4, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8
+	lock
+	faceplayer
+	compare VAR_0x405E, 1
+	goto_if 3, SootopolisCity_EventScript_1E5F1B
+	compare VAR_0x405E, 6
+	goto_if 4, SootopolisCity_EventScript_1E5F1B
+	compare VAR_0x405E, 5
+	goto_eq SootopolisCity_EventScript_1E5F10
+	msgbox SootopolisCity_Text_1E6BFF, 4
+	closemessage
+	applymovement 3, SootopolisCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SootopolisCity_EventScript_1E5F10:: @ 81E5F10
+	msgbox SootopolisCity_Text_1E6C53, 4
+	closemessage
+	release
+	end
+
+SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
+	dodailyevents
+	special GetPlayerBigGuyGirlString
+	checkflag FLAG_0x932
+	goto_eq SootopolisCity_EventScript_1E5FBB
+	msgbox SootopolisCity_Text_2A7BB0, 4
+	random 10
+	addvar VAR_RESULT, 20
+	addvar VAR_RESULT, 133
+	giveitem_std VAR_RESULT
+	compare VAR_RESULT, 0
+	goto_eq SootopolisCity_EventScript_272054
+	setflag FLAG_0x932
+	msgbox SootopolisCity_Text_2A7C7C, 4
+	random 2
+	compare VAR_RESULT, 0
+	goto_eq SootopolisCity_EventScript_1E5F79
+	compare VAR_RESULT, 1
+	goto_eq SootopolisCity_EventScript_1E5F9A
+	end
+
+SootopolisCity_EventScript_1E5F79:: @ 81E5F79
+	giveitem_std ITEM_FIGY_BERRY
+	compare VAR_RESULT, 0
+	goto_eq SootopolisCity_EventScript_272054
+	msgbox SootopolisCity_Text_2A7CB7, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A
+	giveitem_std ITEM_IAPAPA_BERRY
+	compare VAR_RESULT, 0
+	goto_eq SootopolisCity_EventScript_272054
+	msgbox SootopolisCity_Text_2A7CB7, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB
+	msgbox SootopolisCity_Text_2A7CEC, 5
+	compare VAR_RESULT, 1
+	goto_eq SootopolisCity_EventScript_1E5FD8
+	msgbox SootopolisCity_Text_2A7DD2, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8
+	msgbox SootopolisCity_Text_2A7D80, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2
+	lockall
+	applymovement 2, SootopolisCity_Movement_27259E
+	waitmovement 0
+	compare VAR_0x405E, 5
+	goto_eq SootopolisCity_EventScript_1E600D
+	msgbox SootopolisCity_Text_1E71A1, 4
+	closemessage
+	applymovement 2, SootopolisCity_Movement_2725A2
+	waitmovement 0
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E600D:: @ 81E600D
+	msgbox SootopolisCity_Text_1E728C, 4
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E6017:: @ 81E6017
+	lock
+	faceplayer
+	compare VAR_0x405E, 6
+	goto_if 4, SootopolisCity_EventScript_1E602E
+	msgbox SootopolisCity_Text_1E6CCA, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E602E:: @ 81E602E
+	msgbox SootopolisCity_Text_1E6D57, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E6038:: @ 81E6038
+	lock
+	faceplayer
+	compare VAR_0x405E, 6
+	goto_if 4, SootopolisCity_EventScript_1E607A
+	compare VAR_0x405E, 5
+	goto_eq SootopolisCity_EventScript_1E6084
+	compare VAR_0x405E, 2
+	goto_if 4, SootopolisCity_EventScript_1E6065
+	msgbox SootopolisCity_Text_1E6F90, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E6065:: @ 81E6065
+	msgbox SootopolisCity_Text_1E7078, 4
+	closemessage
+	applymovement 8, SootopolisCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SootopolisCity_EventScript_1E607A:: @ 81E607A
+	msgbox SootopolisCity_Text_1E710B, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E6084:: @ 81E6084
+	msgbox SootopolisCity_Text_1E70D4, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E608E:: @ 81E608E
+	lockall
+	applymovement 4, SootopolisCity_Movement_27259E
+	waitmovement 0
+	compare VAR_0x405E, 5
+	goto_eq SootopolisCity_EventScript_1E60D9
+	compare VAR_0x405E, 6
+	goto_if 4, SootopolisCity_EventScript_1E60CF
+	compare VAR_0x405E, 1
+	goto_if 3, SootopolisCity_EventScript_1E60CF
+	msgbox SootopolisCity_Text_1E690B, 4
+	closemessage
+	applymovement 4, SootopolisCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SootopolisCity_EventScript_1E60CF:: @ 81E60CF
+	msgbox SootopolisCity_Text_1E68A1, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E60D9:: @ 81E60D9
+	msgbox SootopolisCity_Text_1E6920, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E60E3:: @ 81E60E3
+	lockall
+	applymovement 5, SootopolisCity_Movement_27259E
+	waitmovement 0
+	compare VAR_0x405E, 5
+	goto_eq SootopolisCity_EventScript_1E612D
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq SootopolisCity_EventScript_1E6137
+	compare VAR_0x405E, 6
+	goto_if 4, SootopolisCity_EventScript_1E6141
+	compare VAR_0x405E, 1
+	goto_if 3, SootopolisCity_EventScript_1E6141
+	msgbox SootopolisCity_Text_1E6692, 4
+	closemessage
+	applymovement 5, SootopolisCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SootopolisCity_EventScript_1E612D:: @ 81E612D
+	msgbox SootopolisCity_Text_1E6750, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E6137:: @ 81E6137
+	msgbox SootopolisCity_Text_1E677F, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E6141:: @ 81E6141
+	msgbox SootopolisCity_Text_1E6618, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E614B:: @ 81E614B
+	msgbox SootopolisCity_Text_1E656F, 3
+	end
+
+SootopolisCity_EventScript_1E6154:: @ 81E6154
+	msgbox SootopolisCity_Text_1E65C8, 3
+	end
+
+SootopolisCity_EventScript_1E615D:: @ 81E615D
+	msgbox SootopolisCity_Text_1E6604, 3
+	end
+
+SootopolisCity_EventScript_1E6166:: @ 81E6166
+	lockall
+	applymovement 7, SootopolisCity_Movement_27259E
+	waitmovement 0
+	checkflag FLAG_0x133
+	call_if 0, SootopolisCity_EventScript_1E61CC
+	compare VAR_0x405E, 2
+	goto_eq SootopolisCity_EventScript_1E61AE
+	compare VAR_0x405E, 3
+	goto_eq SootopolisCity_EventScript_1E61C2
+	compare VAR_0x405E, 4
+	goto_eq SootopolisCity_EventScript_1E61C2
+	checkflag FLAG_0x09E
+	goto_eq SootopolisCity_EventScript_1E61B8
+	msgbox SootopolisCity_Text_1E78E5, 4
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E61AE:: @ 81E61AE
+	msgbox SootopolisCity_Text_1E7866, 4
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E61B8:: @ 81E61B8
+	msgbox SootopolisCity_Text_1E794B, 4
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E61C2:: @ 81E61C2
+	msgbox SootopolisCity_Text_1E789A, 4
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E61CC:: @ 81E61CC
+	msgbox SootopolisCity_Text_1E75CB, 4
+	closemessage
+	compare VAR_FACING, 3
+	call_if 1, SootopolisCity_EventScript_1E6243
+	compare VAR_FACING, 2
+	call_if 1, SootopolisCity_EventScript_1E6255
+	msgbox SootopolisCity_Text_1E7737, 4
+	closemessage
+	applymovement 7, SootopolisCity_Movement_1E62D4
+	applymovement 255, SootopolisCity_Movement_1E630E
+	waitmovement 0
+	delay 120
+	applymovement 1, SootopolisCity_Movement_1E6341
+	waitmovement 0
+	applymovement 7, SootopolisCity_Movement_1E6344
+	applymovement 255, SootopolisCity_Movement_1E634F
+	waitmovement 0
+	msgbox SootopolisCity_Text_1E77F0, 4
+	closemessage
+	setflag FLAG_0x133
+	applymovement 255, SootopolisCity_Movement_1E635A
+	waitmovement 0
+	warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20
+	waitstate
+	end
+
+SootopolisCity_EventScript_1E6243:: @ 81E6243
+	applymovement 7, SootopolisCity_Movement_1E6267
+	applymovement 255, SootopolisCity_Movement_1E628C
+	waitmovement 0
+	return
+
+SootopolisCity_EventScript_1E6255:: @ 81E6255
+	applymovement 7, SootopolisCity_Movement_1E6267
+	applymovement 255, SootopolisCity_Movement_1E62B0
+	waitmovement 0
+	return
+
+SootopolisCity_Movement_1E6267: @ 81E6267
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	step_end
+
+SootopolisCity_Movement_1E628C: @ 81E628C
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+SootopolisCity_Movement_1E62B0: @ 81E62B0
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+SootopolisCity_Movement_1E62D4: @ 81E62D4
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	delay_4
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_right
+	walk_up
+	walk_up
+	step_end
+
+SootopolisCity_Movement_1E630E: @ 81E630E
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+SootopolisCity_Movement_1E6341: @ 81E6341
+	walk_slow_left
+	walk_in_place_fastest_right
+	step_end
+
+SootopolisCity_Movement_1E6344: @ 81E6344
+	walk_down
+	walk_down
+	walk_left
+	delay_8
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_left
+	step_end
+
+SootopolisCity_Movement_1E634F: @ 81E634F
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
+	step_end
+
+SootopolisCity_Movement_1E635A: @ 81E635A
+	walk_up
+	walk_up
+	step_end
+
+SootopolisCity_EventScript_1E635D:: @ 81E635D
+	lockall
+	applymovement 15, SootopolisCity_Movement_27259E
+	waitmovement 0
+	compare VAR_0x405E, 5
+	goto_eq SootopolisCity_EventScript_1E6388
+	msgbox SootopolisCity_Text_1E67DC, 4
+	closemessage
+	applymovement 15, SootopolisCity_Movement_2725A2
+	waitmovement 0
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E6388:: @ 81E6388
+	msgbox SootopolisCity_Text_1E6853, 4
+	closemessage
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E6393:: @ 81E6393
+	lockall
+	compare VAR_0x405E, 5
+	goto_eq SootopolisCity_EventScript_1E63C7
+	msgbox SootopolisCity_Text_1E6936, 4
+	closemessage
+	applymovement 14, SootopolisCity_Movement_27259E
+	waitmovement 0
+	msgbox SootopolisCity_Text_1E696C, 4
+	closemessage
+	applymovement 14, SootopolisCity_Movement_2725A2
+	waitmovement 0
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E63C7:: @ 81E63C7
+	applymovement 14, SootopolisCity_Movement_27259E
+	waitmovement 0
+	msgbox SootopolisCity_Text_1E69B8, 4
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E63DB:: @ 81E63DB
+	lockall
+	applymovement 13, SootopolisCity_Movement_27259E
+	waitmovement 0
+	compare VAR_0x405E, 5
+	goto_eq SootopolisCity_EventScript_1E6406
+	msgbox SootopolisCity_Text_1E6C7C, 4
+	closemessage
+	applymovement 13, SootopolisCity_Movement_2725A2
+	waitmovement 0
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E6406:: @ 81E6406
+	msgbox SootopolisCity_Text_1E6CA6, 4
+	closemessage
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E6411:: @ 81E6411
+	lockall
+	applymovement 12, SootopolisCity_Movement_27259E
+	waitmovement 0
+	compare VAR_0x405E, 5
+	goto_eq SootopolisCity_EventScript_1E643C
+	msgbox SootopolisCity_Text_1E6A50, 4
+	closemessage
+	applymovement 12, SootopolisCity_Movement_2725A2
+	waitmovement 0
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E643C:: @ 81E643C
+	msgbox SootopolisCity_Text_1E6B2A, 4
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E6446:: @ 81E6446
+	lock
+	faceplayer
+	compare VAR_0x405E, 4
+	goto_eq SootopolisCity_EventScript_1E64D8
+	checkflag FLAG_0x138
+	goto_eq SootopolisCity_EventScript_1E64E2
+	checkflag FLAG_0x09E
+	goto_eq SootopolisCity_EventScript_1E646F
+	msgbox SootopolisCity_Text_1E7A3E, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E646F:: @ 81E646F
+	msgbox SootopolisCity_Text_1E7ACF, 4
+	giveitem_std ITEM_HM07
+	setflag FLAG_0x138
+	msgbox SootopolisCity_Text_1E7B86, 4
+	closemessage
+	compare VAR_FACING, 2
+	call_if 1, SootopolisCity_EventScript_1E64B2
+	compare VAR_FACING, 4
+	call_if 1, SootopolisCity_EventScript_1E64B2
+	compare VAR_FACING, 3
+	call_if 1, SootopolisCity_EventScript_1E64C5
+	release
+	end
+
+SootopolisCity_EventScript_1E64B2:: @ 81E64B2
+	applymovement 18, SootopolisCity_Movement_1E64EC
+	waitmovement 0
+	moveobjectoffscreen 18
+	setvar VAR_0x40D8, 1
+	return
+
+SootopolisCity_EventScript_1E64C5:: @ 81E64C5
+	applymovement 18, SootopolisCity_Movement_1E64EF
+	waitmovement 0
+	moveobjectoffscreen 18
+	setvar VAR_0x40D8, 2
+	return
+
+SootopolisCity_EventScript_1E64D8:: @ 81E64D8
+	msgbox SootopolisCity_Text_1E79C8, 4
+	release
+	end
+
+SootopolisCity_EventScript_1E64E2:: @ 81E64E2
+	msgbox SootopolisCity_Text_1E7CBC, 4
+	release
+	end
+
+SootopolisCity_Movement_1E64EC: @ 81E64EC
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+SootopolisCity_Movement_1E64EF: @ 81E64EF
+	walk_left
+	walk_in_place_fastest_down
+	step_end
+
+SootopolisCity_EventScript_1E64F2:: @ 81E64F2
+	lockall
+	compare VAR_0x405E, 5
+	goto_eq SootopolisCity_EventScript_1E6509
+	msgbox SootopolisCity_Text_1E72DB, 4
+	closemessage
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E6509:: @ 81E6509
+	msgbox SootopolisCity_Text_1E737E, 4
+	setflag FLAG_0x135
+	checkflag FLAG_0x134
+	goto_eq SootopolisCity_EventScript_1E654C
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E651F:: @ 81E651F
+	lockall
+	compare VAR_0x405E, 5
+	goto_eq SootopolisCity_EventScript_1E6536
+	msgbox SootopolisCity_Text_1E7460, 4
+	closemessage
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E6536:: @ 81E6536
+	msgbox SootopolisCity_Text_1E74F6, 4
+	setflag FLAG_0x134
+	checkflag FLAG_0x135
+	goto_eq SootopolisCity_EventScript_1E654C
+	releaseall
+	end
+
+SootopolisCity_EventScript_1E654C:: @ 81E654C
+	setflag FLAG_0x33B
+	setflag FLAG_0x33A
+	setflag FLAG_0x09E
+	clearflag FLAG_0x358
+	clearflag FLAG_0x394
+	setvar VAR_0x40B9, 2
+	warpsilent MAP_SOOTOPOLIS_CITY, 255, 31, 34
+	waitstate
+	releaseall
+	end
+
+SootopolisCity_Movement_1E656B:: @ 81E656B
+	levitate
+	step_end
+
+SootopolisCity_Movement_1E656D:: @ 81E656D
+	destroy_extra_task
+	step_end
+
+SootopolisCity_Text_1E656F: @ 81E656F
+	.string "SOOTOPOLIS CITY POKéMON GYM\n"
+	.string "LEADER: JUAN\p"
+	.string "“The GYM LEADER with the beauty\n"
+	.string "of pure water!”$"
+
+SootopolisCity_Text_1E65C8: @ 81E65C8
+	.string "SOOTOPOLIS CITY\p"
+	.string "“The mystical city where history\n"
+	.string "slumbers.”$"
+
+
+SootopolisCity_Text_1E6604: @ 81E6604
+	.string "The door is closed.$"
+
+SootopolisCity_Text_1E6618: @ 81E6618
+	.string "Diving in the sea. Climbing up and\n"
+	.string "down stairs all the time…\p"
+	.string "If you live in this town, you end up\n"
+	.string "getting physically fit.$"
+
+SootopolisCity_Text_1E6692: @ 81E6692
+	.string "These giant POKéMON suddenly appeared\n"
+	.string "in the middle of the city!\p"
+	.string "And, I’ve never seen them before!\p"
+	.string "Why are they smashing into each\n"
+	.string "other like that?\p"
+	.string "Why can’t they be friends, those\n"
+	.string "POKéMON?$"
+
+SootopolisCity_Text_1E6750: @ 81E6750
+	.string "What? What? What?\n"
+	.string "What is that green POKéMON?!$"
+
+SootopolisCity_Text_1E677F: @ 81E677F
+	.string "GROUDON and KYOGRE…\n"
+	.string "Where did they go?\p"
+	.string "Will they cause droughts or downpours\n"
+	.string "somewhere else?$"
+
+SootopolisCity_Text_1E67DC: @ 81E67DC
+	.string "I just get this sense somehow that\n"
+	.string "the two POKéMON aren’t angry.\p"
+	.string "I think… They probably can’t control\n"
+	.string "their own power…$"
+
+SootopolisCity_Text_1E6853: @ 81E6853
+	.string "That flying POKéMON came down from\n"
+	.string "the sky and stopped the rampaging\l"
+	.string "POKéMON…$"
+
+SootopolisCity_Text_1E68A1: @ 81E68A1
+	.string "I… I’ve never been out of this city.\p"
+	.string "I wonder what the world is like on\n"
+	.string "the other side of this round sky?$"
+
+SootopolisCity_Text_1E690B: @ 81E690B
+	.string "Wow!\n"
+	.string "This is wicked!$"
+
+SootopolisCity_Text_1E6920: @ 81E6920
+	.string "Wow!\n"
+	.string "That was wicked!$"
+
+SootopolisCity_Text_1E6936: @ 81E6936
+	.string "Go for it, red POKéMON!\n"
+	.string "Don’t back off, blue POKéMON!$"
+
+SootopolisCity_Text_1E696C: @ 81E696C
+	.string "… … … … … …\p"
+	.string "Hi, do you know the names of those\n"
+	.string "POKéMON fighting over there?$"
+
+SootopolisCity_Text_1E69B8: @ 81E69B8
+	.string "I was wondering which one would win,\n"
+	.string "the red one or the blue one, but, oh no,\l"
+	.string "it’s the green one that settles things!\p"
+	.string "Talk about a huge turn of events!$"
+
+SootopolisCity_Text_1E6A50: @ 81E6A50
+	.string "There’s an ancient legend that claims\n"
+	.string "the land and sea were shaped by\l"
+	.string "a colossal battle between POKéMON.\p"
+	.string "Well, I’m seeing that happen with\n"
+	.string "my very own eyes!\p"
+	.string "Whoa! I never expected to be\n"
+	.string "witness to something this huge!$"
+
+SootopolisCity_Text_1E6B2A: @ 81E6B2A
+	.string "There’s an ancient legend that claims\n"
+	.string "the land and sea were shaped by\l"
+	.string "a colossal battle between POKéMON.\p"
+	.string "Well, I saw that happen with\n"
+	.string "my very own eyes!\p"
+	.string "Whoa! I never expected to be\n"
+	.string "witness to something this huge!$"
+
+SootopolisCity_Text_1E6BFF: @ 81E6BFF
+	.string "A big POKéMON is fighting with\n"
+	.string "another big POKéMON!\p"
+	.string "Please, someone make them stop!$"
+
+SootopolisCity_Text_1E6C53: @ 81E6C53
+	.string "A pretty POKéMON came down from\n"
+	.string "the sky…$"
+
+SootopolisCity_Text_1E6C7C: @ 81E6C7C
+	.string "Oh, no!\n"
+	.string "SOOTOPOLIS CITY will get wrecked!$"
+
+SootopolisCity_Text_1E6CA6: @ 81E6CA6
+	.string "SOOTOPOLIS CITY didn’t get wrecked!$"
+
+SootopolisCity_Text_1E6CCA: @ 81E6CCA
+	.string "Hm!\n"
+	.string "You’ve come all the way to SOOTOPOLIS?\l"
+	.string "You’re no ordinary tourist.\p"
+	.string "But I suppose that doesn’t make you\n"
+	.string "an extraordinary tourist, either.$"
+
+SootopolisCity_Text_1E6D57: @ 81E6D57
+	.string "The city has regained its calm…$"
+
+SootopolisCity_Text_1E6D77: @ 81E6D77
+	.string "Who might you be?\p"
+	.string "This is the CAVE OF ORIGIN.\p"
+	.string "The spirits of POKéMON, becalmed at\n"
+	.string "MT. PYRE, are said to be revived here.\p"
+	.string "Please leave.$"
+
+SootopolisCity_Text_1E6DFE: @ 81E6DFE
+	.string "A person with a strong will and\n"
+	.string "superior talent…\p"
+	.string "A TRAINER who has knowledge and\n"
+	.string "experience of many kinds of POKéMON…\p"
+	.string "If such a person were to appear, I was\n"
+	.string "instructed by WALLACE to lead that\l"
+	.string "TRAINER to this CAVE.$"
+
+SootopolisCity_Text_1E6ED4: @ 81E6ED4
+	.string "Oh, my…\p"
+	.string "The clash between the two awakened\n"
+	.string "POKéMON was quelled by the awakening\l"
+	.string "of a third POKéMON…$"
+
+SootopolisCity_Text_1E6F38: @ 81E6F38
+	.string "This is the CAVE OF ORIGIN…\p"
+	.string "With the passing of the crisis,\n"
+	.string "the cave, too, shall sleep…$"
+
+SootopolisCity_Text_1E6F90: @ 81E6F90
+	.string "SOOTOPOLIS sprang up as a town in\n"
+	.string "the crater of a volcano.\p"
+	.string "If you look up at the sky, the lip of\n"
+	.string "the crater is also visible.\l"
+	.string "So, all you see is the sky in a circle.\p"
+	.string "But that’s what makes the sky above\n"
+	.string "SOOTOPOLIS the most beautiful.$"
+
+SootopolisCity_Text_1E7078: @ 81E7078
+	.string "When two POKéMON that gigantic\n"
+	.string "are fighting that savagely, there’s\l"
+	.string "not much that we can do.$"
+
+SootopolisCity_Text_1E70D4: @ 81E70D4
+	.string "When that third POKéMON flew down,\n"
+	.string "I feared the worst.$"
+
+SootopolisCity_Text_1E710B: @ 81E710B
+	.string "A circle of a night sky framed by\n"
+	.string "the crater of a volcano…\p"
+	.string "And in that ring, stars flicker and\n"
+	.string "blink as if they were alive…\l"
+	.string "It’s my favorite scenery.$"
+
+SootopolisCity_Text_1E71A1: @ 81E71A1
+	.string "The weather was clear this morning,\n"
+	.string "but…\p"
+	.string "All of a sudden, dark clouds brewed up,\n"
+	.string "rain started falling in sheets, and\l"
+	.string "there was thunder and lightning, too.\p"
+	.string "The weather just went completely\n"
+	.string "wild!\p"
+	.string "Is all of this because of those\n"
+	.string "POKéMON?$"
+
+SootopolisCity_Text_1E728C: @ 81E728C
+	.string "Oh?\p"
+	.string "It was you who brought that flying\n"
+	.string "POKéMON here?\p"
+	.string "Well, aren’t you amazing!$"
+
+SootopolisCity_Text_1E72DB: @ 81E72DB
+	.string "MAXIE: G… GROUDON…\n"
+	.string "Please! Stop what you’re doing!\p"
+	.string "I know the extent of your power now!\p"
+	.string "If you keep going, all HOENN, not just\n"
+	.string "SOOTOPOLIS, will be utterly ruined!$"
+
+SootopolisCity_Text_1E737E: @ 81E737E
+	.string "MAXIE: So the super-ancient POKéMON\n"
+	.string "weren’t only GROUDON and KYOGRE…\p"
+	.string "After all our fruitless scheming and\n"
+	.string "frantic efforts, that one POKéMON’s\l"
+	.string "simple action puts everything right\l"
+	.string "again as if nothing had happened…\p"
+	.string "Fu…\n"
+	.string "Fuhahaha…$"
+
+SootopolisCity_Text_1E7460: @ 81E7460
+	.string "ARCHIE: KYOGRE! What’s wrong?!\n"
+	.string "Look over here! It’s the RED ORB!\l"
+	.string "Calm down! KYOGRE!\p"
+	.string "… … … … … …\n"
+	.string "… … … … … …\p"
+	.string "It’s no good!\n"
+	.string "It’s not responding at all!$"
+
+SootopolisCity_Text_1E74F6: @ 81E74F6
+	.string "ARCHIE: KYOGRE and GROUDON both\n"
+	.string "flew off to who knows where.\p"
+	.string "The weather in HOENN has returned\n"
+	.string "to its normal state…\p"
+	.string "Haha…\n"
+	.string "Hahaha…\p"
+	.string "Maybe what we were trying to do was\n"
+	.string "something small, even meaningless,\l"
+	.string "to POKéMON…$"
+
+SootopolisCity_Text_1E75CB: @ 81E75CB
+	.string "STEVEN: Those POKéMON fighting…\n"
+	.string "GROUDON… And KYOGRE…\p"
+	.string "The two super-ancient POKéMON\n"
+	.string "were awakened from a long sleep…\p"
+	.string "And now they are smashing each other\n"
+	.string "with their uncontrollable energy…\p"
+	.string "…{PLAYER}{KUN}.\p"
+	.string "You being here now I’ll take to mean\n"
+	.string "that you’re prepared to become\l"
+	.string "involved in this crisis.\p"
+	.string "Well, then, there’s someone that\n"
+	.string "I’d like you to meet.\p"
+	.string "Come with me, please.$"
+
+SootopolisCity_Text_1E7737: @ 81E7737
+	.string "STEVEN: Listen, {PLAYER}{KUN}.\p"
+	.string "Does seeing GROUDON and KYOGRE make\n"
+	.string "you think POKéMON are to be feared?\p"
+	.string "But that’s not true.\n"
+	.string "POKéMON are really more…\p"
+	.string "…Why am I asking you this?\n"
+	.string "You already know.$"
+
+SootopolisCity_Text_1E77F0: @ 81E77F0
+	.string "STEVEN: Okay, here we are!\p"
+	.string "Inside here you’ll find someone named\n"
+	.string "WALLACE.\p"
+	.string "I think you have what’s needed to\n"
+	.string "help him…$"
+
+SootopolisCity_Text_1E7866: @ 81E7866
+	.string "STEVEN: I think you have what’s\n"
+	.string "needed to help him…$"
+
+SootopolisCity_Text_1E789A: @ 81E789A
+	.string "STEVEN: The SKY PILLAR…\p"
+	.string "I’ve never been there.\n"
+	.string "I wonder where it could be?$"
+
+SootopolisCity_Text_1E78E5: @ 81E78E5
+	.string "STEVEN: So that’s RAYQUAZA…\p"
+	.string "It’s incredible how the two rampaging\n"
+	.string "POKéMON would flee from it in fear…$"
+
+SootopolisCity_Text_1E794B: @ 81E794B
+	.string "STEVEN: It looks like both MAXIE and\n"
+	.string "ARCHIE have gone away somewhere.\p"
+	.string "Perhaps they’ve gone to MT. PYRE to\n"
+	.string "return those ORBS…$"
+
+SootopolisCity_Text_1E79C8: @ 81E79C8
+	.string "WALLACE: Oh?\n"
+	.string "{PLAYER}{KUN}?\p"
+	.string "Haven’t you scaled the SKY PILLAR\n"
+	.string "yet?\p"
+	.string "I’m sure that you can make it to\n"
+	.string "the top of the SKY PILLAR…$"
+
+SootopolisCity_Text_1E7A3E: @ 81E7A3E
+	.string "WALLACE: {PLAYER}{KUN}…\p"
+	.string "The leaders of TEAM MAGMA and AQUA,\n"
+	.string "I don’t think they meant harm.\p"
+	.string "It wouldn’t hurt to hear what they\n"
+	.string "have to say for themselves.$"
+
+SootopolisCity_Text_1E7ACF: @ 81E7ACF
+	.string "WALLACE: {PLAYER}{KUN}…\n"
+	.string "My eyes didn’t deceive me.\p"
+	.string "Thanks to your help, SOOTOPOLIS…\n"
+	.string "No, all of HOENN was saved.\p"
+	.string "On behalf of the people, I thank you.\p"
+	.string "This is a gift from me.\n"
+	.string "Please accept it.$"
+
+SootopolisCity_Text_1E7B86: @ 81E7B86
+	.string "That HIDDEN MACHINE contains\n"
+	.string "WATERFALL.\p"
+	.string "If you have the RAIN BADGE, a POKéMON\n"
+	.string "that has learned that HM move can\l"
+	.string "force its way up waterfalls.\p"
+	.string "And where does one get the RAIN BADGE?\n"
+	.string "You know, don’t you?\p"
+	.string "That’s right! You have to beat\n"
+	.string "the SOOTOPOLIS GYM LEADER.\p"
+	.string "When you’re all set to go, step through\n"
+	.string "that door.$"
+
+SootopolisCity_Text_1E7CBC: @ 81E7CBC
+	.string "WALLACE: I’m sure that you will be\n"
+	.string "dazzled by my mentor’s breathtakingly\l"
+	.string "elegant battle style.$"
diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc
new file mode 100644
index 000000000..925acc34b
--- /dev/null
+++ b/data/maps/SootopolisCity_Gym_1F/events.inc
@@ -0,0 +1,16 @@
+SootopolisCity_Gym_1F_EventObjects: @ 8532FF4
+	object_event 1, EVENT_OBJ_GFX_JUAN, 0, 8, 2, 0, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0
+
+SootopolisCity_Gym_1F_MapWarps: @ 8533024
+	warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY
+	warp_def 9, 25, 0, 2, MAP_SOOTOPOLIS_CITY
+	warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F
+
+SootopolisCity_Gym_1F_MapBGEvents: @ 853303C
+	bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_22505F
+	bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_22506F
+
+SootopolisCity_Gym_1F_MapEvents:: @ 8533054
+	map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents
+
diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc
index b17a271d8..4200a7ed8 100644
--- a/data/maps/SootopolisCity_Gym_1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_1F/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_Gym_1F: @ 8483A28
-	.4byte SootopolisCity_Gym_1F_MapAttributes
+	.4byte SootopolisCity_Gym_1F_Layout
 	.4byte SootopolisCity_Gym_1F_MapEvents
 	.4byte SootopolisCity_Gym_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc
new file mode 100644
index 000000000..af661890f
--- /dev/null
+++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc
@@ -0,0 +1,329 @@
+SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C
+	map_script 2, SootopolisCity_Gym_1F_MapScript2_224ECB
+	map_script 5, SootopolisCity_Gym_1F_MapScript1_224E67
+	map_script 1, SootopolisCity_Gym_1F_MapScript1_224E6A
+	map_script 3, SootopolisCity_Gym_1F_MapScript1_224E61
+	.byte 0
+
+SootopolisCity_Gym_1F_MapScript1_224E61: @ 8224E61
+	setvar VAR_ICE_STEP_COUNT, 1
+	end
+
+SootopolisCity_Gym_1F_MapScript1_224E67: @ 8224E67
+	setstepcallback 4
+	end
+
+SootopolisCity_Gym_1F_MapScript1_224E6A: @ 8224E6A
+	call SootopolisCity_Gym_1F_EventScript_224E73
+	special SetSootopolisGymCrackedIceMetatiles
+	end
+
+SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73
+	compare VAR_ICE_STEP_COUNT, 8
+	goto_if 0, SootopolisCity_Gym_1F_EventScript_224ECA
+	compare VAR_ICE_STEP_COUNT, 28
+	goto_if 0, SootopolisCity_Gym_1F_EventScript_224EB8
+	compare VAR_ICE_STEP_COUNT, 67
+	goto_if 0, SootopolisCity_Gym_1F_EventScript_224EA6
+	setmetatile 8, 4, 519, 0
+	setmetatile 8, 5, 519, 0
+
+SootopolisCity_Gym_1F_EventScript_224EA6:: @ 8224EA6
+	setmetatile 8, 10, 519, 0
+	setmetatile 8, 11, 519, 0
+
+SootopolisCity_Gym_1F_EventScript_224EB8:: @ 8224EB8
+	setmetatile 8, 15, 519, 0
+	setmetatile 8, 16, 519, 0
+
+SootopolisCity_Gym_1F_EventScript_224ECA:: @ 8224ECA
+	return
+
+SootopolisCity_Gym_1F_MapScript2_224ECB: @ 8224ECB
+	map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_224EED
+	map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_224F01
+	map_script_2 VAR_ICE_STEP_COUNT, 67, SootopolisCity_Gym_1F_EventScript_224F15
+	map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_224F29
+	.2byte 0
+
+SootopolisCity_Gym_1F_EventScript_224EED:: @ 8224EED
+	addvar VAR_ICE_STEP_COUNT, 1
+	delay 40
+	playse SE_RU_GASHIN
+	call SootopolisCity_Gym_1F_EventScript_224E73
+	special DrawWholeMapView
+	end
+
+SootopolisCity_Gym_1F_EventScript_224F01:: @ 8224F01
+	addvar VAR_ICE_STEP_COUNT, 1
+	delay 40
+	playse SE_RU_GASHIN
+	call SootopolisCity_Gym_1F_EventScript_224E73
+	special DrawWholeMapView
+	end
+
+SootopolisCity_Gym_1F_EventScript_224F15:: @ 8224F15
+	addvar VAR_ICE_STEP_COUNT, 1
+	delay 40
+	playse SE_RU_GASHIN
+	call SootopolisCity_Gym_1F_EventScript_224E73
+	special DrawWholeMapView
+	end
+
+SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29
+	lockall
+	delay 20
+	applymovement 255, SootopolisCity_Gym_1F_Movement_224F42
+	waitmovement 0
+	playse SE_RU_HYUU
+	delay 60
+	warphole MAP_SOOTOPOLIS_CITY_GYM_B1F
+	waitstate
+	end
+
+SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42
+	set_invisible
+	step_end
+
+SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44
+	trainerbattle 1, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq SootopolisCity_Gym_1F_EventScript_225025
+	checkflag FLAG_0x0AC
+	goto_if 0, SootopolisCity_Gym_1F_EventScript_224FF7
+	checkflag FLAG_BADGE06_GET
+	goto_if 0, SootopolisCity_Gym_1F_EventScript_22501B
+	msgbox SootopolisCity_Gym_1F_Text_225778, 4
+	release
+	end
+
+SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82
+	message SootopolisCity_Gym_1F_Text_225598
+	waitmessage
+	call SootopolisCity_Gym_1F_EventScript_27207E
+	msgbox SootopolisCity_Gym_1F_Text_2255BE, 4
+	setflag FLAG_0x4F7
+	setflag FLAG_BADGE08_GET
+	setflag FLAG_0x356
+	setflag FLAG_0x3CD
+	setflag FLAG_0x330
+	setvar VAR_0x405E, 6
+	clearflag FLAG_0x347
+	setvar VAR_0x8008, 8
+	call SootopolisCity_Gym_1F_EventScript_271F43
+	call SootopolisCity_Gym_1F_EventScript_224FD4
+	closemessage
+	delay 30
+	playfanfare MUS_ME_TORE_EYE
+	msgbox SootopolisCity_Gym_1F_Text_22574D, 4
+	waitfanfare
+	closemessage
+	delay 30
+	setflag FLAG_0x1D9
+	release
+	end
+
+SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4
+	giveitem_std ITEM_TM03
+	compare VAR_RESULT, 0
+	goto_eq SootopolisCity_Gym_1F_EventScript_27205E
+	msgbox SootopolisCity_Gym_1F_Text_2256C1, 4
+	setflag FLAG_0x0AC
+	return
+
+SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7
+	giveitem_std ITEM_TM03
+	compare VAR_RESULT, 0
+	goto_eq SootopolisCity_Gym_1F_EventScript_272054
+	msgbox SootopolisCity_Gym_1F_Text_2256C1, 4
+	setflag FLAG_0x0AC
+	release
+	end
+
+SootopolisCity_Gym_1F_EventScript_22501B:: @ 822501B
+	msgbox SootopolisCity_Gym_1F_Text_225865, 4
+	release
+	end
+
+SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025
+	trainerbattle 7, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48
+	msgbox SootopolisCity_Gym_1F_Text_225A67, 6
+	end
+
+SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040
+	lock
+	faceplayer
+	checkflag FLAG_0x4F7
+	goto_eq SootopolisCity_Gym_1F_EventScript_225055
+	msgbox SootopolisCity_Gym_1F_Text_225093, 4
+	release
+	end
+
+SootopolisCity_Gym_1F_EventScript_225055:: @ 8225055
+	msgbox SootopolisCity_Gym_1F_Text_2251AF, 4
+	release
+	end
+
+SootopolisCity_Gym_1F_EventScript_22505F:: @ 822505F
+	lockall
+	checkflag FLAG_BADGE08_GET
+	goto_eq SootopolisCity_Gym_1F_EventScript_22507F
+	goto SootopolisCity_Gym_1F_EventScript_225089
+	end
+
+SootopolisCity_Gym_1F_EventScript_22506F:: @ 822506F
+	lockall
+	checkflag FLAG_BADGE08_GET
+	goto_eq SootopolisCity_Gym_1F_EventScript_22507F
+	goto SootopolisCity_Gym_1F_EventScript_225089
+	end
+
+SootopolisCity_Gym_1F_EventScript_22507F:: @ 822507F
+	msgbox SootopolisCity_Gym_1F_Text_225916, 4
+	releaseall
+	end
+
+SootopolisCity_Gym_1F_EventScript_225089:: @ 8225089
+	msgbox SootopolisCity_Gym_1F_Text_2258FA, 4
+	releaseall
+	end
+
+SootopolisCity_Gym_1F_Text_225093: @ 8225093
+	.string "Yo! How’s it going, CHAMPION-\n"
+	.string "bound {PLAYER}?\p"
+	.string "SOOTOPOLIS’s GYM LEADER JUAN is\n"
+	.string "a master of WATER-type POKéMON.\p"
+	.string "And, to get to JUAN, an icy floor\n"
+	.string "will hamper your progress…\p"
+	.string "Listen, I’m sorry, but that’s all the\n"
+	.string "advice that I have for you.\p"
+	.string "The rest of the way, you have to\n"
+	.string "go for it yourself!$"
+
+SootopolisCity_Gym_1F_Text_2251AF: @ 82251AF
+	.string "Yow! You’ve beaten even JUAN, who\n"
+	.string "was supposedly the best in all HOENN!\p"
+	.string "Okay! Check out your TRAINER CARD.\p"
+	.string "If you’ve gotten all the BADGES, you’re\n"
+	.string "set for the POKéMON LEAGUE challenge!$"
+
+SootopolisCity_Gym_1F_Text_225268: @ 8225268
+	.string "Let me ask you.\n"
+	.string "Did you know?\l"
+	.string "Ah, I should not be so coy.\p"
+	.string "It was I who taught WALLACE everything\n"
+	.string "there is to know about POKéMON.\p"
+	.string "Once, I had given up my position as\n"
+	.string "the GYM LEADER.\p"
+	.string "In my place, I had entrusted WALLACE\n"
+	.string "with the GYM.\p"
+	.string "However, a compelling reason arose for\n"
+	.string "me to make a comeback.\p"
+	.string "Ah, but enough chatter.\n"
+	.string "Let us begin our match, shall we?\p"
+	.string "Please, you shall bear witness to\n"
+	.string "our artistry.\p"
+	.string "A grand illusion of water sculpted\n"
+	.string "by POKéMON and myself!$"
+
+SootopolisCity_Gym_1F_Text_225432: @ 8225432
+	.string "Ahahaha, excellent!\n"
+	.string "Very well, you are the winner.\p"
+	.string "From you, I sense the brilliant shine\n"
+	.string "of skill that will overcome all.\p"
+	.string "However, compared with me or even\n"
+	.string "WALLACE, you are lacking in elegance.\p"
+	.string "Perhaps I should make you a loan\n"
+	.string "of my outfit?\p"
+	.string "… … … … … …\n"
+	.string "… … … … … …\p"
+	.string "Hahaha, I merely jest!\p"
+	.string "Rather than my clothes, I shall reward\n"
+	.string "you with this, the RAIN BADGE!$"
+
+SootopolisCity_Gym_1F_Text_225598: @ 8225598
+	.string "{PLAYER} received the RAIN BADGE\n"
+	.string "from JUAN.$"
+
+SootopolisCity_Gym_1F_Text_2255BE: @ 82255BE
+	.string "Having the RAIN BADGE shall assure you\n"
+	.string "the full obedience of all your POKéMON\l"
+	.string "to your every command.\p"
+	.string "The RAIN BADGE also allows the use\n"
+	.string "of the HM move WATERFALL to scale\l"
+	.string "walls of cascading water.\p"
+	.string "And, so that you never forget the\n"
+	.string "battle we shared, take this…$"
+
+SootopolisCity_Gym_1F_Text_2256C1: @ 82256C1
+	.string "The TECHNICAL MACHINE I handed you\n"
+	.string "contains WATER PULSE.\p"
+	.string "In use, it will occasionally confuse\n"
+	.string "the target with ultrasonic waves.\p"
+	.string "… … … … … …$"
+
+SootopolisCity_Gym_1F_Text_22574D: @ 822574D
+	.string "Registered GYM LEADER JUAN\n"
+	.string "in the POKéNAV.$"
+
+SootopolisCity_Gym_1F_Text_225778: @ 8225778
+	.string "The TRAINERS who have gathered all\n"
+	.string "the GYM BADGES of HOENN should make\l"
+	.string "way to the ultimate destination.\p"
+	.string "The POKéMON LEAGUE.\p"
+	.string "Travel to the easternmost reaches\n"
+	.string "of HOENN, to the island EVER GRANDE.\p"
+	.string "There, you shall find the POKéMON\n"
+	.string "LEAGUE.$"
+
+SootopolisCity_Gym_1F_Text_225865: @ 8225865
+	.string "There remains but one BADGE to\n"
+	.string "obtain in HOENN.\p"
+	.string "If you wish to challenge the POKéMON\n"
+	.string "LEAGUE, you must obtain the last\l"
+	.string "BADGE from the GYM in FORTREE.$"
+
+SootopolisCity_Gym_1F_Text_2258FA: @ 82258FA
+	.string "SOOTOPOLIS CITY POKéMON GYM$"
+
+SootopolisCity_Gym_1F_Text_225916: @ 8225916
+	.string "SOOTOPOLIS CITY POKéMON GYM\p"
+	.string "JUAN’S CERTIFIED TRAINERS:\n"
+	.string "{PLAYER}$"
+
+SootopolisCity_Gym_1F_Text_225950: @ 8225950
+	.string "JUAN: Ah, this GYM had returned to its\n"
+	.string "usual state of serenity…\p"
+	.string "But our young typhoon has returned\n"
+	.string "to put us to the test again!\p"
+	.string "Well, my friend, most certainly!\p"
+	.string "I shall be delighted to dance with you\n"
+	.string "as often as you wish!$"
+
+SootopolisCity_Gym_1F_Text_225A2E: @ 8225A2E
+	.string "Ahahaha, you are the winner!\n"
+	.string "You have defeated me again!$"
+
+SootopolisCity_Gym_1F_Text_225A67: @ 8225A67
+	.string "JUAN: If I told you to become my\n"
+	.string "apprentice, you will refuse, I am sure.\p"
+	.string "I would like to make a gift of my coat\n"
+	.string "to you.\p"
+	.string "But again, you will refuse.\n"
+	.string "I imagine that to be so.\p"
+	.string "And that, my friend, is a certain sign\n"
+	.string "of nobility!$"
+
+SootopolisCity_Gym_1F_Text_225B48: @ 8225B48
+	.string "JUAN: Ah, this GYM had returned to its\n"
+	.string "usual state of serenity…\p"
+	.string "But our young typhoon has returned\n"
+	.string "to put us to the test again!\p"
+	.string "Well, my friend, most certainly!\n"
+	.string "I shall be delighted to dance with you…\p"
+	.string "Ah, no, no, no.\n"
+	.string "You have with you but one POKéMON.\p"
+	.string "I wish that you would return with\n"
+	.string "two, perhaps more, POKéMON, please.$"
+
diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc
new file mode 100644
index 000000000..1ed20fc94
--- /dev/null
+++ b/data/maps/SootopolisCity_Gym_B1F/events.inc
@@ -0,0 +1,18 @@
+SootopolisCity_Gym_B1F_EventObjects: @ 8533068
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0
+	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 11, 9, 0, 7, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0
+	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 5, 6, 3, 8, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0
+	object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 9, 7, 3, 8, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 13, 3, 10, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0
+	object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 13, 3, 9, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0
+
+SootopolisCity_Gym_B1F_MapWarps: @ 8533158
+	warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F
+
+SootopolisCity_Gym_B1F_MapEvents:: @ 8533160
+	map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc
index 5473a347b..6265830e9 100644
--- a/data/maps/SootopolisCity_Gym_B1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_Gym_B1F: @ 8483A44
-	.4byte SootopolisCity_Gym_B1F_MapAttributes
+	.4byte SootopolisCity_Gym_B1F_Layout
 	.4byte SootopolisCity_Gym_B1F_MapEvents
 	.4byte SootopolisCity_Gym_B1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc
index 8aaa604e2..8aaa604e2 100644
--- a/data/scripts/maps/SootopolisCity_Gym_B1F.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc
diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc
new file mode 100644
index 000000000..4ddbd23ea
--- /dev/null
+++ b/data/maps/SootopolisCity_House1/events.inc
@@ -0,0 +1,11 @@
+SootopolisCity_House1_EventObjects: @ 85332F8
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0
+	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0
+
+SootopolisCity_House1_MapWarps: @ 8533328
+	warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House1_MapEvents:: @ 8533338
+	map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc
index 8359334d0..2551aedc1 100644
--- a/data/maps/SootopolisCity_House1/header.inc
+++ b/data/maps/SootopolisCity_House1/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_House1: @ 8483AB4
-	.4byte SootopolisCity_House1_MapAttributes
+	.4byte SootopolisCity_House1_Layout
 	.4byte SootopolisCity_House1_MapEvents
 	.4byte SootopolisCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/scripts.inc
index 7c898a0b2..7c898a0b2 100644
--- a/data/scripts/maps/SootopolisCity_House1.inc
+++ b/data/maps/SootopolisCity_House1/scripts.inc
diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc
new file mode 100644
index 000000000..213fe39d3
--- /dev/null
+++ b/data/maps/SootopolisCity_House2/events.inc
@@ -0,0 +1,10 @@
+SootopolisCity_House2_EventObjects: @ 853334C
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0
+
+SootopolisCity_House2_MapWarps: @ 8533364
+	warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House2_MapEvents:: @ 8533374
+	map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc
index 3cd04937a..24e7a778a 100644
--- a/data/maps/SootopolisCity_House2/header.inc
+++ b/data/maps/SootopolisCity_House2/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_House2: @ 8483AD0
-	.4byte SootopolisCity_House2_MapAttributes
+	.4byte SootopolisCity_House2_Layout
 	.4byte SootopolisCity_House2_MapEvents
 	.4byte SootopolisCity_House2_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/scripts.inc
index 82270ca56..82270ca56 100644
--- a/data/scripts/maps/SootopolisCity_House2.inc
+++ b/data/maps/SootopolisCity_House2/scripts.inc
diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc
new file mode 100644
index 000000000..0feca97cb
--- /dev/null
+++ b/data/maps/SootopolisCity_House3/events.inc
@@ -0,0 +1,11 @@
+SootopolisCity_House3_EventObjects: @ 8533388
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0
+
+SootopolisCity_House3_MapWarps: @ 85333B8
+	warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House3_MapEvents:: @ 85333C8
+	map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc
index c3ee80da0..97ae23fb7 100644
--- a/data/maps/SootopolisCity_House3/header.inc
+++ b/data/maps/SootopolisCity_House3/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_House3: @ 8483AEC
-	.4byte SootopolisCity_House3_MapAttributes
+	.4byte SootopolisCity_House3_Layout
 	.4byte SootopolisCity_House3_MapEvents
 	.4byte SootopolisCity_House3_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/scripts.inc
index 415f90642..415f90642 100644
--- a/data/scripts/maps/SootopolisCity_House3.inc
+++ b/data/maps/SootopolisCity_House3/scripts.inc
diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc
new file mode 100644
index 000000000..1f14ba6e9
--- /dev/null
+++ b/data/maps/SootopolisCity_House4/events.inc
@@ -0,0 +1,12 @@
+SootopolisCity_House4_EventObjects: @ 85333DC
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, 7, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0
+	object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, 1, 1, 1, 0, 0, SootopolisCity_House4_EventScript_226D28, 0
+
+SootopolisCity_House4_MapWarps: @ 8533424
+	warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House4_MapEvents:: @ 8533434
+	map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc
index 9d610b9a1..d39499132 100644
--- a/data/maps/SootopolisCity_House4/header.inc
+++ b/data/maps/SootopolisCity_House4/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_House4: @ 8483B08
-	.4byte SootopolisCity_House4_MapAttributes
+	.4byte SootopolisCity_House1_Layout
 	.4byte SootopolisCity_House4_MapEvents
 	.4byte SootopolisCity_House4_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/scripts.inc
index e34e6991d..e34e6991d 100644
--- a/data/scripts/maps/SootopolisCity_House4.inc
+++ b/data/maps/SootopolisCity_House4/scripts.inc
diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc
new file mode 100644
index 000000000..566631c02
--- /dev/null
+++ b/data/maps/SootopolisCity_House5/events.inc
@@ -0,0 +1,11 @@
+SootopolisCity_House5_EventObjects: @ 8533448
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0
+
+SootopolisCity_House5_MapWarps: @ 8533478
+	warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House5_MapEvents:: @ 8533488
+	map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc
index 29157d4df..d6de286cf 100644
--- a/data/maps/SootopolisCity_House5/header.inc
+++ b/data/maps/SootopolisCity_House5/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_House5: @ 8483B24
-	.4byte SootopolisCity_House5_MapAttributes
+	.4byte SootopolisCity_House2_Layout
 	.4byte SootopolisCity_House5_MapEvents
 	.4byte SootopolisCity_House5_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/scripts.inc
index 51da02de1..51da02de1 100644
--- a/data/scripts/maps/SootopolisCity_House5.inc
+++ b/data/maps/SootopolisCity_House5/scripts.inc
diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc
new file mode 100644
index 000000000..a85356317
--- /dev/null
+++ b/data/maps/SootopolisCity_House6/events.inc
@@ -0,0 +1,10 @@
+SootopolisCity_House6_EventObjects: @ 853349C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, 2, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0
+
+SootopolisCity_House6_MapWarps: @ 85334B4
+	warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House6_MapEvents:: @ 85334C4
+	map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc
index c05d23e64..36460f147 100644
--- a/data/maps/SootopolisCity_House6/header.inc
+++ b/data/maps/SootopolisCity_House6/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_House6: @ 8483B40
-	.4byte SootopolisCity_House6_MapAttributes
+	.4byte SootopolisCity_House3_Layout
 	.4byte SootopolisCity_House6_MapEvents
 	.4byte SootopolisCity_House6_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/scripts.inc
index 38c8456a3..38c8456a3 100644
--- a/data/scripts/maps/SootopolisCity_House6.inc
+++ b/data/maps/SootopolisCity_House6/scripts.inc
diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc
new file mode 100644
index 000000000..65b0cf9dd
--- /dev/null
+++ b/data/maps/SootopolisCity_House7/events.inc
@@ -0,0 +1,11 @@
+SootopolisCity_House7_EventObjects: @ 85334D8
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0
+
+SootopolisCity_House7_MapWarps: @ 8533508
+	warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House7_MapEvents:: @ 8533518
+	map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc
index 3f02bdcc5..383ab24b5 100644
--- a/data/maps/SootopolisCity_House7/header.inc
+++ b/data/maps/SootopolisCity_House7/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_House7: @ 8483B5C
-	.4byte SootopolisCity_House7_MapAttributes
+	.4byte SootopolisCity_House1_Layout
 	.4byte SootopolisCity_House7_MapEvents
 	.4byte SootopolisCity_House7_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/scripts.inc
index 9df9cde0b..9df9cde0b 100644
--- a/data/scripts/maps/SootopolisCity_House7.inc
+++ b/data/maps/SootopolisCity_House7/scripts.inc
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc
new file mode 100644
index 000000000..84e642bac
--- /dev/null
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc
@@ -0,0 +1,15 @@
+SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C
+	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0
+
+SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C
+	warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_LotadAndSeedotHouse_MapBGEvents: @ 853356C
+	bg_event 5, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D
+	bg_event 2, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B
+
+SootopolisCity_LotadAndSeedotHouse_MapEvents:: @ 8533584
+	map_events SootopolisCity_LotadAndSeedotHouse_EventObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents
+
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
index 0ceade178..792b5ae31 100644
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_LotadAndSeedotHouse: @ 8483B78
-	.4byte SootopolisCity_LotadAndSeedotHouse_MapAttributes
+	.4byte SootopolisCity_LotadAndSeedotHouse_Layout
 	.4byte SootopolisCity_LotadAndSeedotHouse_MapEvents
 	.4byte SootopolisCity_LotadAndSeedotHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
index 26a322b89..26a322b89 100644
--- a/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc
new file mode 100644
index 000000000..0c32cb482
--- /dev/null
+++ b/data/maps/SootopolisCity_Mart/events.inc
@@ -0,0 +1,12 @@
+SootopolisCity_Mart_EventObjects: @ 853328C
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0
+
+SootopolisCity_Mart_MapWarps: @ 85332D4
+	warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_Mart_MapEvents:: @ 85332E4
+	map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc
index 3b4aaa171..ac4ae5ea0 100644
--- a/data/maps/SootopolisCity_Mart/header.inc
+++ b/data/maps/SootopolisCity_Mart/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_Mart: @ 8483A98
-	.4byte SootopolisCity_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte SootopolisCity_Mart_MapEvents
 	.4byte SootopolisCity_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/scripts.inc
index 26ab5497c..26ab5497c 100644
--- a/data/scripts/maps/SootopolisCity_Mart.inc
+++ b/data/maps/SootopolisCity_Mart/scripts.inc
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc
new file mode 100644
index 000000000..bf06c2cd9
--- /dev/null
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc
@@ -0,0 +1,11 @@
+SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0
+
+SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0
+	warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 7, 0, 12, MAP_SOOTOPOLIS_CITY
+	warp_def 3, 1, 3, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F
+
+SootopolisCity_MysteryEventsHouse_1F_MapEvents:: @ 85335C8
+	map_events SootopolisCity_MysteryEventsHouse_1F_EventObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
index 72e09b813..2e5ea1f84 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_MysteryEventsHouse_1F: @ 8483B94
-	.4byte SootopolisCity_MysteryEventsHouse_1F_MapAttributes
+	.4byte SootopolisCity_MysteryEventsHouse_1F_Layout
 	.4byte SootopolisCity_MysteryEventsHouse_1F_MapEvents
 	.4byte SootopolisCity_MysteryEventsHouse_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
new file mode 100644
index 000000000..cdcf5866c
--- /dev/null
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -0,0 +1,241 @@
+SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953
+	map_script 3, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E
+	map_script 2, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D
+	.byte 0
+
+SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E
+	setvar VAR_0x8004, 16
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D
+	compare VAR_0x40C0, 0
+	call_if 5, SootopolisCity_MysteryEventsHouse_1F_EventScript_227991
+	end
+
+SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D
+	setvar VAR_TEMP_1, 1
+	setobjectxyperm 1, 3, 2
+	setobjectmovementtype 1, 8
+	setmaplayoutindex 441
+	return
+
+SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991
+	setobjectxyperm 1, 2, 2
+	setobjectmovementtype 1, 10
+	return
+
+SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D
+	map_script_2 VAR_0x40C0, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
+	map_script_2 VAR_0x40C0, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
+	map_script_2 VAR_0x40C0, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
+	.2byte 0
+
+SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7
+	lockall
+	applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F
+	waitmovement 0
+	applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21
+	waitmovement 0
+	moveobjectoffscreen 1
+	applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6
+	waitmovement 0
+	compare VAR_0x40C0, 1
+	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04
+	compare VAR_0x40C0, 2
+	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D
+	compare VAR_0x40C0, 3
+	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16
+	special LoadPlayerParty
+	setvar VAR_0x40C0, 0
+	releaseall
+	end
+
+SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04:: @ 8227A04
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227DB8, 4
+	return
+
+SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D:: @ 8227A0D
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227E03, 4
+	return
+
+SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16:: @ 8227A16
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D5B, 4
+	return
+
+SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F: @ 8227A1F
+	walk_down
+	step_end
+
+SootopolisCity_MysteryEventsHouse_1F_Movement_227A21: @ 8227A21
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24
+	lock
+	faceplayer
+	setvar VAR_0x8004, 16
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E
+	compare VAR_TEMP_1, 1
+	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4
+	release
+	end
+
+SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4
+	release
+	end
+
+SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
+	special SavePlayerParty
+	special sub_8139238
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5
+	compare VAR_RESULT, 0
+	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
+	call SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF
+	compare VAR_RESULT, 0
+	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, 5
+	compare VAR_RESULT, 0
+	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
+	special LoadPlayerParty
+	call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F
+	compare VAR_RESULT, 0
+	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
+	special SavePlayerParty
+	special sub_80F94E8
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4
+	closemessage
+	compare VAR_FACING, 2
+	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE
+	compare VAR_FACING, 4
+	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10
+	compare VAR_FACING, 3
+	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22
+	warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1
+	waitstate
+	release
+	end
+
+SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2
+	special LoadPlayerParty
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C44, 4
+	release
+	end
+
+SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, 4
+	fadescreen 1
+	special sub_80F9438
+	waitstate
+	return
+
+SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE:: @ 8227AFE
+	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40
+	applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B34
+	waitmovement 0
+	return
+
+SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10:: @ 8227B10
+	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B43
+	applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B38
+	waitmovement 0
+	return
+
+SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22:: @ 8227B22
+	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40
+	applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C
+	waitmovement 0
+	return
+
+SootopolisCity_MysteryEventsHouse_1F_Movement_227B34: @ 8227B34
+	delay_16
+	walk_up
+	walk_up
+	step_end
+
+SootopolisCity_MysteryEventsHouse_1F_Movement_227B38: @ 8227B38
+	delay_16
+	walk_right
+	walk_up
+	step_end
+
+SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C: @ 8227B3C
+	delay_16
+	walk_left
+	walk_up
+	step_end
+
+SootopolisCity_MysteryEventsHouse_1F_Movement_227B40: @ 8227B40
+	walk_left
+	walk_in_place_fastest_right
+	step_end
+
+SootopolisCity_MysteryEventsHouse_1F_Movement_227B43: @ 8227B43
+	walk_right
+	walk_in_place_fastest_left
+	step_end
+
+SootopolisCity_MysteryEventsHouse_1F_Text_227B46: @ 8227B46
+	.string "When I was young, I traveled the world\n"
+	.string "as a POKéMON TRAINER.\p"
+	.string "Now that I’ve become an old buzzard,\n"
+	.string "my only amusement is watching young\l"
+	.string "TRAINERS battle.$"
+
+SootopolisCity_MysteryEventsHouse_1F_Text_227BDD: @ 8227BDD
+	.string "The door appears to be locked.$"
+
+SootopolisCity_MysteryEventsHouse_1F_Text_227BFC: @ 8227BFC
+	.string "A TRAINER named {STR_VAR_1}\n"
+	.string "is visiting my home.\p"
+	.string "Would you like to challenge\n"
+	.string "{STR_VAR_1}?$"
+
+SootopolisCity_MysteryEventsHouse_1F_Text_227C44: @ 8227C44
+	.string "You won’t battle? I’m disappointed\n"
+	.string "that I can’t see you battle…$"
+
+SootopolisCity_MysteryEventsHouse_1F_Text_227C84: @ 8227C84
+	.string "Oh, good, good!\p"
+	.string "But my house isn’t all that sturdy.\p"
+	.string "Could I ask you to keep it down to\n"
+	.string "a 3-on-3 match?$"
+
+SootopolisCity_MysteryEventsHouse_1F_Text_227CEB: @ 8227CEB
+	.string "Before you two battle, you should\n"
+	.string "save your progress.$"
+
+SootopolisCity_MysteryEventsHouse_1F_Text_227D21: @ 8227D21
+	.string "I hope to see a good match!$"
+
+SootopolisCity_MysteryEventsHouse_1F_Text_227D3D: @ 8227D3D
+	.string "{STR_VAR_1}$"
+
+SootopolisCity_MysteryEventsHouse_B1F_Text_227D40: @ 8227D40
+	.string "The match ended up a draw.$"
+
+SootopolisCity_MysteryEventsHouse_1F_Text_227D5B: @ 8227D5B
+	.string "So, it became a standoff.\p"
+	.string "It was a brilliant match in which\n"
+	.string "neither side conceded a step!$"
+
+SootopolisCity_MysteryEventsHouse_1F_Text_227DB5: @ 8227DB5
+	.string "{STR_VAR_1}$"
+
+SootopolisCity_MysteryEventsHouse_1F_Text_227DB8: @ 8227DB8
+	.string "That was superlative!\p"
+	.string "Why, it was like seeing myself in\n"
+	.string "my youth again!$"
+
+SootopolisCity_MysteryEventsHouse_1F_Text_227E00: @ 8227E00
+	.string "{STR_VAR_1}$"
+
+SootopolisCity_MysteryEventsHouse_1F_Text_227E03: @ 8227E03
+	.string "Ah, too bad for you!\p"
+	.string "But it was a good match.\n"
+	.string "I hope you can win next time.$"
+
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc
new file mode 100644
index 000000000..21ea255a4
--- /dev/null
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc
@@ -0,0 +1,9 @@
+SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 0, 9, 1, 1, 0, 0, 0x0, 0
+
+SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4
+	warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F
+
+SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: @ 85335FC
+	map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
index d4497b3e9..c3ffec414 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0
-	.4byte SootopolisCity_MysteryEventsHouse_B1F_MapAttributes
+	.4byte SootopolisCity_MysteryEventsHouse_B1F_Layout
 	.4byte SootopolisCity_MysteryEventsHouse_B1F_MapEvents
 	.4byte SootopolisCity_MysteryEventsHouse_B1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
new file mode 100644
index 000000000..b29ef99a5
--- /dev/null
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
@@ -0,0 +1,78 @@
+SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F
+	map_script 3, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A
+	map_script 2, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E
+	.byte 0
+
+SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A
+	special sub_8162794
+	end
+
+SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E: @ 8227E5E
+	map_script_2 VAR_TEMP_1, 0, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68
+	.2byte 0
+
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
+	lockall
+	applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3
+	waitmovement 0
+	special sub_8165360
+	msgbox 0x2021fc4, 4
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	special sub_8163AC4
+	waitstate
+	compare VAR_RESULT, 3
+	call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF
+	compare VAR_RESULT, 1
+	call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD
+	compare VAR_RESULT, 2
+	call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8
+	closemessage
+	special HealPlayerParty
+	applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9
+	waitmovement 0
+	special LoadPlayerParty
+	setvar VAR_TEMP_1, 1
+	warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 255, 3, 1
+	waitstate
+	releaseall
+	end
+
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF
+	setvar VAR_0x40C0, 3
+	msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, 4
+	return
+
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD
+	setvar VAR_0x40C0, 1
+	special ShowFieldMessageStringVar4
+	waitmessage
+	waitbuttonpress
+	return
+
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8
+	setvar VAR_0x40C0, 2
+	special ShowFieldMessageStringVar4
+	waitmessage
+	waitbuttonpress
+	return
+
+SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3: @ 8227EF3
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	step_end
+
+SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9: @ 8227EF9
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	step_end
+
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..9bca02a56
--- /dev/null
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,14 @@
+SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, 2, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0
+
+SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4
+	warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY
+	warp_def 6, 8, 3, 0, MAP_SOOTOPOLIS_CITY
+	warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F
+
+SootopolisCity_PokemonCenter_1F_MapEvents:: @ 85331EC
+	map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
index 28fdf23bd..83485cbf1 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_PokemonCenter_1F: @ 8483A60
-	.4byte SootopolisCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte SootopolisCity_PokemonCenter_1F_MapEvents
 	.4byte SootopolisCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
index fcb1b5863..fcb1b5863 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..8498f9de2
--- /dev/null
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702
+
+SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260
+	warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+SootopolisCity_PokemonCenter_2F_MapEvents:: @ 8533278
+	map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
index 97000d2b7..ba2bb5c0d 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 SootopolisCity_PokemonCenter_2F: @ 8483A7C
-	.4byte SootopolisCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte SootopolisCity_PokemonCenter_2F_MapEvents
 	.4byte SootopolisCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
index 43d8a9d2f..43d8a9d2f 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc
new file mode 100644
index 000000000..69cddf603
--- /dev/null
+++ b/data/maps/SouthernIsland_Exterior/events.inc
@@ -0,0 +1,14 @@
+SouthernIsland_Exterior_EventObjects: @ 853B83C
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0
+
+SouthernIsland_Exterior_MapWarps: @ 853B86C
+	warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR
+	warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR
+
+SouthernIsland_Exterior_MapBGEvents: @ 853B87C
+	bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_242A3C
+
+SouthernIsland_Exterior_MapEvents:: @ 853B888
+	map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents
+
diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc
index 700a6cf00..d0d35fea1 100644
--- a/data/maps/SouthernIsland_Exterior/header.inc
+++ b/data/maps/SouthernIsland_Exterior/header.inc
@@ -1,5 +1,5 @@
 SouthernIsland_Exterior: @ 8485238
-	.4byte SouthernIsland_Exterior_MapAttributes
+	.4byte SouthernIsland_Exterior_Layout
 	.4byte SouthernIsland_Exterior_MapEvents
 	.4byte SouthernIsland_Exterior_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc
new file mode 100644
index 000000000..d303e0614
--- /dev/null
+++ b/data/maps/SouthernIsland_Exterior/scripts.inc
@@ -0,0 +1,55 @@
+SouthernIsland_Exterior_MapScripts:: @ 82429C8
+	map_script 3, SouthernIsland_Exterior_MapScript1_2429CE
+	.byte 0
+
+SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE
+	setflag FLAG_LANDMARK_SOUTHERN_ISLAND
+	end
+
+SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2
+	lock
+	faceplayer
+	msgbox SouthernIsland_Exterior_Text_2A69F1, 5
+	compare VAR_RESULT, 0
+	goto_eq SouthernIsland_Exterior_EventScript_242A17
+	msgbox SouthernIsland_Exterior_Text_2A6A5D, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA
+	waitmovement 0
+	delay 30
+	hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR
+	setvar VAR_0x8004, 2
+	call SouthernIsland_Exterior_EventScript_272250
+	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
+	waitstate
+	release
+	end
+
+SouthernIsland_Exterior_EventScript_242A17:: @ 8242A17
+	msgbox SouthernIsland_Exterior_Text_2A6A82, 4
+	release
+	end
+
+BattleFrontier_OutsideWest_EventScript_242A21:: @ 8242A21
+	applymovement 255, BattleFrontier_OutsideWest_Movement_242A37
+	waitmovement 0
+	return
+
+BattleFrontier_OutsideWest_EventScript_242A2C:: @ 8242A2C
+	applymovement 255, BattleFrontier_OutsideWest_Movement_242A39
+	waitmovement 0
+	return
+
+BattleFrontier_OutsideWest_Movement_242A37: @ 8242A37
+	walk_down
+	step_end
+
+BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39
+	walk_left
+	walk_in_place_fastest_down
+	step_end
+
+SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C
+	msgbox SouthernIsland_Exterior_Text_2A6AD5, 3
+	end
+
diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc
new file mode 100644
index 000000000..c31a5568b
--- /dev/null
+++ b/data/maps/SouthernIsland_Interior/events.inc
@@ -0,0 +1,14 @@
+SouthernIsland_Interior_EventObjects: @ 853B89C
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, 910
+	object_event 2, EVENT_OBJ_GFX_TRADER, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911
+
+SouthernIsland_Interior_MapWarps: @ 853B8CC
+	warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR
+	warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR
+
+SouthernIsland_Interior_MapBGEvents: @ 853B8DC
+	bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_242AC4
+
+SouthernIsland_Interior_MapEvents:: @ 853B8E8
+	map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents
+
diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc
index a7b9f14a0..1a080af1e 100644
--- a/data/maps/SouthernIsland_Interior/header.inc
+++ b/data/maps/SouthernIsland_Interior/header.inc
@@ -1,5 +1,5 @@
 SouthernIsland_Interior: @ 8485254
-	.4byte SouthernIsland_Interior_MapAttributes
+	.4byte SouthernIsland_Interior_Layout
 	.4byte SouthernIsland_Interior_MapEvents
 	.4byte SouthernIsland_Interior_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/scripts.inc
index 432667cc9..432667cc9 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/maps/SouthernIsland_Interior/scripts.inc
diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc
new file mode 100644
index 000000000..61edb1e28
--- /dev/null
+++ b/data/maps/TerraCave_End/events.inc
@@ -0,0 +1,12 @@
+TerraCave_End_EventObjects: @ 8537850
+	object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, 8, 1, 1, 0, 0, 0x0, 783
+
+TerraCave_End_MapWarps: @ 8537868
+	warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE
+
+TerraCave_End_MapCoordEvents: @ 8537870
+	coord_event 17, 26, 3, 0, VAR_TEMP_1, 1, 0, TerraCave_End_EventScript_23B0EC
+
+TerraCave_End_MapEvents:: @ 8537880
+	map_events TerraCave_End_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0
+
diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc
index 419388afa..900f5930f 100644
--- a/data/maps/TerraCave_End/header.inc
+++ b/data/maps/TerraCave_End/header.inc
@@ -1,5 +1,5 @@
 TerraCave_End: @ 8484A3C
-	.4byte TerraCave_End_MapAttributes
+	.4byte TerraCave_End_Layout
 	.4byte TerraCave_End_MapEvents
 	.4byte TerraCave_End_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/TerraCave_End.inc b/data/maps/TerraCave_End/scripts.inc
index 5152f85cf..5152f85cf 100644
--- a/data/scripts/maps/TerraCave_End.inc
+++ b/data/maps/TerraCave_End/scripts.inc
diff --git a/data/maps/TerraCave_Entrance/events.inc b/data/maps/TerraCave_Entrance/events.inc
new file mode 100644
index 000000000..a176c548d
--- /dev/null
+++ b/data/maps/TerraCave_Entrance/events.inc
@@ -0,0 +1,7 @@
+TerraCave_Entrance_MapWarps: @ 853782C
+	warp_def 8, 18, 0, 127, MAP_NONE
+	warp_def 14, 1, 3, 0, MAP_TERRA_CAVE_END
+
+TerraCave_Entrance_MapEvents:: @ 853783C
+	map_events 0x0, TerraCave_Entrance_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc
index f0e4df143..02c5edb91 100644
--- a/data/maps/TerraCave_Entrance/header.inc
+++ b/data/maps/TerraCave_Entrance/header.inc
@@ -1,5 +1,5 @@
 TerraCave_Entrance: @ 8484A20
-	.4byte TerraCave_Entrance_MapAttributes
+	.4byte TerraCave_Entrance_Layout
 	.4byte TerraCave_Entrance_MapEvents
 	.4byte TerraCave_Entrance_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/TerraCave_Entrance.inc b/data/maps/TerraCave_Entrance/scripts.inc
index 1762265ea..1762265ea 100644
--- a/data/scripts/maps/TerraCave_Entrance.inc
+++ b/data/maps/TerraCave_Entrance/scripts.inc
diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc
new file mode 100644
index 000000000..89e5eac90
--- /dev/null
+++ b/data/maps/TradeCenter/events.inc
@@ -0,0 +1,14 @@
+TradeCenter_EventObjects: @ 8539DA0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0
+
+TradeCenter_MapWarps: @ 8539DB8
+	warp_def 5, 8, 3, 127, MAP_NONE
+	warp_def 6, 8, 3, 127, MAP_NONE
+
+TradeCenter_MapCoordEvents: @ 8539DC8
+	coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773F5
+	coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773FF
+
+TradeCenter_MapEvents:: @ 8539DE8
+	map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0
+
diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc
index 757b3f0a4..55afa79f3 100644
--- a/data/maps/TradeCenter/header.inc
+++ b/data/maps/TradeCenter/header.inc
@@ -1,5 +1,5 @@
 TradeCenter: @ 8484D4C
-	.4byte TradeCenter_MapAttributes
+	.4byte TradeCenter_Layout
 	.4byte TradeCenter_MapEvents
 	.4byte TradeCenter_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/TradeCenter.inc b/data/maps/TradeCenter/scripts.inc
index e0e0e7d1e..e0e0e7d1e 100644
--- a/data/scripts/maps/TradeCenter.inc
+++ b/data/maps/TradeCenter/scripts.inc
diff --git a/data/maps/TrainerHill_1F/events.inc b/data/maps/TrainerHill_1F/events.inc
new file mode 100644
index 000000000..2a2428f57
--- /dev/null
+++ b/data/maps/TrainerHill_1F/events.inc
@@ -0,0 +1,7 @@
+TrainerHill_1F_MapWarps: @ 853D934
+	warp_def 2, 1, 3, 2, MAP_TRAINER_HILL_ENTRANCE
+	warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_2F
+
+TrainerHill_1F_MapEvents:: @ 853D944
+	map_events 0x0, TrainerHill_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc
index 7c6a4ea0e..e5fd3b576 100644
--- a/data/maps/TrainerHill_1F/header.inc
+++ b/data/maps/TrainerHill_1F/header.inc
@@ -1,5 +1,5 @@
 TrainerHill_1F: @ 84857E8
-	.4byte TrainerHill_1F_MapAttributes
+	.4byte TrainerHill_1F_Layout
 	.4byte TrainerHill_1F_MapEvents
 	.4byte TrainerHill_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/TrainerHill_1F.inc b/data/maps/TrainerHill_1F/scripts.inc
index 465a6d781..465a6d781 100644
--- a/data/scripts/maps/TrainerHill_1F.inc
+++ b/data/maps/TrainerHill_1F/scripts.inc
diff --git a/data/maps/TrainerHill_2F/events.inc b/data/maps/TrainerHill_2F/events.inc
new file mode 100644
index 000000000..ca50380d5
--- /dev/null
+++ b/data/maps/TrainerHill_2F/events.inc
@@ -0,0 +1,7 @@
+TrainerHill_2F_MapWarps: @ 853D958
+	warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_1F
+	warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_3F
+
+TrainerHill_2F_MapEvents:: @ 853D968
+	map_events 0x0, TrainerHill_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc
index d9a6d6204..712c99cec 100644
--- a/data/maps/TrainerHill_2F/header.inc
+++ b/data/maps/TrainerHill_2F/header.inc
@@ -1,5 +1,5 @@
 TrainerHill_2F: @ 8485804
-	.4byte TrainerHill_2F_MapAttributes
+	.4byte TrainerHill_2F_Layout
 	.4byte TrainerHill_2F_MapEvents
 	.4byte TrainerHill_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/TrainerHill_2F.inc b/data/maps/TrainerHill_2F/scripts.inc
index ca8eeff72..ca8eeff72 100644
--- a/data/scripts/maps/TrainerHill_2F.inc
+++ b/data/maps/TrainerHill_2F/scripts.inc
diff --git a/data/maps/TrainerHill_3F/events.inc b/data/maps/TrainerHill_3F/events.inc
new file mode 100644
index 000000000..e12394655
--- /dev/null
+++ b/data/maps/TrainerHill_3F/events.inc
@@ -0,0 +1,7 @@
+TrainerHill_3F_MapWarps: @ 853D97C
+	warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_2F
+	warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_4F
+
+TrainerHill_3F_MapEvents:: @ 853D98C
+	map_events 0x0, TrainerHill_3F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc
index c88a11d6d..92bbd40a1 100644
--- a/data/maps/TrainerHill_3F/header.inc
+++ b/data/maps/TrainerHill_3F/header.inc
@@ -1,5 +1,5 @@
 TrainerHill_3F: @ 8485820
-	.4byte TrainerHill_3F_MapAttributes
+	.4byte TrainerHill_3F_Layout
 	.4byte TrainerHill_3F_MapEvents
 	.4byte TrainerHill_3F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/TrainerHill_3F.inc b/data/maps/TrainerHill_3F/scripts.inc
index 921a8d808..921a8d808 100644
--- a/data/scripts/maps/TrainerHill_3F.inc
+++ b/data/maps/TrainerHill_3F/scripts.inc
diff --git a/data/maps/TrainerHill_4F/events.inc b/data/maps/TrainerHill_4F/events.inc
new file mode 100644
index 000000000..e9696de15
--- /dev/null
+++ b/data/maps/TrainerHill_4F/events.inc
@@ -0,0 +1,7 @@
+TrainerHill_4F_MapWarps: @ 853D9A0
+	warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_3F
+	warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_ROOF
+
+TrainerHill_4F_MapEvents:: @ 853D9B0
+	map_events 0x0, TrainerHill_4F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc
index 6122362b6..5de769778 100644
--- a/data/maps/TrainerHill_4F/header.inc
+++ b/data/maps/TrainerHill_4F/header.inc
@@ -1,5 +1,5 @@
 TrainerHill_4F: @ 848583C
-	.4byte TrainerHill_4F_MapAttributes
+	.4byte TrainerHill_4F_Layout
 	.4byte TrainerHill_4F_MapEvents
 	.4byte TrainerHill_4F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/TrainerHill_4F.inc b/data/maps/TrainerHill_4F/scripts.inc
index 0f710152c..0f710152c 100644
--- a/data/scripts/maps/TrainerHill_4F.inc
+++ b/data/maps/TrainerHill_4F/scripts.inc
diff --git a/data/maps/TrainerHill_Elevator/events.inc b/data/maps/TrainerHill_Elevator/events.inc
new file mode 100644
index 000000000..7af4c5425
--- /dev/null
+++ b/data/maps/TrainerHill_Elevator/events.inc
@@ -0,0 +1,10 @@
+TrainerHill_Elevator_EventObjects: @ 853DD84
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 3, 8, 1, 1, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0
+
+TrainerHill_Elevator_MapWarps: @ 853DD9C
+	warp_def 1, 6, 3, 1, MAP_TRAINER_HILL_ROOF
+	warp_def 2, 6, 3, 1, MAP_TRAINER_HILL_ROOF
+
+TrainerHill_Elevator_MapEvents:: @ 853DDAC
+	map_events TrainerHill_Elevator_EventObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc
index 9d1227640..13912579d 100644
--- a/data/maps/TrainerHill_Elevator/header.inc
+++ b/data/maps/TrainerHill_Elevator/header.inc
@@ -1,5 +1,5 @@
 TrainerHill_Elevator: @ 8485ADC
-	.4byte TrainerHill_Elevator_MapAttributes
+	.4byte BattleElevator_Layout
 	.4byte TrainerHill_Elevator_MapEvents
 	.4byte TrainerHill_Elevator_MapScripts
 	.4byte 0x0
diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc
new file mode 100644
index 000000000..ac2d5c8a7
--- /dev/null
+++ b/data/maps/TrainerHill_Elevator/scripts.inc
@@ -0,0 +1,87 @@
+TrainerHill_Elevator_MapScripts:: @ 826934F
+	map_script 2, TrainerHill_Elevator_MapScript2_269355
+	.byte 0
+
+TrainerHill_Elevator_MapScript2_269355: @ 8269355
+	map_script_2 VAR_TEMP_4, 0, TrainerHill_Elevator_EventScript_269375
+	.2byte 0
+
+TrainerHill_Elevator_EventScript_26935F:: @ 826935F
+	end
+
+TrainerHill_Elevator_EventScript_269360:: @ 8269360
+	applymovement 255, TrainerHill_Elevator_Movement_2693EB
+	waitmovement 0
+	releaseall
+	warp MAP_TRAINER_HILL_ROOF, 255, 15, 5
+	waitstate
+	end
+
+TrainerHill_Elevator_EventScript_269375:: @ 8269375
+	applymovement 255, TrainerHill_Elevator_Movement_2693E4
+	waitmovement 0
+	applymovement 1, TrainerHill_Elevator_Movement_2693EE
+	waitmovement 0
+	lockall
+	msgbox TrainerHill_Elevator_Text_268F3E, 5
+	compare VAR_RESULT, 0
+	goto_eq TrainerHill_Elevator_EventScript_269360
+	releaseall
+	applymovement 1, TrainerHill_Elevator_Movement_2693F0
+	waitmovement 0
+	applymovement 255, TrainerHill_Elevator_Movement_2693DF
+	waitmovement 0
+	call TrainerHill_Elevator_EventScript_2693D9
+	delay 25
+	applymovement 255, TrainerHill_Elevator_Movement_2693E7
+	waitmovement 0
+	warp MAP_TRAINER_HILL_ENTRANCE, 255, 17, 8
+	waitstate
+	end
+
+TrainerHill_Elevator_EventScript_2693CE:: @ 82693CE
+	goto TrainerHill_Elevator_EventScript_2693D4
+	end
+
+TrainerHill_Elevator_EventScript_2693D4:: @ 82693D4
+	special sub_8139C10
+	releaseall
+	end
+
+TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9
+	waitse
+	special sub_8139A78
+	waitstate
+	return
+
+TrainerHill_Elevator_Movement_2693DF: @ 82693DF
+	walk_up
+	walk_up
+	walk_right
+	face_down
+	step_end
+
+TrainerHill_Elevator_Movement_2693E4: @ 82693E4
+	delay_16
+	walk_left
+	step_end
+
+TrainerHill_Elevator_Movement_2693E7: @ 82693E7
+	delay_16
+	walk_down
+	walk_down
+	step_end
+
+TrainerHill_Elevator_Movement_2693EB: @ 82693EB
+	face_down
+	delay_16
+	step_end
+
+TrainerHill_Elevator_Movement_2693EE: @ 82693EE
+	face_right
+	step_end
+
+TrainerHill_Elevator_Movement_2693F0: @ 82693F0
+	face_down
+	step_end
+
diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc
new file mode 100644
index 000000000..4b974ce9b
--- /dev/null
+++ b/data/maps/TrainerHill_Entrance/events.inc
@@ -0,0 +1,21 @@
+TrainerHill_Entrance_EventObjects: @ 853D874
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 6, 3, 9, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0
+	object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, 8, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0
+	object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, 8, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, 2, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 14, 15, 3, 2, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0
+
+TrainerHill_Entrance_MapWarps: @ 853D8EC
+	warp_def 9, 16, 3, 4, MAP_ROUTE111
+	warp_def 10, 16, 3, 4, MAP_ROUTE111
+	warp_def 9, 1, 3, 0, MAP_TRAINER_HILL_1F
+
+TrainerHill_Entrance_MapCoordEvents: @ 853D904
+	coord_event 9, 6, 3, 0, VAR_0x40D6, 0, 0, TrainerHill_Entrance_EventScript_268229
+
+TrainerHill_Entrance_MapBGEvents: @ 853D914
+	bg_event 8, 10, 0, 1, 0, TrainerHill_Entrance_EventScript_268388
+
+TrainerHill_Entrance_MapEvents:: @ 853D920
+	map_events TrainerHill_Entrance_EventObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents
+
diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc
index eae0676da..f37950d98 100644
--- a/data/maps/TrainerHill_Entrance/header.inc
+++ b/data/maps/TrainerHill_Entrance/header.inc
@@ -1,5 +1,5 @@
 TrainerHill_Entrance: @ 84857CC
-	.4byte TrainerHill_Entrance_MapAttributes
+	.4byte TrainerHill_Entrance_Layout
 	.4byte TrainerHill_Entrance_MapEvents
 	.4byte TrainerHill_Entrance_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 84543ff2b..84543ff2b 100644
--- a/data/scripts/maps/TrainerHill_Entrance.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
diff --git a/data/maps/TrainerHill_Roof/events.inc b/data/maps/TrainerHill_Roof/events.inc
new file mode 100644
index 000000000..c322d7e96
--- /dev/null
+++ b/data/maps/TrainerHill_Roof/events.inc
@@ -0,0 +1,10 @@
+TrainerHill_Roof_EventObjects: @ 853D9C4
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 7, 3, 8, 1, 1, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0
+
+TrainerHill_Roof_MapWarps: @ 853D9DC
+	warp_def 9, 5, 3, 1, MAP_TRAINER_HILL_4F
+	warp_def 15, 5, 0, 1, MAP_TRAINER_HILL_ELEVATOR
+
+TrainerHill_Roof_MapEvents:: @ 853D9EC
+	map_events TrainerHill_Roof_EventObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc
index 3754fc21a..3527f447f 100644
--- a/data/maps/TrainerHill_Roof/header.inc
+++ b/data/maps/TrainerHill_Roof/header.inc
@@ -1,5 +1,5 @@
 TrainerHill_Roof: @ 8485858
-	.4byte TrainerHill_Roof_MapAttributes
+	.4byte TrainerHill_Roof_Layout
 	.4byte TrainerHill_Roof_MapEvents
 	.4byte TrainerHill_Roof_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/TrainerHill_Roof.inc b/data/maps/TrainerHill_Roof/scripts.inc
index bdec2f7aa..bdec2f7aa 100644
--- a/data/scripts/maps/TrainerHill_Roof.inc
+++ b/data/maps/TrainerHill_Roof/scripts.inc
diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc
index 6215c5e88..b0b1aa108 100644
--- a/data/maps/Underwater1/connections.inc
+++ b/data/maps/Underwater1/connections.inc
@@ -1,6 +1,6 @@
 Underwater1_MapConnectionsList: @ 8486D38
-	connection down, 0, UNDERWATER_2, 0
-	connection emerge, 0, ROUTE_124, 0
+	connection down, 0, MAP_UNDERWATER2
+	connection emerge, 0, MAP_ROUTE124
 
 Underwater1_MapConnections: @ 8486D50
 	.4byte 0x2
diff --git a/data/maps/events/Underwater1.inc b/data/maps/Underwater1/events.inc
index 08cf19a4c..08cf19a4c 100644
--- a/data/maps/events/Underwater1.inc
+++ b/data/maps/Underwater1/events.inc
diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc
index 2c7de8477..d63ca8815 100644
--- a/data/maps/Underwater1/header.inc
+++ b/data/maps/Underwater1/header.inc
@@ -1,5 +1,5 @@
 Underwater1: @ 8482A30
-	.4byte Underwater1_MapAttributes
+	.4byte Underwater1_Layout
 	.4byte Underwater1_MapEvents
 	.4byte Underwater1_MapScripts
 	.4byte Underwater1_MapConnections
diff --git a/data/scripts/maps/Underwater1.inc b/data/maps/Underwater1/scripts.inc
index 107a038a8..107a038a8 100644
--- a/data/scripts/maps/Underwater1.inc
+++ b/data/maps/Underwater1/scripts.inc
diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc
index 20ef02321..11df3eaec 100644
--- a/data/maps/Underwater2/connections.inc
+++ b/data/maps/Underwater2/connections.inc
@@ -1,7 +1,7 @@
 Underwater2_MapConnectionsList: @ 8486D6C
-	connection up, 0, UNDERWATER_1, 0
-	connection right, 0, UNDERWATER_3, 0
-	connection emerge, 0, ROUTE_126, 0
+	connection up, 0, MAP_UNDERWATER1
+	connection right, 0, MAP_UNDERWATER3
+	connection emerge, 0, MAP_ROUTE126
 
 Underwater2_MapConnections: @ 8486D90
 	.4byte 0x3
diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc
new file mode 100644
index 000000000..416e9fe86
--- /dev/null
+++ b/data/maps/Underwater2/events.inc
@@ -0,0 +1,16 @@
+Underwater2_MapWarps: @ 852CF1C
+	warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY
+
+Underwater2_MapBGEvents: @ 852CF24
+	bg_event 30, 17, 3, 7, 0, ITEM_HEART_SCALE, 14, 0
+	bg_event 41, 19, 3, 7, 0, ITEM_ULTRA_BALL, 15, 0
+	bg_event 63, 19, 3, 7, 0, ITEM_STARDUST, 16, 0
+	bg_event 10, 36, 3, 7, 0, ITEM_PEARL, 17, 0
+	bg_event 11, 39, 3, 7, 0, ITEM_IRON, 19, 0
+	bg_event 12, 35, 3, 7, 0, ITEM_YELLOW_SHARD, 18, 0
+	bg_event 65, 60, 3, 7, 0, ITEM_BIG_PEARL, 20, 0
+	bg_event 9, 77, 3, 7, 0, ITEM_BLUE_SHARD, 12, 0
+
+Underwater2_MapEvents:: @ 852CF84
+	map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents
+
diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc
index 1f29f52f9..a2754c69e 100644
--- a/data/maps/Underwater2/header.inc
+++ b/data/maps/Underwater2/header.inc
@@ -1,5 +1,5 @@
 Underwater2: @ 8482A4C
-	.4byte Underwater2_MapAttributes
+	.4byte Underwater2_Layout
 	.4byte Underwater2_MapEvents
 	.4byte Underwater2_MapScripts
 	.4byte Underwater2_MapConnections
diff --git a/data/scripts/maps/Underwater2.inc b/data/maps/Underwater2/scripts.inc
index 80c854c63..80c854c63 100644
--- a/data/scripts/maps/Underwater2.inc
+++ b/data/maps/Underwater2/scripts.inc
diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc
index 30ab15908..db8b0947b 100644
--- a/data/maps/Underwater3/connections.inc
+++ b/data/maps/Underwater3/connections.inc
@@ -1,7 +1,7 @@
 Underwater3_MapConnectionsList: @ 8486D98
-	connection emerge, 0, ROUTE_127, 0
-	connection left, 0, UNDERWATER_2, 0
-	connection down, 0, UNDERWATER_4, 0
+	connection emerge, 0, MAP_ROUTE127
+	connection left, 0, MAP_UNDERWATER2
+	connection down, 0, MAP_UNDERWATER4
 
 Underwater3_MapConnections: @ 8486DBC
 	.4byte 0x3
diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc
new file mode 100644
index 000000000..ba8ed9508
--- /dev/null
+++ b/data/maps/Underwater3/events.inc
@@ -0,0 +1,13 @@
+Underwater3_MapWarps: @ 852CF98
+	warp_def 57, 5, 0, 0, MAP_UNDERWATER_MARINE_CAVE
+	warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE
+
+Underwater3_MapBGEvents: @ 852CFA8
+	bg_event 12, 42, 3, 7, 0, ITEM_STAR_PIECE, 21, 0
+	bg_event 50, 36, 3, 7, 0, ITEM_HP_UP, 22, 0
+	bg_event 34, 72, 3, 7, 0, ITEM_HEART_SCALE, 23, 0
+	bg_event 72, 20, 3, 7, 0, ITEM_RED_SHARD, 24, 0
+
+Underwater3_MapEvents:: @ 852CFD8
+	map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents
+
diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc
index 108251489..8329304a8 100644
--- a/data/maps/Underwater3/header.inc
+++ b/data/maps/Underwater3/header.inc
@@ -1,5 +1,5 @@
 Underwater3: @ 8482A68
-	.4byte Underwater3_MapAttributes
+	.4byte Underwater3_Layout
 	.4byte Underwater3_MapEvents
 	.4byte Underwater3_MapScripts
 	.4byte Underwater3_MapConnections
diff --git a/data/scripts/maps/Underwater3.inc b/data/maps/Underwater3/scripts.inc
index 463f7a0ff..463f7a0ff 100644
--- a/data/scripts/maps/Underwater3.inc
+++ b/data/maps/Underwater3/scripts.inc
diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc
index 61880749b..8a63d54a4 100644
--- a/data/maps/Underwater4/connections.inc
+++ b/data/maps/Underwater4/connections.inc
@@ -1,6 +1,6 @@
 Underwater4_MapConnectionsList: @ 8486DC4
-	connection up, 0, UNDERWATER_3, 0
-	connection emerge, 0, ROUTE_128, 0
+	connection up, 0, MAP_UNDERWATER3
+	connection emerge, 0, MAP_ROUTE128
 
 Underwater4_MapConnections: @ 8486DDC
 	.4byte 0x2
diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc
new file mode 100644
index 000000000..5f8b99b64
--- /dev/null
+++ b/data/maps/Underwater4/events.inc
@@ -0,0 +1,10 @@
+Underwater4_MapWarps: @ 852CFEC
+	warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN
+
+Underwater4_MapBGEvents: @ 852CFF4
+	bg_event 38, 19, 3, 7, 0, ITEM_PROTEIN, 25, 0
+	bg_event 69, 18, 3, 7, 0, ITEM_PEARL, 26, 0
+
+Underwater4_MapEvents:: @ 852D00C
+	map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents
+
diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc
index 38885bcb7..f4f3e8c4b 100644
--- a/data/maps/Underwater4/header.inc
+++ b/data/maps/Underwater4/header.inc
@@ -1,5 +1,5 @@
 Underwater4: @ 8482A84
-	.4byte Underwater4_MapAttributes
+	.4byte Underwater4_Layout
 	.4byte Underwater4_MapEvents
 	.4byte Underwater4_MapScripts
 	.4byte Underwater4_MapConnections
diff --git a/data/scripts/maps/Underwater4.inc b/data/maps/Underwater4/scripts.inc
index 295c27356..295c27356 100644
--- a/data/scripts/maps/Underwater4.inc
+++ b/data/maps/Underwater4/scripts.inc
diff --git a/data/maps/Underwater5/connections.inc b/data/maps/Underwater5/connections.inc
index 6eafa49d6..15a3322ed 100644
--- a/data/maps/Underwater5/connections.inc
+++ b/data/maps/Underwater5/connections.inc
@@ -1,5 +1,5 @@
 Underwater5_MapConnectionsList: @ 8486DE4
-	connection emerge, 0, ROUTE_129, 0
+	connection emerge, 0, MAP_ROUTE129
 
 Underwater5_MapConnections: @ 8486DF0
 	.4byte 0x1
diff --git a/data/maps/Underwater5/events.inc b/data/maps/Underwater5/events.inc
new file mode 100644
index 000000000..4b902cf96
--- /dev/null
+++ b/data/maps/Underwater5/events.inc
@@ -0,0 +1,7 @@
+Underwater5_MapWarps: @ 852D020
+	warp_def 26, 3, 0, 0, MAP_UNDERWATER_MARINE_CAVE
+	warp_def 32, 21, 0, 0, MAP_UNDERWATER_MARINE_CAVE
+
+Underwater5_MapEvents:: @ 852D030
+	map_events 0x0, Underwater5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc
index f46d3d677..043a6997e 100644
--- a/data/maps/Underwater5/header.inc
+++ b/data/maps/Underwater5/header.inc
@@ -1,5 +1,5 @@
 Underwater5: @ 8482AA0
-	.4byte Underwater5_MapAttributes
+	.4byte Underwater5_Layout
 	.4byte Underwater5_MapEvents
 	.4byte Underwater5_MapScripts
 	.4byte Underwater5_MapConnections
diff --git a/data/scripts/maps/Underwater5.inc b/data/maps/Underwater5/scripts.inc
index 9d0cc373c..9d0cc373c 100644
--- a/data/scripts/maps/Underwater5.inc
+++ b/data/maps/Underwater5/scripts.inc
diff --git a/data/maps/Underwater6/connections.inc b/data/maps/Underwater6/connections.inc
index 4d2960b36..432ab625f 100644
--- a/data/maps/Underwater6/connections.inc
+++ b/data/maps/Underwater6/connections.inc
@@ -1,5 +1,5 @@
 Underwater6_MapConnectionsList: @ 8486D24
-	connection emerge, 0, ROUTE_105, 0
+	connection emerge, 0, MAP_ROUTE105
 
 Underwater6_MapConnections: @ 8486D30
 	.4byte 0x1
diff --git a/data/maps/Underwater6/events.inc b/data/maps/Underwater6/events.inc
new file mode 100644
index 000000000..a624efba3
--- /dev/null
+++ b/data/maps/Underwater6/events.inc
@@ -0,0 +1,7 @@
+Underwater6_MapWarps: @ 852D044
+	warp_def 13, 4, 0, 0, MAP_UNDERWATER_MARINE_CAVE
+	warp_def 17, 66, 0, 0, MAP_UNDERWATER_MARINE_CAVE
+
+Underwater6_MapEvents:: @ 852D054
+	map_events 0x0, Underwater6_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc
index cf6ab9141..1be09d6a1 100644
--- a/data/maps/Underwater6/header.inc
+++ b/data/maps/Underwater6/header.inc
@@ -1,5 +1,5 @@
 Underwater6: @ 8482ABC
-	.4byte Underwater6_MapAttributes
+	.4byte Underwater6_Layout
 	.4byte Underwater6_MapEvents
 	.4byte Underwater6_MapScripts
 	.4byte Underwater6_MapConnections
diff --git a/data/scripts/maps/Underwater6.inc b/data/maps/Underwater6/scripts.inc
index 047628c9c..047628c9c 100644
--- a/data/scripts/maps/Underwater6.inc
+++ b/data/maps/Underwater6/scripts.inc
diff --git a/data/maps/Underwater7/connections.inc b/data/maps/Underwater7/connections.inc
index 16d0e47e5..82803997c 100644
--- a/data/maps/Underwater7/connections.inc
+++ b/data/maps/Underwater7/connections.inc
@@ -1,5 +1,5 @@
 Underwater7_MapConnectionsList: @ 8486D58
-	connection emerge, 0, ROUTE_125, 0
+	connection emerge, 0, MAP_ROUTE125
 
 Underwater7_MapConnections: @ 8486D64
 	.4byte 0x1
diff --git a/data/maps/Underwater7/events.inc b/data/maps/Underwater7/events.inc
new file mode 100644
index 000000000..fba9324f6
--- /dev/null
+++ b/data/maps/Underwater7/events.inc
@@ -0,0 +1,7 @@
+Underwater7_MapWarps: @ 852D068
+	warp_def 22, 10, 0, 0, MAP_UNDERWATER_MARINE_CAVE
+	warp_def 45, 30, 0, 0, MAP_UNDERWATER_MARINE_CAVE
+
+Underwater7_MapEvents:: @ 852D078
+	map_events 0x0, Underwater7_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc
index 0a55ab00b..4ededa296 100644
--- a/data/maps/Underwater7/header.inc
+++ b/data/maps/Underwater7/header.inc
@@ -1,5 +1,5 @@
 Underwater7: @ 8482AD8
-	.4byte Underwater7_MapAttributes
+	.4byte Underwater7_Layout
 	.4byte Underwater7_MapEvents
 	.4byte Underwater7_MapScripts
 	.4byte Underwater7_MapConnections
diff --git a/data/scripts/maps/Underwater7.inc b/data/maps/Underwater7/scripts.inc
index dd757f98a..dd757f98a 100644
--- a/data/scripts/maps/Underwater7.inc
+++ b/data/maps/Underwater7/scripts.inc
diff --git a/data/maps/Underwater_MarineCave/events.inc b/data/maps/Underwater_MarineCave/events.inc
new file mode 100644
index 000000000..685abaa16
--- /dev/null
+++ b/data/maps/Underwater_MarineCave/events.inc
@@ -0,0 +1,6 @@
+Underwater_MarineCave_MapWarps: @ 85377B0
+	warp_def 9, 8, 0, 127, MAP_NONE
+
+Underwater_MarineCave_MapEvents:: @ 85377B8
+	map_events 0x0, Underwater_MarineCave_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc
index 6dee9d77a..54bffb710 100644
--- a/data/maps/Underwater_MarineCave/header.inc
+++ b/data/maps/Underwater_MarineCave/header.inc
@@ -1,5 +1,5 @@
 Underwater_MarineCave: @ 84849CC
-	.4byte Underwater_MarineCave_MapAttributes
+	.4byte Underwater_MarineCave_Layout
 	.4byte Underwater_MarineCave_MapEvents
 	.4byte Underwater_MarineCave_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Underwater_MarineCave/scripts.inc b/data/maps/Underwater_MarineCave/scripts.inc
new file mode 100644
index 000000000..ac96e3a9b
--- /dev/null
+++ b/data/maps/Underwater_MarineCave/scripts.inc
@@ -0,0 +1,13 @@
+Underwater_MarineCave_MapScripts:: @ 823AFB8
+	map_script 5, Underwater_MarineCave_MapScript1_23AFC7
+	map_script 3, Underwater_MarineCave_MapScript1_23AFC3
+	.byte 0
+
+Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3
+	setflag FLAG_0x8D9
+	end
+
+Underwater_MarineCave_MapScript1_23AFC7: @ 823AFC7
+	setdivewarp MAP_MARINE_CAVE_ENTRANCE, 255, 10, 17
+	end
+
diff --git a/data/maps/Underwater_Route134/events.inc b/data/maps/Underwater_Route134/events.inc
new file mode 100644
index 000000000..3a5219511
--- /dev/null
+++ b/data/maps/Underwater_Route134/events.inc
@@ -0,0 +1,6 @@
+Underwater_Route134_MapWarps: @ 8536D44
+	warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER
+
+Underwater_Route134_MapEvents:: @ 8536D4C
+	map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc
index c00017cec..f08f506a1 100644
--- a/data/maps/Underwater_Route134/header.inc
+++ b/data/maps/Underwater_Route134/header.inc
@@ -1,5 +1,5 @@
 Underwater_Route134: @ 848464C
-	.4byte Underwater_Route134_MapAttributes
+	.4byte Underwater_Route134_Layout
 	.4byte Underwater_Route134_MapEvents
 	.4byte Underwater_Route134_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Underwater_Route134/scripts.inc b/data/maps/Underwater_Route134/scripts.inc
new file mode 100644
index 000000000..786de1757
--- /dev/null
+++ b/data/maps/Underwater_Route134/scripts.inc
@@ -0,0 +1,8 @@
+Underwater_Route134_MapScripts:: @ 82390B5
+	map_script 5, Underwater_Route134_MapScript1_2390BB
+	.byte 0
+
+Underwater_Route134_MapScript1_2390BB: @ 82390BB
+	setdivewarp MAP_ROUTE134, 255, 60, 31
+	end
+
diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc
new file mode 100644
index 000000000..a22465ca0
--- /dev/null
+++ b/data/maps/Underwater_SeafloorCavern/events.inc
@@ -0,0 +1,12 @@
+Underwater_SeafloorCavern_EventObjects: @ 8535640
+	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980
+	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980
+	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980
+	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980
+
+Underwater_SeafloorCavern_MapWarps: @ 85356A0
+	warp_def 6, 7, 0, 0, MAP_UNDERWATER4
+
+Underwater_SeafloorCavern_MapEvents:: @ 85356A8
+	map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc
index e10d30013..6415ac787 100644
--- a/data/maps/Underwater_SeafloorCavern/header.inc
+++ b/data/maps/Underwater_SeafloorCavern/header.inc
@@ -1,5 +1,5 @@
 Underwater_SeafloorCavern: @ 8484198
-	.4byte Underwater_SeafloorCavern_MapAttributes
+	.4byte Underwater_SeafloorCavern_Layout
 	.4byte Underwater_SeafloorCavern_MapEvents
 	.4byte Underwater_SeafloorCavern_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc
new file mode 100644
index 000000000..128cb31c0
--- /dev/null
+++ b/data/maps/Underwater_SeafloorCavern/scripts.inc
@@ -0,0 +1,52 @@
+Underwater_SeafloorCavern_MapScripts:: @ 823433B
+	map_script 5, Underwater_SeafloorCavern_MapScript1_2343D3
+	map_script 3, Underwater_SeafloorCavern_MapScript1_23434B
+	map_script 1, Underwater_SeafloorCavern_MapScript1_23435C
+	.byte 0
+
+Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B
+	setflag FLAG_LANDMARK_SEAFLOOR_CAVERN
+	checkflag FLAG_0x081
+	goto_eq Underwater_SeafloorCavern_EventScript_234358
+	end
+
+Underwater_SeafloorCavern_EventScript_234358:: @ 8234358
+	setflag FLAG_0x3D4
+	end
+
+Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C
+	checkflag FLAG_0x081
+	call_if 1, Underwater_SeafloorCavern_EventScript_234366
+	end
+
+Underwater_SeafloorCavern_EventScript_234366:: @ 8234366
+	setmetatile 5, 3, 542, 1
+	setmetatile 6, 3, 542, 1
+	setmetatile 7, 3, 542, 1
+	setmetatile 8, 3, 542, 1
+	setmetatile 5, 4, 552, 0
+	setmetatile 6, 4, 552, 0
+	setmetatile 7, 4, 552, 0
+	setmetatile 8, 4, 552, 0
+	setmetatile 5, 5, 552, 0
+	setmetatile 6, 5, 552, 0
+	setmetatile 7, 5, 552, 0
+	setmetatile 8, 5, 552, 0
+	return
+
+Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3
+	setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17
+	end
+
+Underwater_SeafloorCavern_EventScript_2343DC:: @ 82343DC
+	msgbox Underwater_SeafloorCavern_Text_2343E5, 3
+	end
+
+Underwater_SeafloorCavern_Text_2343E5: @ 82343E5
+	.string "“SUBMARINE EXPLORER 1” is painted\n"
+	.string "on the hull.\p"
+	.string "This is the submarine TEAM AQUA\n"
+	.string "stole in SLATEPORT!\p"
+	.string "TEAM AQUA must have gone\n"
+	.string "ashore here.$"
+
diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc
new file mode 100644
index 000000000..350cca5d6
--- /dev/null
+++ b/data/maps/Underwater_SealedChamber/events.inc
@@ -0,0 +1,9 @@
+Underwater_SealedChamber_MapWarps: @ 8536D60
+	warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134
+
+Underwater_SealedChamber_MapBGEvents: @ 8536D68
+	bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_2390FC
+
+Underwater_SealedChamber_MapEvents:: @ 8536D74
+	map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents
+
diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc
index 54362aea4..a72666d12 100644
--- a/data/maps/Underwater_SealedChamber/header.inc
+++ b/data/maps/Underwater_SealedChamber/header.inc
@@ -1,5 +1,5 @@
 Underwater_SealedChamber: @ 8484668
-	.4byte Underwater_SealedChamber_MapAttributes
+	.4byte Underwater_SealedChamber_Layout
 	.4byte Underwater_SealedChamber_MapEvents
 	.4byte Underwater_SealedChamber_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc
new file mode 100644
index 000000000..7ac032c5f
--- /dev/null
+++ b/data/maps/Underwater_SealedChamber/scripts.inc
@@ -0,0 +1,28 @@
+Underwater_SealedChamber_MapScripts:: @ 82390C4
+	map_script 6, Underwater_SealedChamber_MapScript1_2390CA
+	.byte 0
+
+Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA
+	getplayerxy VAR_0x8004, VAR_0x8005
+	compare VAR_0x8004, 12
+	goto_if 5, Underwater_SealedChamber_EventScript_2390EA
+	compare VAR_0x8005, 44
+	goto_if 5, Underwater_SealedChamber_EventScript_2390EA
+	goto Underwater_SealedChamber_EventScript_2390F3
+
+Underwater_SealedChamber_EventScript_2390EA:: @ 82390EA
+	setdivewarp MAP_ROUTE134, 255, 60, 31
+	end
+
+Underwater_SealedChamber_EventScript_2390F3:: @ 82390F3
+	setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19
+	end
+
+Underwater_SealedChamber_EventScript_2390FC:: @ 82390FC
+	lockall
+	braillemessage Underwater_SealedChamber_Braille_2A6B15
+	waitbuttonpress
+	hidebox2
+	releaseall
+	end
+
diff --git a/data/maps/Underwater_SootopolisCity/events.inc b/data/maps/Underwater_SootopolisCity/events.inc
new file mode 100644
index 000000000..78839e8a1
--- /dev/null
+++ b/data/maps/Underwater_SootopolisCity/events.inc
@@ -0,0 +1,7 @@
+Underwater_SootopolisCity_MapWarps: @ 8534330
+	warp_def 9, 8, 0, 0, MAP_UNDERWATER2
+	warp_def 10, 8, 0, 0, MAP_UNDERWATER2
+
+Underwater_SootopolisCity_MapEvents:: @ 8534340
+	map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc
index af57b3c8d..ef9ee1612 100644
--- a/data/maps/Underwater_SootopolisCity/header.inc
+++ b/data/maps/Underwater_SootopolisCity/header.inc
@@ -1,5 +1,5 @@
 Underwater_SootopolisCity: @ 8483F4C
-	.4byte Underwater_SootopolisCity_MapAttributes
+	.4byte Underwater_SootopolisCity_Layout
 	.4byte Underwater_SootopolisCity_MapEvents
 	.4byte Underwater_SootopolisCity_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Underwater_SootopolisCity/scripts.inc b/data/maps/Underwater_SootopolisCity/scripts.inc
new file mode 100644
index 000000000..cbeefcb1d
--- /dev/null
+++ b/data/maps/Underwater_SootopolisCity/scripts.inc
@@ -0,0 +1,8 @@
+Underwater_SootopolisCity_MapScripts:: @ 822D94C
+	map_script 5, Underwater_SootopolisCity_MapScript1_22D952
+	.byte 0
+
+Underwater_SootopolisCity_MapScript1_22D952: @ 822D952
+	setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53
+	end
+
diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc
new file mode 100644
index 000000000..1a50ea7d8
--- /dev/null
+++ b/data/maps/UnionRoom/events.inc
@@ -0,0 +1,18 @@
+UnionRoom_EventObjects: @ 853B020
+	object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0
+	object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 1, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D204, 706
+	object_event 3, 247, 0, 7, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, 710
+	object_event 4, 246, 0, 1, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D222, 709
+	object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 7, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D218, 708
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 13, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, 707
+	object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 10, 6, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, 705
+	object_event 8, EVENT_OBJ_GFX_TRADER, 0, 13, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, 704
+	object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 4, 6, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, 703
+
+UnionRoom_MapWarps: @ 853B0F8
+	warp_def 7, 11, 3, 127, MAP_NONE
+	warp_def 8, 11, 3, 127, MAP_NONE
+
+UnionRoom_MapEvents:: @ 853B108
+	map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc
index d0b38c071..b79ae81a2 100644
--- a/data/maps/UnionRoom/header.inc
+++ b/data/maps/UnionRoom/header.inc
@@ -1,5 +1,5 @@
 UnionRoom: @ 8485120
-	.4byte UnionRoom_MapAttributes
+	.4byte UnionRoom_Layout
 	.4byte UnionRoom_MapEvents
 	.4byte UnionRoom_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/UnionRoom.inc b/data/maps/UnionRoom/scripts.inc
index 250b4b402..250b4b402 100644
--- a/data/scripts/maps/UnionRoom.inc
+++ b/data/maps/UnionRoom/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/events.inc
index 13ea1b8b9..13ea1b8b9 100644
--- a/data/maps/events/UnknownMap_25_29.inc
+++ b/data/maps/UnknownMap_25_29/events.inc
diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc
index 4fa500e7e..4c8edd31c 100644
--- a/data/maps/UnknownMap_25_29/header.inc
+++ b/data/maps/UnknownMap_25_29/header.inc
@@ -1,5 +1,5 @@
 UnknownMap_25_29: @ 8484DBC
-	.4byte UnknownMap_25_29_MapAttributes
+	.4byte UnknownMap_25_29_Layout
 	.4byte UnknownMap_25_29_MapEvents
 	.4byte UnknownMap_25_29_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/scripts.inc
index 575e7a898..575e7a898 100644
--- a/data/scripts/maps/UnknownMap_25_29.inc
+++ b/data/maps/UnknownMap_25_29/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/events.inc
index 0e221e240..0e221e240 100644
--- a/data/maps/events/UnknownMap_25_30.inc
+++ b/data/maps/UnknownMap_25_30/events.inc
diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc
index 38600bb68..46465019e 100644
--- a/data/maps/UnknownMap_25_30/header.inc
+++ b/data/maps/UnknownMap_25_30/header.inc
@@ -1,5 +1,5 @@
 UnknownMap_25_30: @ 8484DD8
-	.4byte UnknownMap_25_30_MapAttributes
+	.4byte UnknownMap_25_30_Layout
 	.4byte UnknownMap_25_30_MapEvents
 	.4byte UnknownMap_25_30_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/scripts.inc
index dbc73166d..dbc73166d 100644
--- a/data/scripts/maps/UnknownMap_25_30.inc
+++ b/data/maps/UnknownMap_25_30/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/events.inc
index 99e450de5..99e450de5 100644
--- a/data/maps/events/UnknownMap_25_31.inc
+++ b/data/maps/UnknownMap_25_31/events.inc
diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc
index f53d3055b..13e428cfd 100644
--- a/data/maps/UnknownMap_25_31/header.inc
+++ b/data/maps/UnknownMap_25_31/header.inc
@@ -1,5 +1,5 @@
 UnknownMap_25_31: @ 8484DF4
-	.4byte UnknownMap_25_31_MapAttributes
+	.4byte UnknownMap_25_31_Layout
 	.4byte UnknownMap_25_31_MapEvents
 	.4byte UnknownMap_25_31_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/scripts.inc
index cacda4d1f..cacda4d1f 100644
--- a/data/scripts/maps/UnknownMap_25_31.inc
+++ b/data/maps/UnknownMap_25_31/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/events.inc
index c48eedb17..c48eedb17 100644
--- a/data/maps/events/UnknownMap_25_32.inc
+++ b/data/maps/UnknownMap_25_32/events.inc
diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc
index 0e269a53c..8244c3802 100644
--- a/data/maps/UnknownMap_25_32/header.inc
+++ b/data/maps/UnknownMap_25_32/header.inc
@@ -1,5 +1,5 @@
 UnknownMap_25_32: @ 8484E10
-	.4byte UnknownMap_25_32_MapAttributes
+	.4byte UnknownMap_25_32_Layout
 	.4byte UnknownMap_25_32_MapEvents
 	.4byte UnknownMap_25_32_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/scripts.inc
index e34f454e7..e34f454e7 100644
--- a/data/scripts/maps/UnknownMap_25_32.inc
+++ b/data/maps/UnknownMap_25_32/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/events.inc
index 14f4571d2..14f4571d2 100644
--- a/data/maps/events/UnknownMap_25_33.inc
+++ b/data/maps/UnknownMap_25_33/events.inc
diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc
index 6a8df64c6..b4da8dd48 100644
--- a/data/maps/UnknownMap_25_33/header.inc
+++ b/data/maps/UnknownMap_25_33/header.inc
@@ -1,5 +1,5 @@
 UnknownMap_25_33: @ 8484E2C
-	.4byte UnknownMap_25_33_MapAttributes
+	.4byte UnknownMap_25_33_Layout
 	.4byte UnknownMap_25_33_MapEvents
 	.4byte UnknownMap_25_33_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/scripts.inc
index 086d2d32c..086d2d32c 100644
--- a/data/scripts/maps/UnknownMap_25_33.inc
+++ b/data/maps/UnknownMap_25_33/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/UnknownMap_25_34/events.inc
index 975f08470..975f08470 100644
--- a/data/maps/events/UnknownMap_25_34.inc
+++ b/data/maps/UnknownMap_25_34/events.inc
diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc
index d37b7ceaa..bb1ce881c 100644
--- a/data/maps/UnknownMap_25_34/header.inc
+++ b/data/maps/UnknownMap_25_34/header.inc
@@ -1,5 +1,5 @@
 UnknownMap_25_34: @ 8484E48
-	.4byte UnknownMap_25_34_MapAttributes
+	.4byte UnknownMap_25_34_Layout
 	.4byte UnknownMap_25_34_MapEvents
 	.4byte UnknownMap_25_34_MapScripts
 	.4byte 0x0
diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc
new file mode 100644
index 000000000..eb6bf8da4
--- /dev/null
+++ b/data/maps/UnknownMap_25_34/scripts.inc
@@ -0,0 +1,458 @@
+UnknownMap_25_34_MapScripts:: @ 823B781
+	map_script 4, LinkContestRoom1_MapScript2_23B81F
+	map_script 2, LinkContestRoom1_MapScript2_23B815
+	map_script 3, LinkContestRoom1_MapScript1_23B79F
+	map_script 5, LinkContestRoom1_MapScript1_23B803
+	map_script 7, LinkContestRoom1_MapScript1_23B79B
+	.byte 0
+
+LinkContestRoom1_MapScript1_23B79B: @ 823B79B
+	special sub_80F8B94
+	end
+
+LinkContestRoom1_MapScript1_23B79F: @ 823B79F
+	call LinkContestRoom1_EventScript_23B7AF
+	setvar VAR_TEMP_0, 1
+	call LinkContestRoom1_EventScript_23B842
+	end
+
+LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF
+	call LinkContestRoom1_EventScript_27A133
+	special sub_80F8FA0
+	compare VAR_RESULT, 0
+	call_if 1, LinkContestRoom1_EventScript_23B7EF
+	compare VAR_RESULT, 1
+	call_if 1, LinkContestRoom1_EventScript_23B7F3
+	compare VAR_RESULT, 2
+	call_if 1, LinkContestRoom1_EventScript_23B7F7
+	compare VAR_RESULT, 3
+	call_if 1, LinkContestRoom1_EventScript_23B7FB
+	compare VAR_RESULT, 4
+	call_if 1, LinkContestRoom1_EventScript_23B7FF
+	return
+
+LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF
+	savebgm MUS_TEST1
+	return
+
+LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3
+	savebgm MUS_TEST2
+	return
+
+LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7
+	savebgm MUS_TEST3
+	return
+
+LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB
+	savebgm MUS_TEST4
+	return
+
+LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF
+	savebgm MUS_CONTEST0
+	return
+
+LinkContestRoom1_MapScript1_23B803: @ 823B803
+	compare VAR_TEMP_9, 1
+	call_if 1, LinkContestRoom1_EventScript_23B80F
+	end
+
+LinkContestRoom1_EventScript_23B80F:: @ 823B80F
+	call LinkContestRoom1_EventScript_23BB2B
+	return
+
+LinkContestRoom1_MapScript2_23B815: @ 823B815
+	map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829
+	.2byte 0
+
+LinkContestRoom1_MapScript2_23B81F: @ 823B81F
+	map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834
+	.2byte 0
+
+LinkContestRoom1_EventScript_23B829:: @ 823B829
+	call LinkContestRoom1_EventScript_279F97
+	call LinkContestRoom1_EventScript_23BE44
+	end
+
+LinkContestRoom1_EventScript_23B834:: @ 823B834
+	special sub_80F8B94
+	hideobjectat 255, MAP_LITTLEROOT_TOWN
+	call LinkContestRoom1_EventScript_23BB2B
+	end
+
+LinkContestRoom1_EventScript_23B842:: @ 823B842
+	call LinkContestRoom1_EventScript_23B8F8
+	call LinkContestRoom1_EventScript_23B858
+	compare VAR_TEMP_0, 8
+	goto_if 0, LinkContestRoom1_EventScript_23B842
+	return
+
+LinkContestRoom1_EventScript_23B858:: @ 823B858
+	switch VAR_TEMP_0
+	case 1, LinkContestRoom1_EventScript_23B8AB
+	case 2, LinkContestRoom1_EventScript_23B8B6
+	case 3, LinkContestRoom1_EventScript_23B8C1
+	case 4, LinkContestRoom1_EventScript_23B8CC
+	case 5, LinkContestRoom1_EventScript_23B8D7
+	case 6, LinkContestRoom1_EventScript_23B8E2
+	case 7, LinkContestRoom1_EventScript_23B8ED
+	end
+
+LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB
+	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6
+	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1
+	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC
+	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7
+	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2
+	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED
+	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8
+	setvar VAR_RESULT, 32
+	special sub_80F8FE8
+	addvar VAR_RESULT, 1
+	switch VAR_RESULT
+	case 1, LinkContestRoom1_EventScript_23BA6B
+	case 2, LinkContestRoom1_EventScript_23BA71
+	case 3, LinkContestRoom1_EventScript_23BA77
+	case 4, LinkContestRoom1_EventScript_23BA7D
+	case 5, LinkContestRoom1_EventScript_23BA83
+	case 6, LinkContestRoom1_EventScript_23BA89
+	case 7, LinkContestRoom1_EventScript_23BA8F
+	case 8, LinkContestRoom1_EventScript_23BA95
+	case 9, LinkContestRoom1_EventScript_23BA9B
+	case 10, LinkContestRoom1_EventScript_23BAA1
+	case 11, LinkContestRoom1_EventScript_23BAA7
+	case 12, LinkContestRoom1_EventScript_23BAAD
+	case 13, LinkContestRoom1_EventScript_23BAB3
+	case 14, LinkContestRoom1_EventScript_23BAB9
+	case 15, LinkContestRoom1_EventScript_23BABF
+	case 16, LinkContestRoom1_EventScript_23BAC5
+	case 17, LinkContestRoom1_EventScript_23BACB
+	case 18, LinkContestRoom1_EventScript_23BAD1
+	case 19, LinkContestRoom1_EventScript_23BAD7
+	case 20, LinkContestRoom1_EventScript_23BADD
+	case 21, LinkContestRoom1_EventScript_23BAE3
+	case 22, LinkContestRoom1_EventScript_23BAE9
+	case 23, LinkContestRoom1_EventScript_23BAEF
+	case 24, LinkContestRoom1_EventScript_23BAF5
+	case 25, LinkContestRoom1_EventScript_23BAFB
+	case 26, LinkContestRoom1_EventScript_23BB01
+	case 27, LinkContestRoom1_EventScript_23BB07
+	case 28, LinkContestRoom1_EventScript_23BB0D
+	case 29, LinkContestRoom1_EventScript_23BB13
+	case 30, LinkContestRoom1_EventScript_23BB19
+	case 31, LinkContestRoom1_EventScript_23BB1F
+	case 32, LinkContestRoom1_EventScript_23BB25
+	end
+
+LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B
+	setvar VAR_TEMP_1, 5
+	return
+
+LinkContestRoom1_EventScript_23BA71:: @ 823BA71
+	setvar VAR_TEMP_1, 6
+	return
+
+LinkContestRoom1_EventScript_23BA77:: @ 823BA77
+	setvar VAR_TEMP_1, 7
+	return
+
+LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D
+	setvar VAR_TEMP_1, 8
+	return
+
+LinkContestRoom1_EventScript_23BA83:: @ 823BA83
+	setvar VAR_TEMP_1, 10
+	return
+
+LinkContestRoom1_EventScript_23BA89:: @ 823BA89
+	setvar VAR_TEMP_1, 11
+	return
+
+LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F
+	setvar VAR_TEMP_1, 12
+	return
+
+LinkContestRoom1_EventScript_23BA95:: @ 823BA95
+	setvar VAR_TEMP_1, 13
+	return
+
+LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B
+	setvar VAR_TEMP_1, 14
+	return
+
+LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1
+	setvar VAR_TEMP_1, 15
+	return
+
+LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7
+	setvar VAR_TEMP_1, 17
+	return
+
+LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD
+	setvar VAR_TEMP_1, 18
+	return
+
+LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3
+	setvar VAR_TEMP_1, 19
+	return
+
+LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9
+	setvar VAR_TEMP_1, 20
+	return
+
+LinkContestRoom1_EventScript_23BABF:: @ 823BABF
+	setvar VAR_TEMP_1, 21
+	return
+
+LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5
+	setvar VAR_TEMP_1, 22
+	return
+
+LinkContestRoom1_EventScript_23BACB:: @ 823BACB
+	setvar VAR_TEMP_1, 25
+	return
+
+LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1
+	setvar VAR_TEMP_1, 26
+	return
+
+LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7
+	setvar VAR_TEMP_1, 27
+	return
+
+LinkContestRoom1_EventScript_23BADD:: @ 823BADD
+	setvar VAR_TEMP_1, 47
+	return
+
+LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3
+	setvar VAR_TEMP_1, 30
+	return
+
+LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9
+	setvar VAR_TEMP_1, 31
+	return
+
+LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF
+	setvar VAR_TEMP_1, 32
+	return
+
+LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5
+	setvar VAR_TEMP_1, 33
+	return
+
+LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB
+	setvar VAR_TEMP_1, 34
+	return
+
+LinkContestRoom1_EventScript_23BB01:: @ 823BB01
+	setvar VAR_TEMP_1, 35
+	return
+
+LinkContestRoom1_EventScript_23BB07:: @ 823BB07
+	setvar VAR_TEMP_1, 36
+	return
+
+LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D
+	setvar VAR_TEMP_1, 37
+	return
+
+LinkContestRoom1_EventScript_23BB13:: @ 823BB13
+	setvar VAR_TEMP_1, 38
+	return
+
+LinkContestRoom1_EventScript_23BB19:: @ 823BB19
+	setvar VAR_TEMP_1, 44
+	return
+
+LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F
+	setvar VAR_TEMP_1, 45
+	return
+
+LinkContestRoom1_EventScript_23BB25:: @ 823BB25
+	setvar VAR_TEMP_1, 46
+	return
+
+LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B
+	specialvar VAR_RESULT, sub_80F9160
+	compare VAR_RESULT, 1
+	goto_eq LinkContestRoom1_EventScript_23BD86
+	switch VAR_0x4088
+	case 1, LinkContestRoom1_EventScript_23BB78
+	case 2, LinkContestRoom1_EventScript_23BB8B
+	case 3, LinkContestRoom1_EventScript_23BBE6
+	case 4, LinkContestRoom1_EventScript_23BC92
+	case 5, LinkContestRoom1_EventScript_23BC92
+	return
+
+LinkContestRoom1_EventScript_23BB78:: @ 823BB78
+	createvobject 5, 20, 3, 2, 3, 1
+	createvobject 46, 24, 11, 2, 3, 1
+	return
+
+LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B
+	createvobject 45, 0, 2, 3, 3, 4
+	createvobject 66, 1, 2, 4, 3, 4
+	createvobject 55, 2, 2, 7, 3, 4
+	createvobject 46, 3, 2, 8, 3, 4
+	createvobject 5, 10, 12, 3, 3, 3
+	createvobject 20, 11, 12, 4, 3, 3
+	createvobject 24, 12, 12, 7, 3, 3
+	createvobject 12, 13, 12, 8, 3, 3
+	createvobject 47, 20, 3, 2, 3, 1
+	createvobject 46, 24, 11, 2, 3, 1
+	return
+
+LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6
+	createvobject 45, 0, 2, 3, 3, 4
+	createvobject 66, 1, 2, 4, 3, 4
+	createvobject 55, 2, 2, 7, 3, 4
+	createvobject 48, 3, 2, 8, 3, 4
+	createvobject 5, 10, 12, 3, 3, 3
+	createvobject 20, 11, 12, 4, 3, 3
+	createvobject 24, 12, 12, 7, 3, 3
+	createvobject 45, 13, 12, 8, 3, 3
+	createvobject 22, 20, 3, 2, 3, 1
+	createvobject 23, 20, 6, 2, 3, 1
+	createvobject 34, 20, 7, 2, 3, 1
+	createvobject 46, 24, 8, 2, 3, 1
+	createvobject 48, 24, 11, 2, 3, 1
+	createvobject 11, 25, 3, 9, 3, 2
+	createvobject 35, 26, 4, 9, 3, 2
+	createvobject 17, 27, 5, 9, 3, 2
+	createvobject 40, 28, 9, 9, 3, 2
+	createvobject 38, 29, 10, 9, 3, 2
+	createvobject 83, 30, 11, 9, 3, 2
+	return
+
+LinkContestRoom1_EventScript_23BC92:: @ 823BC92
+	createvobject 45, 0, 2, 3, 3, 4
+	createvobject 66, 1, 2, 4, 3, 4
+	createvobject 55, 2, 2, 7, 3, 4
+	createvobject 12, 3, 2, 8, 3, 4
+	createvobject 39, 4, 1, 3, 3, 4
+	createvobject 34, 6, 1, 5, 3, 4
+	createvobject 26, 7, 1, 6, 3, 4
+	createvobject 48, 9, 1, 8, 3, 4
+	createvobject 5, 10, 12, 3, 3, 3
+	createvobject 20, 11, 12, 4, 3, 3
+	createvobject 24, 12, 12, 7, 3, 3
+	createvobject 45, 13, 12, 8, 3, 3
+	createvobject 50, 14, 13, 3, 3, 3
+	createvobject 52, 15, 13, 4, 3, 3
+	createvobject 65, 17, 13, 6, 3, 3
+	createvobject 83, 18, 13, 7, 3, 3
+	createvobject 116, 19, 13, 8, 3, 3
+	createvobject 25, 20, 3, 2, 3, 1
+	createvobject 31, 21, 6, 2, 3, 1
+	createvobject 33, 22, 7, 2, 3, 1
+	createvobject 46, 24, 11, 2, 3, 1
+	createvobject 49, 25, 3, 9, 3, 2
+	createvobject 35, 26, 4, 9, 3, 2
+	createvobject 48, 27, 5, 9, 3, 2
+	createvobject 40, 28, 9, 9, 3, 2
+	createvobject 38, 29, 10, 9, 3, 2
+	createvobject 83, 30, 11, 9, 3, 2
+	return
+
+LinkContestRoom1_EventScript_23BD86:: @ 823BD86
+	createvobject 45, 0, 2, 3, 3, 4
+	createvobject 66, 1, 2, 4, 3, 4
+	createvobject 55, 2, 2, 7, 3, 4
+	createvobject 12, 3, 2, 8, 3, 4
+	createvobject 39, 4, 1, 3, 3, 4
+	createvobject 34, 6, 1, 5, 3, 4
+	createvobject 26, 7, 1, 6, 3, 4
+	createvobject 48, 9, 1, 8, 3, 4
+	createvobject 5, 10, 12, 3, 3, 3
+	createvobject 20, 11, 12, 4, 3, 3
+	createvobject 24, 12, 12, 7, 3, 3
+	createvobject 45, 13, 12, 8, 3, 3
+	createvobject 50, 14, 13, 3, 3, 3
+	createvobject 52, 15, 13, 4, 3, 3
+	createvobject 65, 17, 13, 6, 3, 3
+	createvobject 83, 18, 13, 7, 3, 3
+	createvobject 116, 19, 13, 8, 3, 3
+	createvobject 25, 20, 3, 2, 3, 1
+	createvobject 31, 21, 6, 2, 3, 1
+	createvobject 33, 22, 7, 2, 3, 1
+	createvobject 46, 24, 11, 2, 3, 1
+	return
+
+LinkContestRoom1_EventScript_23BE44:: @ 823BE44
+	special sub_80F9154
+	switch VAR_0x4088
+	case 1, LinkContestRoom1_EventScript_23BE84
+	case 2, LinkContestRoom1_EventScript_23BE8E
+	case 3, LinkContestRoom1_EventScript_23BE98
+	case 4, LinkContestRoom1_EventScript_23BEA2
+	case 5, LinkContestRoom1_EventScript_23BEAC
+	return
+
+LinkContestRoom1_EventScript_23BE84:: @ 823BE84
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_23BE98:: @ 823BE98
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4
+	waitstate
+	end
+
+LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_ContestLobby_EventScript_23BECE
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_ContestLobby_EventScript_23BED4
+	return
+
+LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE
+	setvar VAR_OBJ_GFX_ID_3, 100
+	return
+
+LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4
+	setvar VAR_OBJ_GFX_ID_3, 105
+	return
+
diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc
index 0e2abd0af..de6fdface 100644
--- a/data/maps/VerdanturfTown/connections.inc
+++ b/data/maps/VerdanturfTown/connections.inc
@@ -1,6 +1,6 @@
 VerdanturfTown_MapConnectionsList: @ 8486694
-	connection up, -80, ROUTE_116, 0
-	connection right, 0, ROUTE_117, 0
+	connection up, -80, MAP_ROUTE116
+	connection right, 0, MAP_ROUTE117
 
 VerdanturfTown_MapConnections: @ 84866AC
 	.4byte 0x2
diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc
new file mode 100644
index 000000000..c844cfa1a
--- /dev/null
+++ b/data/maps/VerdanturfTown/events.inc
@@ -0,0 +1,28 @@
+VerdanturfTown_EventObjects: @ 8527CDC
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, 3, 0, 1, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0
+	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0
+
+VerdanturfTown_MapWarps: @ 8527D3C
+	warp_def 3, 7, 0, 0, MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY
+	warp_def 12, 3, 0, 0, MAP_VERDANTURF_TOWN_MART
+	warp_def 16, 3, 0, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F
+	warp_def 10, 14, 0, 0, MAP_VERDANTURF_TOWN_WANDAS_HOUSE
+	warp_def 8, 1, 0, 1, MAP_RUSTURF_TUNNEL
+	warp_def 1, 14, 0, 0, MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE
+	warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE
+
+VerdanturfTown_MapBGEvents: @ 8527D74
+	bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_271E6A
+	bg_event 14, 6, 0, 0, 0, VerdanturfTown_EventScript_1EB5D9
+	bg_event 17, 3, 0, 1, 0, VerdanturfTown_EventScript_271E73
+	bg_event 7, 14, 0, 0, 0, VerdanturfTown_EventScript_1EB5E2
+	bg_event 13, 3, 0, 1, 0, VerdanturfTown_EventScript_271E6A
+	bg_event 18, 3, 0, 1, 0, VerdanturfTown_EventScript_271E73
+	bg_event 1, 8, 0, 0, 0, VerdanturfTown_EventScript_1EB5EB
+	bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_1EB5F4
+
+VerdanturfTown_MapEvents:: @ 8527DD4
+	map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents
+
diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc
index 49be64155..047ba12ad 100644
--- a/data/maps/VerdanturfTown/header.inc
+++ b/data/maps/VerdanturfTown/header.inc
@@ -1,5 +1,5 @@
 VerdanturfTown: @ 8482640
-	.4byte VerdanturfTown_MapAttributes
+	.4byte VerdanturfTown_Layout
 	.4byte VerdanturfTown_MapEvents
 	.4byte VerdanturfTown_MapScripts
 	.4byte VerdanturfTown_MapConnections
diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/maps/VerdanturfTown/scripts.inc
index 2987a9a59..2987a9a59 100644
--- a/data/scripts/maps/VerdanturfTown.inc
+++ b/data/maps/VerdanturfTown/scripts.inc
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc
new file mode 100644
index 000000000..6276192b3
--- /dev/null
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc
@@ -0,0 +1,8 @@
+VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734
+	object_event 1, EVENT_OBJ_GFX_TRADER, 0, 2, 8, 3, 7, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 11, 1, 3, 8, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 4, 0, 10, 1, 1, 0, 0, 0x0, 0
+
+VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C
+	map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
index fba5c3764..1eef21301 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_BattleTentBattleRoom: @ 8482E90
-	.4byte VerdanturfTown_BattleTentBattleRoom_MapAttributes
+	.4byte VerdanturfTown_BattleTentBattleRoom_Layout
 	.4byte VerdanturfTown_BattleTentBattleRoom_MapEvents
 	.4byte VerdanturfTown_BattleTentBattleRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
new file mode 100644
index 000000000..b7f687cdf
--- /dev/null
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
@@ -0,0 +1,200 @@
+VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA
+	map_script 3, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A
+	map_script 2, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E
+	map_script 4, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541
+	.byte 0
+
+VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A
+	call VerdanturfTown_BattleTentBattleRoom_EventScript_202310
+	end
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202328
+	compare VAR_RESULT, 1
+	goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202333
+	return
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328
+	setvar VAR_OBJ_GFX_ID_1, 100
+	setvar VAR_OBJ_GFX_ID_0, 100
+	return
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_202333:: @ 8202333
+	setvar VAR_OBJ_GFX_ID_1, 105
+	setvar VAR_OBJ_GFX_ID_0, 105
+	return
+
+VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E
+	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_202348
+	.2byte 0
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348
+	showobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM
+	applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_202575
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	compare VAR_RESULT, 0
+	goto_if 5, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F
+	setvar VAR_0x8004, 3
+	special sub_8161F74
+	addobject 2
+	applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_20257B
+	waitmovement 0
+	setvar VAR_0x8004, 4
+	special sub_81B99B4
+	msgbox 0x2021fc4, 4
+	waitmessage
+	call VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7
+	switch VAR_RESULT
+	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 4
+	special sub_81A1780
+	special LoadPlayerParty
+	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
+	waitstate
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	addvar VAR_RESULT, 1
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 2
+	copyvar VAR_0x8006, VAR_RESULT
+	special sub_81A1780
+	switch VAR_RESULT
+	case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_202501
+	applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581
+	waitmovement 0
+	removeobject 2
+	applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725AA
+	applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6
+	waitmovement 0
+	msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, 4
+	special LoadPlayerParty
+	special SavePlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 2
+	special sub_81A1780
+	compare VAR_RESULT, 1
+	call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_202565
+	compare VAR_RESULT, 2
+	call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20256C
+	multichoice 20, 6, 104, 1
+	switch VAR_RESULT
+	case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA
+	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20248A
+	case 2, VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_20248A:: @ 820248A
+	msgbox VerdanturfTown_BattleTentBattleRoom_Text_250030, 5
+	switch VAR_RESULT
+	case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
+	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20251F
+	case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8
+	message VerdanturfTown_BattleTentBattleRoom_Text_25005A
+	waitmessage
+	multichoicedefault 20, 8, 94, 1, 0
+	switch VAR_RESULT
+	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
+	case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA
+	case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA
+	applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8
+	applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8
+	waitmovement 0
+	closemessage
+	goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 3
+	special sub_81A1780
+	special LoadPlayerParty
+	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
+	waitstate
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F
+	message VerdanturfTown_BattleTentBattleRoom_Text_25007E
+	waitmessage
+	setvar VAR_0x8004, 5
+	setvar VAR_0x8005, 2
+	special sub_81B99B4
+	playse SE_SAVE
+	waitse
+	fadescreen 1
+	setvar VAR_0x8004, 4
+	special sub_81A1780
+	end
+
+VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541
+	map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20254B
+	.2byte 0
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_20254B:: @ 820254B
+	hideobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM
+	call VerdanturfTown_BattleTentBattleRoom_EventScript_202310
+	setvar VAR_TEMP_1, 1
+	applymovement 255, VerdanturfTown_BattleTentBattleRoom_Movement_202573
+	removeobject 2
+	end
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_202565:: @ 8202565
+	message VerdanturfTown_BattleTentBattleRoom_Text_24FF28
+	waitmessage
+	return
+
+VerdanturfTown_BattleTentBattleRoom_EventScript_20256C:: @ 820256C
+	message VerdanturfTown_BattleTentBattleRoom_Text_24FF54
+	waitmessage
+	return
+
+VerdanturfTown_BattleTentBattleRoom_Movement_202573: @ 8202573
+	set_invisible
+	step_end
+
+VerdanturfTown_BattleTentBattleRoom_Movement_202575: @ 8202575
+	set_visible
+	walk_up
+	walk_up
+	walk_up
+	face_right
+	step_end
+
+VerdanturfTown_BattleTentBattleRoom_Movement_20257B: @ 820257B
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	face_left
+	step_end
+
+VerdanturfTown_BattleTentBattleRoom_Movement_202581: @ 8202581
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc
new file mode 100644
index 000000000..4fa836d58
--- /dev/null
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc
@@ -0,0 +1,6 @@
+VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 6, 3, 7, 1, 1, 0, 0, 0x0, 0
+
+VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720
+	map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
index 5d8bccc99..9b8f62260 100644
--- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_BattleTentCorridor: @ 8482E74
-	.4byte VerdanturfTown_BattleTentCorridor_MapAttributes
+	.4byte BattleTentCorridor_Layout
 	.4byte VerdanturfTown_BattleTentCorridor_MapEvents
 	.4byte VerdanturfTown_BattleTentCorridor_MapScripts
 	.4byte 0x0
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc
new file mode 100644
index 000000000..a4c2e502c
--- /dev/null
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc
@@ -0,0 +1,69 @@
+VerdanturfTown_BattleTentCorridor_MapScripts:: @ 820208A
+	map_script 2, VerdanturfTown_BattleTentCorridor_MapScript2_202090
+	.byte 0
+
+VerdanturfTown_BattleTentCorridor_MapScript2_202090: @ 8202090
+	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentCorridor_EventScript_20209A
+	.2byte 0
+
+VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A
+	lockall
+	setvar VAR_TEMP_0, 1
+	applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020DE
+	applymovement 255, VerdanturfTown_BattleTentCorridor_Movement_2020DE
+	waitmovement 0
+	opendoor 2, 1
+	waitdooranim
+	applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020E4
+	applymovement 255, VerdanturfTown_BattleTentCorridor_Movement_2020E3
+	waitmovement 0
+	closedoor 2, 1
+	waitdooranim
+	setvar VAR_0x8006, 0
+	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 6, 5
+	waitstate
+	releaseall
+	end
+
+VerdanturfTown_BattleTentCorridor_Movement_2020DE: @ 82020DE
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+VerdanturfTown_BattleTentCorridor_Movement_2020E3: @ 82020E3
+	walk_up
+
+VerdanturfTown_BattleTentCorridor_Movement_2020E4: @ 82020E4
+	walk_up
+	set_invisible
+	step_end
+
+VerdanturfTown_BattleTentCorridor_Text_2020E7: @ 82020E7
+	.string "Which CONTEST are you entering?\n"
+	.string "Want a piece of advice?\p"
+	.string "In any CONTEST, for example, a CUTE\n"
+	.string "CONTEST, I don’t think they judge you\l"
+	.string "only on cuteness in the first round.\p"
+	.string "You need to work out ways for raising\n"
+	.string "POKéMON better.$"
+
+VerdanturfTown_BattleTentCorridor_Text_2021C4: @ 82021C4
+	.string "I raised my POKéMON to be cute.\p"
+	.string "I found out you can put POKéMON in\n"
+	.string "a CONTEST for cuteness!\p"
+	.string "I’m so glad I raised my POKéMON with\n"
+	.string "loving care…$"
+
+VerdanturfTown_BattleTentCorridor_Text_202251: @ 8202251
+	.string "My POKéMON rules!\p"
+	.string "It’s cool, tough yet beautiful, cute,\n"
+	.string "and smart. It’s complete!\p"
+	.string "I may as well go for wins in every\n"
+	.string "single CONTEST.$"
+
+VerdanturfTown_BattleTentCorridor_Text_2022D6: @ 82022D6
+	.string "POKéMON CONTESTS\n"
+	.string "NORMAL RANK STAGE!$"
+
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc
new file mode 100644
index 000000000..570e600fe
--- /dev/null
+++ b/data/maps/VerdanturfTown_BattleTentLobby/events.inc
@@ -0,0 +1,18 @@
+VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 5, 3, 8, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, 2, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, 2, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, 10, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0
+	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, 9, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 8, 3, 9, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0
+
+VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8
+	warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN
+	warp_def 7, 9, 0, 0, MAP_VERDANTURF_TOWN
+
+VerdanturfTown_BattleTentLobby_MapBGEvents: @ 852E6E8
+	bg_event 4, 5, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201B02
+
+VerdanturfTown_BattleTentLobby_MapEvents:: @ 852E6F4
+	map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents
+
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc
index 6b998c218..4d1e0ca9e 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_BattleTentLobby: @ 8482E58
-	.4byte VerdanturfTown_BattleTentLobby_MapAttributes
+	.4byte BattleTentLobby_Layout
 	.4byte VerdanturfTown_BattleTentLobby_MapEvents
 	.4byte VerdanturfTown_BattleTentLobby_MapScripts
 	.4byte 0x0
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
new file mode 100644
index 000000000..26f0680a0
--- /dev/null
+++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
@@ -0,0 +1,439 @@
+VerdanturfTown_BattleTentLobby_MapScripts:: @ 82016D0
+	map_script 2, VerdanturfTown_BattleTentLobby_MapScript2_2016EF
+	map_script 4, VerdanturfTown_BattleTentLobby_MapScript2_2016DB
+	.byte 0
+
+VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB
+	map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentLobby_EventScript_2016E5
+	.2byte 0
+
+VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF
+	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentLobby_EventScript_201719
+	map_script_2 VAR_TEMP_0, 1, VerdanturfTown_BattleTentLobby_EventScript_201722
+	map_script_2 VAR_TEMP_0, 2, VerdanturfTown_BattleTentLobby_EventScript_201837
+	map_script_2 VAR_TEMP_0, 3, VerdanturfTown_BattleTentLobby_EventScript_201757
+	map_script_2 VAR_TEMP_0, 4, VerdanturfTown_BattleTentLobby_EventScript_2017FD
+	.2byte 0
+
+VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719
+	setvar VAR_0x8004, 0
+	special sub_81A1780
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722
+	lockall
+	msgbox VerdanturfTown_BattleTentLobby_Text_24E636, 4
+	closemessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	releaseall
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757
+	lockall
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4
+	message VerdanturfTown_BattleTentLobby_Text_2C5791
+	waitmessage
+	setvar VAR_0x8004, 6
+	special sub_81B99B4
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_0x8004, 5
+	setvar VAR_0x8005, 0
+	special sub_81B99B4
+	playse SE_SAVE
+	waitse
+
+VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, 4
+	setvar VAR_0x8004, 7
+	special sub_81B99B4
+	switch VAR_RESULT
+	case 0, VerdanturfTown_BattleTentLobby_EventScript_2017DD
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	message VerdanturfTown_BattleTentLobby_Text_24A554
+	waitmessage
+	playfanfare MUS_FANFA4
+	waitfanfare
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD
+	msgbox VerdanturfTown_BattleTentLobby_Text_24E57B, 4
+	waitmessage
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_2017EE:: @ 82017EE
+	lockall
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4
+	goto VerdanturfTown_BattleTentLobby_EventScript_201791
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD
+	lockall
+	message VerdanturfTown_BattleTentLobby_Text_2C56B8
+	waitmessage
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_0x8004, 5
+	setvar VAR_0x8005, 0
+	special sub_81B99B4
+	playse SE_SAVE
+	waitse
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4
+	closemessage
+	setvar VAR_TEMP_0, 255
+	releaseall
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837
+	lockall
+	msgbox VerdanturfTown_BattleTentLobby_Text_24E5D8, 4
+	message VerdanturfTown_BattleTentLobby_Text_24E5F6
+	waitmessage
+	setvar VAR_0x8004, 5
+	setvar VAR_0x8005, 1
+	special sub_81B99B4
+	playse SE_SAVE
+	waitse
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	setvar VAR_TEMP_0, 255
+	goto VerdanturfTown_BattleTentLobby_EventScript_2019AE
+
+VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873
+	lock
+	faceplayer
+	setvar VAR_0x8004, 1
+	special sub_81B99B4
+	compare VAR_RESULT, 0
+	goto_if 5, VerdanturfTown_BattleTentLobby_EventScript_2017EE
+	special SavePlayerParty
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, 4
+
+VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893
+	message VerdanturfTown_BattleTentLobby_Text_2C5129
+	waitmessage
+	multichoice 17, 6, 23, 0
+	switch VAR_RESULT
+	case 0, VerdanturfTown_BattleTentLobby_EventScript_2018CF
+	case 1, VerdanturfTown_BattleTentLobby_EventScript_2019DB
+	case 2, VerdanturfTown_BattleTentLobby_EventScript_201A37
+	case 127, VerdanturfTown_BattleTentLobby_EventScript_201A37
+
+VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF
+	setvar VAR_FRONTIER_FACILITY, 2
+	setvar VAR_0x40CE, 0
+	setvar VAR_RESULT, 2
+	setvar VAR_0x8004, 15
+	special sub_81A1780
+	compare VAR_0x8004, 1
+	goto_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 2
+	special sub_81A1780
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, 4
+	fadescreen 1
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 3
+	special sub_80F9490
+	waitstate
+	compare VAR_RESULT, 0
+	goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A34
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, 5
+	switch VAR_RESULT
+	case 0, VerdanturfTown_BattleTentLobby_EventScript_201A34
+	case 1, VerdanturfTown_BattleTentLobby_EventScript_201954
+	case 127, VerdanturfTown_BattleTentLobby_EventScript_201A34
+
+VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
+	setvar VAR_TEMP_0, 0
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 4
+	special sub_81A1780
+	setvar VAR_0x8004, 0
+	special sub_81B99B4
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 1
+	special sub_81A1780
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	special LoadPlayerParty
+	closemessage
+	delay 2
+	call VerdanturfTown_BattleTentLobby_EventScript_27134F
+	setvar VAR_TEMP_0, 255
+	compare VAR_RESULT, 0
+	goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D
+
+VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE
+	special SavePlayerParty
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 3
+	special sub_81A1780
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4
+	closemessage
+	call VerdanturfTown_BattleTentLobby_EventScript_201A41
+	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7
+	setvar VAR_TEMP_0, 0
+	waitstate
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_2019DB:: @ 82019DB
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C5163, 4
+	goto VerdanturfTown_BattleTentLobby_EventScript_201893
+
+VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8
+	switch VAR_RESULT
+	case 0, VerdanturfTown_BattleTentLobby_EventScript_201A03
+	case 1, VerdanturfTown_BattleTentLobby_EventScript_201A10
+
+VerdanturfTown_BattleTentLobby_EventScript_201A03:: @ 8201A03
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, 4
+	goto VerdanturfTown_BattleTentLobby_EventScript_201A3F
+
+VerdanturfTown_BattleTentLobby_EventScript_201A10:: @ 8201A10
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C5538, 4
+	goto VerdanturfTown_BattleTentLobby_EventScript_201A3F
+
+VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D
+	setvar VAR_0x8004, 2
+	setvar VAR_0x8005, 0
+	setvar VAR_0x8006, 0
+	special sub_81A1780
+	goto VerdanturfTown_BattleTentLobby_EventScript_201A37
+
+VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34
+	special LoadPlayerParty
+
+VerdanturfTown_BattleTentLobby_EventScript_201A37:: @ 8201A37
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4
+
+VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F
+	release
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201A41:: @ 8201A41
+	applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A70
+	applymovement 255, VerdanturfTown_BattleTentLobby_Movement_201A70
+	waitmovement 0
+	opendoor 6, 1
+	waitdooranim
+	applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A74
+	applymovement 255, VerdanturfTown_BattleTentLobby_Movement_201A77
+	waitmovement 0
+	closedoor 6, 1
+	waitdooranim
+	return
+
+VerdanturfTown_BattleTentLobby_Movement_201A70: @ 8201A70
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+VerdanturfTown_BattleTentLobby_Movement_201A74: @ 8201A74
+	walk_up
+	set_invisible
+	step_end
+
+VerdanturfTown_BattleTentLobby_Movement_201A77: @ 8201A77
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B
+	lock
+	faceplayer
+	checkflag FLAG_0x0EB
+	goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AB2
+	msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, 4
+	giveitem_std ITEM_TM45
+	compare VAR_RESULT, 0
+	goto_eq VerdanturfTown_BattleTentLobby_EventScript_272054
+	setflag FLAG_0x0EB
+	msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4
+	release
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201AB2:: @ 8201AB2
+	msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4
+	release
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201ABC:: @ 8201ABC
+	msgbox VerdanturfTown_BattleTentLobby_Text_201EB1, 2
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201AC5:: @ 8201AC5
+	lock
+	msgbox VerdanturfTown_BattleTentLobby_Text_201BD4, 4
+	release
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0
+	lock
+	faceplayer
+	checkflag FLAG_0x1CC
+	goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AED
+	msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, 4
+	addvar VAR_0x40D1, 1
+	setflag FLAG_0x1CC
+	release
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201AED:: @ 8201AED
+	msgbox VerdanturfTown_BattleTentLobby_Text_202025, 4
+	release
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201AF7:: @ 8201AF7
+	lock
+	msgbox VerdanturfTown_BattleTentLobby_Text_201D11, 4
+	release
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201B02:: @ 8201B02
+	lockall
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C6878, 4
+	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201B11:: @ 8201B11
+	message VerdanturfTown_BattleTentLobby_Text_24EF88
+	waitmessage
+	setvar VAR_0x8004, 12
+	special sub_813A128
+	waitstate
+	switch VAR_RESULT
+	case 0, VerdanturfTown_BattleTentLobby_EventScript_201B7E
+	case 1, VerdanturfTown_BattleTentLobby_EventScript_201B8C
+	case 2, VerdanturfTown_BattleTentLobby_EventScript_201B9A
+	case 3, VerdanturfTown_BattleTentLobby_EventScript_201BA8
+	case 4, VerdanturfTown_BattleTentLobby_EventScript_201BB6
+	case 5, VerdanturfTown_BattleTentLobby_EventScript_201BC4
+	case 6, VerdanturfTown_BattleTentLobby_EventScript_201BD2
+	case 127, VerdanturfTown_BattleTentLobby_EventScript_201BD2
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201B7E:: @ 8201B7E
+	msgbox VerdanturfTown_BattleTentLobby_Text_2C67CD, 4
+	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201B8C:: @ 8201B8C
+	msgbox VerdanturfTown_BattleTentLobby_Text_24EFAB, 4
+	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201B9A:: @ 8201B9A
+	msgbox VerdanturfTown_BattleTentLobby_Text_24F049, 4
+	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201BA8:: @ 8201BA8
+	msgbox VerdanturfTown_BattleTentLobby_Text_24F190, 4
+	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201BB6:: @ 8201BB6
+	msgbox VerdanturfTown_BattleTentLobby_Text_24F2E8, 4
+	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201BC4:: @ 8201BC4
+	msgbox VerdanturfTown_BattleTentLobby_Text_24F3F4, 4
+	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
+	end
+
+VerdanturfTown_BattleTentLobby_EventScript_201BD2:: @ 8201BD2
+	releaseall
+	end
+
+VerdanturfTown_BattleTentLobby_Text_201BD4: @ 8201BD4
+	.string "If it doesn’t like a certain move,\n"
+	.string "a POKéMON will be reluctant to use it.\p"
+	.string "It doesn’t matter how strong it is,\n"
+	.string "either.\p"
+	.string "For example, a POKéMON with a GENTLE\n"
+	.string "nature probably won’t enjoy hurting\l"
+	.string "its opponents.\p"
+	.string "If it can’t seem to live up to its\n"
+	.string "potential, it’s probably failing at\l"
+	.string "using a disliked move against its will.$"
+
+VerdanturfTown_BattleTentLobby_Text_201D11: @ 8201D11
+	.string "My big sister is gentle usually.\n"
+	.string "But when she gets angry,\l"
+	.string "she’s really, really scary!\p"
+	.string "I bet a gentle POKéMON will be scary\n"
+	.string "if it gets angry!$"
+
+VerdanturfTown_BattleTentLobby_Text_201D9E: @ 8201D9E
+	.string "My feelings toward my POKéMON…\n"
+	.string "The attraction runs deep…\p"
+	.string "Oh, hi, you didn’t see that, did you?\n"
+	.string "Well, it doesn’t matter.\p"
+	.string "How would you like this TM for\n"
+	.string "your POKéMON?$"
+
+VerdanturfTown_BattleTentLobby_Text_201E43: @ 8201E43
+	.string "My feelings toward my POKéMON…\n"
+	.string "I’m sure the attraction is mutual!\p"
+	.string "They battle exactly the way I want\n"
+	.string "them to!$"
+
+VerdanturfTown_BattleTentLobby_Text_201EB1: @ 8201EB1
+	.string "What kind of moves have you taught\n"
+	.string "your POKéMON?\p"
+	.string "I think you would give yourself\n"
+	.string "an advantage if they knew how to\l"
+	.string "heal or protect themselves.$"
+
+VerdanturfTown_BattleTentLobby_Text_201F3F: @ 8201F3F
+	.string "SCOTT: Hey there, {PLAYER}{KUN}!\n"
+	.string "I thought I might see you here.\p"
+	.string "A BATTLE TENT’s a place where\n"
+	.string "you can meet tough TRAINERS.\p"
+	.string "It doesn’t matter what the rules are,\n"
+	.string "or how battles are waged, either.\p"
+	.string "{PLAYER}{KUN}, I expect you to do\n"
+	.string "the best you can!$"
+
+VerdanturfTown_BattleTentLobby_Text_202025: @ 8202025
+	.string "SCOTT: I visit here regularly in hopes\n"
+	.string "of seeing tough TRAINERS in action\l"
+	.string "in whatever the situation.$"
+
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
new file mode 100644
index 000000000..fd5fa0292
--- /dev/null
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
@@ -0,0 +1,11 @@
+VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0
+	object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0
+
+VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8
+	warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN
+	warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN
+
+VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 852EA08
+	map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
index 6666d264d..51f3dadbd 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_FriendshipRatersHouse: @ 8482F1C
-	.4byte VerdanturfTown_FriendshipRatersHouse_MapAttributes
+	.4byte House2_Layout
 	.4byte VerdanturfTown_FriendshipRatersHouse_MapEvents
 	.4byte VerdanturfTown_FriendshipRatersHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
index 28030d869..28030d869 100644
--- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc
new file mode 100644
index 000000000..49b8d47ee
--- /dev/null
+++ b/data/maps/VerdanturfTown_House/events.inc
@@ -0,0 +1,11 @@
+VerdanturfTown_House_EventObjects: @ 852EA1C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0
+
+VerdanturfTown_House_MapWarps: @ 852EA4C
+	warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN
+	warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN
+
+VerdanturfTown_House_MapEvents:: @ 852EA5C
+	map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc
index a1e99f984..e6571b7f0 100644
--- a/data/maps/VerdanturfTown_House/header.inc
+++ b/data/maps/VerdanturfTown_House/header.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_House: @ 8482F38
-	.4byte VerdanturfTown_House_MapAttributes
+	.4byte House1_Layout
 	.4byte VerdanturfTown_House_MapEvents
 	.4byte VerdanturfTown_House_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/scripts.inc
index ce48fd662..ce48fd662 100644
--- a/data/scripts/maps/VerdanturfTown_House.inc
+++ b/data/maps/VerdanturfTown_House/scripts.inc
diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc
new file mode 100644
index 000000000..804f39647
--- /dev/null
+++ b/data/maps/VerdanturfTown_Mart/events.inc
@@ -0,0 +1,13 @@
+VerdanturfTown_Mart_EventObjects: @ 852E790
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, 9, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0
+
+VerdanturfTown_Mart_MapWarps: @ 852E7F0
+	warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN
+	warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN
+
+VerdanturfTown_Mart_MapEvents:: @ 852E800
+	map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc
index 3b5c3cce5..6f69b3aac 100644
--- a/data/maps/VerdanturfTown_Mart/header.inc
+++ b/data/maps/VerdanturfTown_Mart/header.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_Mart: @ 8482EAC
-	.4byte VerdanturfTown_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte VerdanturfTown_Mart_MapEvents
 	.4byte VerdanturfTown_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/scripts.inc
index 96daf2c84..96daf2c84 100644
--- a/data/scripts/maps/VerdanturfTown_Mart.inc
+++ b/data/maps/VerdanturfTown_Mart/scripts.inc
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..77bd6748c
--- /dev/null
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
@@ -0,0 +1,14 @@
+VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0
+
+VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874
+	warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN
+	warp_def 6, 8, 3, 2, MAP_VERDANTURF_TOWN
+	warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F
+
+VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 852E88C
+	map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
index d6fc48171..b6c5177ce 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_PokemonCenter_1F: @ 8482EC8
-	.4byte VerdanturfTown_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte VerdanturfTown_PokemonCenter_1F_MapEvents
 	.4byte VerdanturfTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
index 73c7fe1f3..73c7fe1f3 100644
--- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..40cbe6aec
--- /dev/null
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702
+
+VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900
+	warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 852E918
+	map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
index fa99aeaa4..ee657d77b 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_PokemonCenter_2F: @ 8482EE4
-	.4byte VerdanturfTown_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte VerdanturfTown_PokemonCenter_2F_MapEvents
 	.4byte VerdanturfTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
index 9e93a628e..9e93a628e 100644
--- a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc
new file mode 100644
index 000000000..cfa46e102
--- /dev/null
+++ b/data/maps/VerdanturfTown_WandasHouse/events.inc
@@ -0,0 +1,14 @@
+VerdanturfTown_WandasHouse_EventObjects: @ 852E92C
+	object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, 2, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984
+
+VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4
+	warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN
+	warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN
+
+VerdanturfTown_WandasHouse_MapEvents:: @ 852E9B4
+	map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc
index a1e4e49aa..cb727234e 100644
--- a/data/maps/VerdanturfTown_WandasHouse/header.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/header.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_WandasHouse: @ 8482F00
-	.4byte VerdanturfTown_WandasHouse_MapAttributes
+	.4byte VerdanturfTown_WandasHouse_Layout
 	.4byte VerdanturfTown_WandasHouse_MapEvents
 	.4byte VerdanturfTown_WandasHouse_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
index fabff6420..fabff6420 100644
--- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc
new file mode 100644
index 000000000..d5fa881dc
--- /dev/null
+++ b/data/maps/VictoryRoad_1F/events.inc
@@ -0,0 +1,28 @@
+VictoryRoad_1F_EventObjects: @ 8535E04
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0
+	object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, 8, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, 1084
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, 1085
+	object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, 751
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 29, 17, 3, 10, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 32, 17, 3, 9, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0
+
+VictoryRoad_1F_MapWarps: @ 8535EDC
+	warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY
+	warp_def 39, 5, 3, 3, MAP_EVER_GRANDE_CITY
+	warp_def 21, 32, 3, 5, MAP_VICTORY_ROAD_B1F
+	warp_def 42, 38, 4, 2, MAP_VICTORY_ROAD_B1F
+	warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F
+
+VictoryRoad_1F_MapCoordEvents: @ 8535F04
+	coord_event 2, 23, 4, 0, VAR_0x40C3, 0, 0, VictoryRoad_1F_EventScript_235DAF
+	coord_event 3, 23, 4, 0, VAR_0x40C3, 0, 0, VictoryRoad_1F_EventScript_235DC8
+
+VictoryRoad_1F_MapBGEvents: @ 8535F24
+	bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0
+
+VictoryRoad_1F_MapEvents:: @ 8535F30
+	map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents
+
diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc
index 8bd8286b5..35ff7bd3b 100644
--- a/data/maps/VictoryRoad_1F/header.inc
+++ b/data/maps/VictoryRoad_1F/header.inc
@@ -1,5 +1,5 @@
 VictoryRoad_1F: @ 8484374
-	.4byte VictoryRoad_1F_MapAttributes
+	.4byte VictoryRoad_1F_Layout
 	.4byte VictoryRoad_1F_MapEvents
 	.4byte VictoryRoad_1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/scripts.inc
index 2ed1c6baf..2ed1c6baf 100644
--- a/data/scripts/maps/VictoryRoad_1F.inc
+++ b/data/maps/VictoryRoad_1F/scripts.inc
diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc
new file mode 100644
index 000000000..26d67171d
--- /dev/null
+++ b/data/maps/VictoryRoad_B1F/events.inc
@@ -0,0 +1,35 @@
+VictoryRoad_B1F_EventObjects: @ 8535F44
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25
+	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26
+	object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27
+	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28
+	object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29
+	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31
+	object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0
+	object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0
+	object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087
+	object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 14, 16, 3, 8, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0
+	object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 20, 3, 16, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0
+
+VictoryRoad_B1F_MapWarps: @ 853613C
+	warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F
+	warp_def 17, 16, 3, 2, MAP_VICTORY_ROAD_B2F
+	warp_def 42, 25, 3, 3, MAP_VICTORY_ROAD_1F
+	warp_def 42, 2, 4, 1, MAP_VICTORY_ROAD_B2F
+	warp_def 8, 3, 3, 4, MAP_VICTORY_ROAD_1F
+	warp_def 20, 21, 3, 2, MAP_VICTORY_ROAD_1F
+	warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F
+
+VictoryRoad_B1F_MapEvents:: @ 8536174
+	map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc
index 620dbdc71..b9edeeb17 100644
--- a/data/maps/VictoryRoad_B1F/header.inc
+++ b/data/maps/VictoryRoad_B1F/header.inc
@@ -1,5 +1,5 @@
 VictoryRoad_B1F: @ 8484390
-	.4byte VictoryRoad_B1F_MapAttributes
+	.4byte VictoryRoad_B1F_Layout
 	.4byte VictoryRoad_B1F_MapEvents
 	.4byte VictoryRoad_B1F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/scripts.inc
index 376fda7d5..376fda7d5 100644
--- a/data/scripts/maps/VictoryRoad_B1F.inc
+++ b/data/maps/VictoryRoad_B1F/scripts.inc
diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc
new file mode 100644
index 000000000..a25c76c81
--- /dev/null
+++ b/data/maps/VictoryRoad_B2F/events.inc
@@ -0,0 +1,22 @@
+VictoryRoad_B2F_EventObjects: @ 8536188
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, 7, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, 9, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, 1, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088
+	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 25, 18, 4, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 25, 21, 4, 7, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0
+
+VictoryRoad_B2F_MapWarps: @ 8536230
+	warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F
+	warp_def 43, 2, 3, 3, MAP_VICTORY_ROAD_B1F
+	warp_def 19, 12, 3, 1, MAP_VICTORY_ROAD_B1F
+	warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F
+
+VictoryRoad_B2F_MapBGEvents: @ 8536250
+	bg_event 28, 5, 3, 7, 0, ITEM_ELIXIR, 82, 0
+	bg_event 37, 1, 3, 7, 0, ITEM_MAX_REPEL, 83, 0
+
+VictoryRoad_B2F_MapEvents:: @ 8536268
+	map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents
+
diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc
index ebafcfd49..b6c80a656 100644
--- a/data/maps/VictoryRoad_B2F/header.inc
+++ b/data/maps/VictoryRoad_B2F/header.inc
@@ -1,5 +1,5 @@
 VictoryRoad_B2F: @ 84843AC
-	.4byte VictoryRoad_B2F_MapAttributes
+	.4byte VictoryRoad_B2F_Layout
 	.4byte VictoryRoad_B2F_MapEvents
 	.4byte VictoryRoad_B2F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/scripts.inc
index 15deea104..15deea104 100644
--- a/data/scripts/maps/VictoryRoad_B2F.inc
+++ b/data/maps/VictoryRoad_B2F/scripts.inc
diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc
deleted file mode 100644
index c3c2a8d31..000000000
--- a/data/maps/_assets.inc
+++ /dev/null
@@ -1,7606 +0,0 @@
-	.align 2
-PetalburgCity_MapBorder: @ 83DFE14
-	.incbin "data/maps/PetalburgCity/border.bin"
-
-	.align 2
-PetalburgCity_MapBlockdata: @ 83DFE1C
-	.incbin "data/maps/PetalburgCity/map.bin"
-
-	.align 2
-PetalburgCity_MapAttributes: @ 83E0524
-	.4byte 0x1e
-	.4byte 0x1e
-	.4byte PetalburgCity_MapBorder
-	.4byte PetalburgCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-	.align 2
-SlateportCity_MapBorder: @ 83E053C
-	.incbin "data/maps/SlateportCity/border.bin"
-
-	.align 2
-SlateportCity_MapBlockdata: @ 83E0544
-	.incbin "data/maps/SlateportCity/map.bin"
-
-	.align 2
-SlateportCity_MapAttributes: @ 83E1804
-	.4byte 0x28
-	.4byte 0x3c
-	.4byte SlateportCity_MapBorder
-	.4byte SlateportCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Slateport
-
-	.align 2
-MauvilleCity_MapBorder: @ 83E181C
-	.incbin "data/maps/MauvilleCity/border.bin"
-
-	.align 2
-MauvilleCity_MapBlockdata: @ 83E1824
-	.incbin "data/maps/MauvilleCity/map.bin"
-
-	.align 2
-MauvilleCity_MapAttributes: @ 83E1E64
-	.4byte 0x28
-	.4byte 0x14
-	.4byte MauvilleCity_MapBorder
-	.4byte MauvilleCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-	.align 2
-RustboroCity_MapBorder: @ 83E1E7C
-	.incbin "data/maps/RustboroCity/border.bin"
-
-	.align 2
-RustboroCity_MapBlockdata: @ 83E1E84
-	.incbin "data/maps/RustboroCity/map.bin"
-
-	.align 2
-RustboroCity_MapAttributes: @ 83E3144
-	.4byte 0x28
-	.4byte 0x3c
-	.4byte RustboroCity_MapBorder
-	.4byte RustboroCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-	.align 2
-FortreeCity_MapBorder: @ 83E315C
-	.incbin "data/maps/FortreeCity/border.bin"
-
-	.align 2
-FortreeCity_MapBlockdata: @ 83E3164
-	.incbin "data/maps/FortreeCity/map.bin"
-
-	.align 2
-FortreeCity_MapAttributes: @ 83E37A4
-	.4byte 0x28
-	.4byte 0x14
-	.4byte FortreeCity_MapBorder
-	.4byte FortreeCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fortree
-
-	.align 2
-LilycoveCity_MapBorder: @ 83E37BC
-	.incbin "data/maps/LilycoveCity/border.bin"
-
-	.align 2
-LilycoveCity_MapBlockdata: @ 83E37C4
-	.incbin "data/maps/LilycoveCity/map.bin"
-
-	.align 2
-LilycoveCity_MapAttributes: @ 83E50C4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte LilycoveCity_MapBorder
-	.4byte LilycoveCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-	.align 2
-MossdeepCity_MapBorder: @ 83E50DC
-	.incbin "data/maps/MossdeepCity/border.bin"
-
-	.align 2
-MossdeepCity_MapBlockdata: @ 83E50E4
-	.incbin "data/maps/MossdeepCity/map.bin"
-
-	.align 2
-MossdeepCity_MapAttributes: @ 83E69E4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte MossdeepCity_MapBorder
-	.4byte MossdeepCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-	.align 2
-SootopolisCity_MapBorder: @ 83E69FC
-	.incbin "data/maps/SootopolisCity/border.bin"
-
-	.align 2
-SootopolisCity_MapBlockdata: @ 83E6A04
-	.incbin "data/maps/SootopolisCity/map.bin"
-
-	.align 2
-SootopolisCity_MapAttributes: @ 83E8624
-	.4byte 0x3c
-	.4byte 0x3c
-	.4byte SootopolisCity_MapBorder
-	.4byte SootopolisCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Sootopolis
-
-	.align 2
-EverGrandeCity_MapBorder: @ 83E863C
-	.incbin "data/maps/EverGrandeCity/border.bin"
-
-	.align 2
-EverGrandeCity_MapBlockdata: @ 83E8644
-	.incbin "data/maps/EverGrandeCity/map.bin"
-
-	.align 2
-EverGrandeCity_MapAttributes: @ 83E9F44
-	.4byte 0x28
-	.4byte 0x50
-	.4byte EverGrandeCity_MapBorder
-	.4byte EverGrandeCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_EverGrande
-
-	.align 2
-LittlerootTown_MapBorder: @ 83E9F5C
-	.incbin "data/maps/LittlerootTown/border.bin"
-
-	.align 2
-LittlerootTown_MapBlockdata: @ 83E9F64
-	.incbin "data/maps/LittlerootTown/map.bin"
-
-	.align 2
-LittlerootTown_MapAttributes: @ 83EA284
-	.4byte 0x14
-	.4byte 0x14
-	.4byte LittlerootTown_MapBorder
-	.4byte LittlerootTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-	.align 2
-OldaleTown_MapBorder: @ 83EA29C
-	.incbin "data/maps/OldaleTown/border.bin"
-
-	.align 2
-OldaleTown_MapBlockdata: @ 83EA2A4
-	.incbin "data/maps/OldaleTown/map.bin"
-
-	.align 2
-OldaleTown_MapAttributes: @ 83EA5C4
-	.4byte 0x14
-	.4byte 0x14
-	.4byte OldaleTown_MapBorder
-	.4byte OldaleTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-	.align 2
-DewfordTown_MapBorder: @ 83EA5DC
-	.incbin "data/maps/DewfordTown/border.bin"
-
-	.align 2
-DewfordTown_MapBlockdata: @ 83EA5E4
-	.incbin "data/maps/DewfordTown/map.bin"
-
-	.align 2
-DewfordTown_MapAttributes: @ 83EA904
-	.4byte 0x14
-	.4byte 0x14
-	.4byte DewfordTown_MapBorder
-	.4byte DewfordTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-	.align 2
-LavaridgeTown_MapBorder: @ 83EA91C
-	.incbin "data/maps/LavaridgeTown/border.bin"
-
-	.align 2
-LavaridgeTown_MapBlockdata: @ 83EA924
-	.incbin "data/maps/LavaridgeTown/map.bin"
-
-	.align 2
-LavaridgeTown_MapAttributes: @ 83EAC44
-	.4byte 0x14
-	.4byte 0x14
-	.4byte LavaridgeTown_MapBorder
-	.4byte LavaridgeTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-	.align 2
-FallarborTown_MapBorder: @ 83EAC5C
-	.incbin "data/maps/FallarborTown/border.bin"
-
-	.align 2
-FallarborTown_MapBlockdata: @ 83EAC64
-	.incbin "data/maps/FallarborTown/map.bin"
-
-	.align 2
-FallarborTown_MapAttributes: @ 83EAF84
-	.4byte 0x14
-	.4byte 0x14
-	.4byte FallarborTown_MapBorder
-	.4byte FallarborTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-	.align 2
-VerdanturfTown_MapBorder: @ 83EAF9C
-	.incbin "data/maps/VerdanturfTown/border.bin"
-
-	.align 2
-VerdanturfTown_MapBlockdata: @ 83EAFA4
-	.incbin "data/maps/VerdanturfTown/map.bin"
-
-	.align 2
-VerdanturfTown_MapAttributes: @ 83EB2C4
-	.4byte 0x14
-	.4byte 0x14
-	.4byte VerdanturfTown_MapBorder
-	.4byte VerdanturfTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-	.align 2
-PacifidlogTown_MapBorder: @ 83EB2DC
-	.incbin "data/maps/PacifidlogTown/border.bin"
-
-	.align 2
-PacifidlogTown_MapBlockdata: @ 83EB2E4
-	.incbin "data/maps/PacifidlogTown/map.bin"
-
-	.align 2
-PacifidlogTown_MapAttributes: @ 83EB924
-	.4byte 0x14
-	.4byte 0x28
-	.4byte PacifidlogTown_MapBorder
-	.4byte PacifidlogTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-Route101_MapBorder: @ 83EB93C
-	.incbin "data/maps/Route101/border.bin"
-
-	.align 2
-Route101_MapBlockdata: @ 83EB944
-	.incbin "data/maps/Route101/map.bin"
-
-	.align 2
-Route101_MapAttributes: @ 83EBC64
-	.4byte 0x14
-	.4byte 0x14
-	.4byte Route101_MapBorder
-	.4byte Route101_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-	.align 2
-Route102_MapBorder: @ 83EBC7C
-	.incbin "data/maps/Route102/border.bin"
-
-	.align 2
-Route102_MapBlockdata: @ 83EBC84
-	.incbin "data/maps/Route102/map.bin"
-
-	.align 2
-Route102_MapAttributes: @ 83EC454
-	.4byte 0x32
-	.4byte 0x14
-	.4byte Route102_MapBorder
-	.4byte Route102_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-	.align 2
-Route103_MapBorder: @ 83EC46C
-	.incbin "data/maps/Route103/border.bin"
-
-	.align 2
-Route103_MapBlockdata: @ 83EC474
-	.incbin "data/maps/Route103/map.bin"
-
-	.align 2
-Route103_MapAttributes: @ 83ED234
-	.4byte 0x50
-	.4byte 0x16
-	.4byte Route103_MapBorder
-	.4byte Route103_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-	.align 2
-Route104_MapBorder: @ 83ED24C
-	.incbin "data/maps/Route104/border.bin"
-
-	.align 2
-Route104_MapBlockdata: @ 83ED254
-	.incbin "data/maps/Route104/map.bin"
-
-	.align 2
-Route104_MapAttributes: @ 83EEB54
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route104_MapBorder
-	.4byte Route104_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-	.align 2
-Route105_MapBorder: @ 83EEB6C
-	.incbin "data/maps/Route105/border.bin"
-
-	.align 2
-Route105_MapBlockdata: @ 83EEB74
-	.incbin "data/maps/Route105/map.bin"
-
-	.align 2
-Route105_MapAttributes: @ 83F0474
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route105_MapBorder
-	.4byte Route105_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-	.align 2
-Route106_MapBorder: @ 83F048C
-	.incbin "data/maps/Route106/border.bin"
-
-	.align 2
-Route106_MapBlockdata: @ 83F0494
-	.incbin "data/maps/Route106/map.bin"
-
-	.align 2
-Route106_MapAttributes: @ 83F1114
-	.4byte 0x50
-	.4byte 0x14
-	.4byte Route106_MapBorder
-	.4byte Route106_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-	.align 2
-Route107_MapBorder: @ 83F112C
-	.incbin "data/maps/Route107/border.bin"
-
-	.align 2
-Route107_MapBlockdata: @ 83F1134
-	.incbin "data/maps/Route107/map.bin"
-
-	.align 2
-Route107_MapAttributes: @ 83F1A94
-	.4byte 0x3c
-	.4byte 0x14
-	.4byte Route107_MapBorder
-	.4byte Route107_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-	.align 2
-Route108_MapBorder: @ 83F1AAC
-	.incbin "data/maps/Route108/border.bin"
-
-	.align 2
-Route108_MapBlockdata: @ 83F1AB4
-	.incbin "data/maps/Route108/map.bin"
-
-	.align 2
-Route108_MapAttributes: @ 83F2414
-	.4byte 0x3c
-	.4byte 0x14
-	.4byte Route108_MapBorder
-	.4byte Route108_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Slateport
-
-	.align 2
-Route109_MapBorder: @ 83F242C
-	.incbin "data/maps/Route109/border.bin"
-
-	.align 2
-Route109_MapBlockdata: @ 83F2434
-	.incbin "data/maps/Route109/map.bin"
-
-	.align 2
-Route109_MapAttributes: @ 83F37E4
-	.4byte 0x28
-	.4byte 0x3f
-	.4byte Route109_MapBorder
-	.4byte Route109_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Slateport
-
-	.align 2
-Route110_MapBorder: @ 83F37FC
-	.incbin "data/maps/Route110/border.bin"
-
-	.align 2
-Route110_MapBlockdata: @ 83F3804
-	.incbin "data/maps/Route110/map.bin"
-
-	.align 2
-Route110_MapAttributes: @ 83F5744
-	.4byte 0x28
-	.4byte 0x64
-	.4byte Route110_MapBorder
-	.4byte Route110_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-	.align 2
-Route111_MapBorder: @ 83F575C
-	.incbin "data/maps/Route111/border.bin"
-
-	.align 2
-Route111_MapBlockdata: @ 83F5764
-	.incbin "data/maps/Route111/map.bin"
-
-	.align 2
-Route111_MapAttributes: @ 83F8324
-	.4byte 0x28
-	.4byte 0x8c
-	.4byte Route111_MapBorder
-	.4byte Route111_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-	.align 2
-Route112_MapBorder: @ 83F833C
-	.incbin "data/maps/Route112/border.bin"
-
-	.align 2
-Route112_MapBlockdata: @ 83F8344
-	.incbin "data/maps/Route112/map.bin"
-
-	.align 2
-Route112_MapAttributes: @ 83F9604
-	.4byte 0x28
-	.4byte 0x3c
-	.4byte Route112_MapBorder
-	.4byte Route112_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-	.align 2
-Route113_MapBorder: @ 83F961C
-	.incbin "data/maps/Route113/border.bin"
-
-	.align 2
-Route113_MapBlockdata: @ 83F9624
-	.incbin "data/maps/Route113/map.bin"
-
-	.align 2
-Route113_MapAttributes: @ 83FA5C4
-	.4byte 0x64
-	.4byte 0x14
-	.4byte Route113_MapBorder
-	.4byte Route113_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-	.align 2
-Route114_MapBorder: @ 83FA5DC
-	.incbin "data/maps/Route114/border.bin"
-
-	.align 2
-Route114_MapBlockdata: @ 83FA5E4
-	.incbin "data/maps/Route114/map.bin"
-
-	.align 2
-Route114_MapAttributes: @ 83FBEE4
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route114_MapBorder
-	.4byte Route114_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-	.align 2
-Route115_MapBorder: @ 83FBEFC
-	.incbin "data/maps/Route115/border.bin"
-
-	.align 2
-Route115_MapBlockdata: @ 83FBF04
-	.incbin "data/maps/Route115/map.bin"
-
-	.align 2
-Route115_MapAttributes: @ 83FD804
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route115_MapBorder
-	.4byte Route115_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-	.align 2
-Route116_MapBorder: @ 83FD81C
-	.incbin "data/maps/Route116/border.bin"
-
-	.align 2
-Route116_MapBlockdata: @ 83FD824
-	.incbin "data/maps/Route116/map.bin"
-
-	.align 2
-Route116_MapAttributes: @ 83FE7C4
-	.4byte 0x64
-	.4byte 0x14
-	.4byte Route116_MapBorder
-	.4byte Route116_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-	.align 2
-Route117_MapBorder: @ 83FE7DC
-	.incbin "data/maps/Route117/border.bin"
-
-	.align 2
-Route117_MapBlockdata: @ 83FE7E4
-	.incbin "data/maps/Route117/map.bin"
-
-	.align 2
-Route117_MapAttributes: @ 83FF144
-	.4byte 0x3c
-	.4byte 0x14
-	.4byte Route117_MapBorder
-	.4byte Route117_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-	.align 2
-Route118_MapBorder: @ 83FF15C
-	.incbin "data/maps/Route118/border.bin"
-
-	.align 2
-Route118_MapBlockdata: @ 83FF164
-	.incbin "data/maps/Route118/map.bin"
-
-	.align 2
-Route118_MapAttributes: @ 83FFDE4
-	.4byte 0x50
-	.4byte 0x14
-	.4byte Route118_MapBorder
-	.4byte Route118_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-	.align 2
-Route119_MapBorder: @ 83FFDFC
-	.incbin "data/maps/Route119/border.bin"
-
-	.align 2
-Route119_MapBlockdata: @ 83FFE04
-	.incbin "data/maps/Route119/map.bin"
-
-	.align 2
-Route119_MapAttributes: @ 84029C4
-	.4byte 0x28
-	.4byte 0x8c
-	.4byte Route119_MapBorder
-	.4byte Route119_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fortree
-
-	.align 2
-Route120_MapBorder: @ 84029DC
-	.incbin "data/maps/Route120/border.bin"
-
-	.align 2
-Route120_MapBlockdata: @ 84029E4
-	.incbin "data/maps/Route120/map.bin"
-
-	.align 2
-Route120_MapAttributes: @ 8404924
-	.4byte 0x28
-	.4byte 0x64
-	.4byte Route120_MapBorder
-	.4byte Route120_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fortree
-
-	.align 2
-Route121_MapBorder: @ 840493C
-	.incbin "data/maps/Route121/border.bin"
-
-	.align 2
-Route121_MapBlockdata: @ 8404944
-	.incbin "data/maps/Route121/map.bin"
-
-	.align 2
-Route121_MapAttributes: @ 84055C4
-	.4byte 0x50
-	.4byte 0x14
-	.4byte Route121_MapBorder
-	.4byte Route121_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-	.align 2
-Route122_MapBorder: @ 84055DC
-	.incbin "data/maps/Route122/border.bin"
-
-	.align 2
-Route122_MapBlockdata: @ 84055E4
-	.incbin "data/maps/Route122/map.bin"
-
-	.align 2
-Route122_MapAttributes: @ 8406264
-	.4byte 0x28
-	.4byte 0x28
-	.4byte Route122_MapBorder
-	.4byte Route122_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-	.align 2
-Route123_MapBorder: @ 840627C
-	.incbin "data/maps/Route123/border.bin"
-
-	.align 2
-Route123_MapBlockdata: @ 8406284
-	.incbin "data/maps/Route123/map.bin"
-
-	.align 2
-Route123_MapAttributes: @ 8407864
-	.4byte 0x8c
-	.4byte 0x14
-	.4byte Route123_MapBorder
-	.4byte Route123_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-	.align 2
-Route124_MapBorder: @ 840787C
-	.incbin "data/maps/Route124/border.bin"
-
-	.align 2
-Route124_MapBlockdata: @ 8407884
-	.incbin "data/maps/Route124/map.bin"
-
-	.align 2
-Route124_MapAttributes: @ 840AA84
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Route124_MapBorder
-	.4byte Route124_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-	.align 2
-Route125_MapBorder: @ 840AA9C
-	.incbin "data/maps/Route125/border.bin"
-
-	.align 2
-Route125_MapBlockdata: @ 840AAA4
-	.incbin "data/maps/Route125/map.bin"
-
-	.align 2
-Route125_MapAttributes: @ 840C3A4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route125_MapBorder
-	.4byte Route125_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-	.align 2
-Route126_MapBorder: @ 840C3BC
-	.incbin "data/maps/Route126/border.bin"
-
-	.align 2
-Route126_MapBlockdata: @ 840C3C4
-	.incbin "data/maps/Route126/map.bin"
-
-	.align 2
-Route126_MapAttributes: @ 840F5C4
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Route126_MapBorder
-	.4byte Route126_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-	.align 2
-Route127_MapBorder: @ 840F5DC
-	.incbin "data/maps/Route127/border.bin"
-
-	.align 2
-Route127_MapBlockdata: @ 840F5E4
-	.incbin "data/maps/Route127/map.bin"
-
-	.align 2
-Route127_MapAttributes: @ 84127E4
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Route127_MapBorder
-	.4byte Route127_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-	.align 2
-Route128_MapBorder: @ 84127FC
-	.incbin "data/maps/Route128/border.bin"
-
-	.align 2
-Route128_MapBlockdata: @ 8412804
-	.incbin "data/maps/Route128/map.bin"
-
-	.align 2
-Route128_MapAttributes: @ 8414D84
-	.4byte 0x78
-	.4byte 0x28
-	.4byte Route128_MapBorder
-	.4byte Route128_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-	.align 2
-Route129_MapBorder: @ 8414D9C
-	.incbin "data/maps/Route129/border.bin"
-
-	.align 2
-Route129_MapBlockdata: @ 8414DA4
-	.incbin "data/maps/Route129/map.bin"
-
-	.align 2
-Route129_MapAttributes: @ 84166A4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route129_MapBorder
-	.4byte Route129_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-	.align 2
-UnknownMapBorder_08417FC4: @ 84166BC
-	.incbin "data/maps/UnknownMap_08417FC4/border.bin"
-
-	.align 2
-UnknownMapBlockdata_08417FC4: @ 84166C4
-	.incbin "data/maps/UnknownMap_08417FC4/map.bin"
-
-	.align 2
-UnknownMapAttributes_08417FC4: @ 8417FC4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte UnknownMapBorder_08417FC4
-	.4byte UnknownMapBlockdata_08417FC4
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-Route131_MapBorder: @ 8417FDC
-	.incbin "data/maps/Route131/border.bin"
-
-	.align 2
-Route131_MapBlockdata: @ 8417FE4
-	.incbin "data/maps/Route131/map.bin"
-
-	.align 2
-Route131_MapAttributes: @ 84192A4
-	.4byte 0x3c
-	.4byte 0x28
-	.4byte Route131_MapBorder
-	.4byte Route131_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-Route132_MapBorder: @ 84192BC
-	.incbin "data/maps/Route132/border.bin"
-
-	.align 2
-Route132_MapBlockdata: @ 84192C4
-	.incbin "data/maps/Route132/map.bin"
-
-	.align 2
-Route132_MapAttributes: @ 841ABC4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route132_MapBorder
-	.4byte Route132_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-Route133_MapBorder: @ 841ABDC
-	.incbin "data/maps/Route133/border.bin"
-
-	.align 2
-Route133_MapBlockdata: @ 841ABE4
-	.incbin "data/maps/Route133/map.bin"
-
-	.align 2
-Route133_MapAttributes: @ 841C4E4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route133_MapBorder
-	.4byte Route133_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-Route134_MapBorder: @ 841C4FC
-	.incbin "data/maps/Route134/border.bin"
-
-	.align 2
-Route134_MapBlockdata: @ 841C504
-	.incbin "data/maps/Route134/map.bin"
-
-	.align 2
-Route134_MapAttributes: @ 841DE04
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route134_MapBorder
-	.4byte Route134_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-Underwater2_MapBorder: @ 841DE1C
-	.incbin "data/maps/Underwater2/border.bin"
-
-	.align 2
-Underwater2_MapBlockdata: @ 841DE24
-	.incbin "data/maps/Underwater2/map.bin"
-
-	.align 2
-Underwater2_MapAttributes: @ 8421024
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Underwater2_MapBorder
-	.4byte Underwater2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-	.align 2
-Underwater3_MapBorder: @ 842103C
-	.incbin "data/maps/Underwater3/border.bin"
-
-	.align 2
-Underwater3_MapBlockdata: @ 8421044
-	.incbin "data/maps/Underwater3/map.bin"
-
-	.align 2
-Underwater3_MapAttributes: @ 8424244
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Underwater3_MapBorder
-	.4byte Underwater3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-	.align 2
-Underwater4_MapBorder: @ 842425C
-	.incbin "data/maps/Underwater4/border.bin"
-
-	.align 2
-Underwater4_MapBlockdata: @ 8424264
-	.incbin "data/maps/Underwater4/map.bin"
-
-	.align 2
-Underwater4_MapAttributes: @ 84267E4
-	.4byte 0x78
-	.4byte 0x28
-	.4byte Underwater4_MapBorder
-	.4byte Underwater4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-	.align 2
-LittlerootTown_BrendansHouse_1F_MapBorder: @ 84267FC
-	.incbin "data/maps/LittlerootTown_BrendansHouse_1F/border.bin"
-
-	.align 2
-LittlerootTown_BrendansHouse_1F_MapBlockdata: @ 8426804
-	.incbin "data/maps/LittlerootTown_BrendansHouse_1F/map.bin"
-
-	.align 2
-LittlerootTown_BrendansHouse_1F_MapAttributes: @ 84268CC
-	.4byte 0xb
-	.4byte 0x9
-	.4byte LittlerootTown_BrendansHouse_1F_MapBorder
-	.4byte LittlerootTown_BrendansHouse_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
-	.align 2
-LittlerootTown_BrendansHouse_2F_MapBorder: @ 84268E4
-	.incbin "data/maps/LittlerootTown_BrendansHouse_2F/border.bin"
-
-	.align 2
-LittlerootTown_BrendansHouse_2F_MapBlockdata: @ 84268EC
-	.incbin "data/maps/LittlerootTown_BrendansHouse_2F/map.bin"
-
-	.align 2
-LittlerootTown_BrendansHouse_2F_MapAttributes: @ 842697C
-	.4byte 0x9
-	.4byte 0x8
-	.4byte LittlerootTown_BrendansHouse_2F_MapBorder
-	.4byte LittlerootTown_BrendansHouse_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
-	.align 2
-LittlerootTown_MaysHouse_1F_MapBorder: @ 8426994
-	.incbin "data/maps/LittlerootTown_MaysHouse_1F/border.bin"
-
-	.align 2
-LittlerootTown_MaysHouse_1F_MapBlockdata: @ 842699C
-	.incbin "data/maps/LittlerootTown_MaysHouse_1F/map.bin"
-
-	.align 2
-LittlerootTown_MaysHouse_1F_MapAttributes: @ 8426A64
-	.4byte 0xb
-	.4byte 0x9
-	.4byte LittlerootTown_MaysHouse_1F_MapBorder
-	.4byte LittlerootTown_MaysHouse_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
-	.align 2
-LittlerootTown_MaysHouse_2F_MapBorder: @ 8426A7C
-	.incbin "data/maps/LittlerootTown_MaysHouse_2F/border.bin"
-
-	.align 2
-LittlerootTown_MaysHouse_2F_MapBlockdata: @ 8426A84
-	.incbin "data/maps/LittlerootTown_MaysHouse_2F/map.bin"
-
-	.align 2
-LittlerootTown_MaysHouse_2F_MapAttributes: @ 8426B14
-	.4byte 0x9
-	.4byte 0x8
-	.4byte LittlerootTown_MaysHouse_2F_MapBorder
-	.4byte LittlerootTown_MaysHouse_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
-	.align 2
-LittlerootTown_ProfessorBirchsLab_MapBorder: @ 8426B2C
-	.incbin "data/maps/LittlerootTown_ProfessorBirchsLab/border.bin"
-
-	.align 2
-LittlerootTown_ProfessorBirchsLab_MapBlockdata: @ 8426B34
-	.incbin "data/maps/LittlerootTown_ProfessorBirchsLab/map.bin"
-
-	.align 2
-LittlerootTown_ProfessorBirchsLab_MapAttributes: @ 8426C88
-	.4byte 0xd
-	.4byte 0xd
-	.4byte LittlerootTown_ProfessorBirchsLab_MapBorder
-	.4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
-	.align 2
-OldaleTown_House1_MapBorder: @ 8426CA0
-	.incbin "data/maps/OldaleTown_House1/border.bin"
-
-	.align 2
-OldaleTown_House1_MapBlockdata: @ 8426CA8
-	.incbin "data/maps/OldaleTown_House1/map.bin"
-
-	.align 2
-FallarborTown_House1_MapAttributes: @ 8426D5C
-LilycoveCity_House1_MapAttributes: @ 8426D5C
-LilycoveCity_House4_MapAttributes: @ 8426D5C
-MauvilleCity_House2_MapAttributes: @ 8426D5C
-MossdeepCity_House2_MapAttributes: @ 8426D5C
-OldaleTown_House1_MapAttributes: @ 8426D5C
-PetalburgCity_House1_MapAttributes: @ 8426D5C
-Route119_House_MapAttributes: @ 8426D5C
-VerdanturfTown_House_MapAttributes: @ 8426D5C
-	.4byte 0xa
-	.4byte 0x9
-	.4byte OldaleTown_House1_MapBorder
-	.4byte OldaleTown_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-OldaleTown_House2_MapBorder: @ 8426D74
-	.incbin "data/maps/OldaleTown_House2/border.bin"
-
-	.align 2
-OldaleTown_House2_MapBlockdata: @ 8426D7C
-	.incbin "data/maps/OldaleTown_House2/map.bin"
-
-	.align 2
-FallarborTown_House2_MapAttributes: @ 8426E2C
-LilycoveCity_House3_MapAttributes: @ 8426E2C
-LilycoveCity_MoveDeletersHouse_MapAttributes: @ 8426E2C
-MauvilleCity_House1_MapAttributes: @ 8426E2C
-MossdeepCity_House1_MapAttributes: @ 8426E2C
-MossdeepCity_House3_MapAttributes: @ 8426E2C
-OldaleTown_House2_MapAttributes: @ 8426E2C
-PetalburgCity_WallysHouse_MapAttributes: @ 8426E2C
-Route111_WinstrateFamilysHouse_MapAttributes: @ 8426E2C
-Route123_BerryMastersHouse_MapAttributes: @ 8426E2C
-SlateportCity_House2_MapAttributes: @ 8426E2C
-VerdanturfTown_FriendshipRatersHouse_MapAttributes: @ 8426E2C
-	.4byte 0xb
-	.4byte 0x8
-	.4byte OldaleTown_House2_MapBorder
-	.4byte OldaleTown_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-OldaleTown_PokemonCenter_1F_MapBorder: @ 8426E44
-	.incbin "data/maps/OldaleTown_PokemonCenter_1F/border.bin"
-
-	.align 2
-OldaleTown_PokemonCenter_1F_MapBlockdata: @ 8426E4C
-	.incbin "data/maps/OldaleTown_PokemonCenter_1F/map.bin"
-
-	.align 2
-BattleFrontier_PokemonCenter_1F_MapAttributes: @ 8426F48
-DewfordTown_PokemonCenter_1F_MapAttributes: @ 8426F48
-EverGrandeCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-FallarborTown_PokemonCenter_1F_MapAttributes: @ 8426F48
-FortreeCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-LilycoveCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-MauvilleCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-MossdeepCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-OldaleTown_PokemonCenter_1F_MapAttributes: @ 8426F48
-PacifidlogTown_PokemonCenter_1F_MapAttributes: @ 8426F48
-PetalburgCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-RustboroCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-SlateportCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-SootopolisCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-VerdanturfTown_PokemonCenter_1F_MapAttributes: @ 8426F48
-	.4byte 0xe
-	.4byte 0x9
-	.4byte OldaleTown_PokemonCenter_1F_MapBorder
-	.4byte OldaleTown_PokemonCenter_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
-	.align 2
-OldaleTown_PokemonCenter_2F_MapBorder: @ 8426F60
-	.incbin "data/maps/OldaleTown_PokemonCenter_2F/border.bin"
-
-	.align 2
-OldaleTown_PokemonCenter_2F_MapBlockdata: @ 8426F68
-	.incbin "data/maps/OldaleTown_PokemonCenter_2F/map.bin"
-
-	.align 2
-BattleFrontier_PokemonCenter_2F_MapAttributes: @ 8427080
-DewfordTown_PokemonCenter_2F_MapAttributes: @ 8427080
-EverGrandeCity_PokemonCenter_2F_MapAttributes: @ 8427080
-EverGrandeCity_PokemonLeague_2F_MapAttributes: @ 8427080
-FallarborTown_PokemonCenter_2F_MapAttributes: @ 8427080
-FortreeCity_PokemonCenter_2F_MapAttributes: @ 8427080
-LavaridgeTown_PokemonCenter_2F_MapAttributes: @ 8427080
-LilycoveCity_PokemonCenter_2F_MapAttributes: @ 8427080
-MauvilleCity_PokemonCenter_2F_MapAttributes: @ 8427080
-MossdeepCity_PokemonCenter_2F_MapAttributes: @ 8427080
-OldaleTown_PokemonCenter_2F_MapAttributes: @ 8427080
-PacifidlogTown_PokemonCenter_2F_MapAttributes: @ 8427080
-PetalburgCity_PokemonCenter_2F_MapAttributes: @ 8427080
-RustboroCity_PokemonCenter_2F_MapAttributes: @ 8427080
-SlateportCity_PokemonCenter_2F_MapAttributes: @ 8427080
-SootopolisCity_PokemonCenter_2F_MapAttributes: @ 8427080
-VerdanturfTown_PokemonCenter_2F_MapAttributes: @ 8427080
-	.4byte 0xe
-	.4byte 0xa
-	.4byte OldaleTown_PokemonCenter_2F_MapBorder
-	.4byte OldaleTown_PokemonCenter_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
-	.align 2
-OldaleTown_Mart_MapBorder: @ 8427098
-	.incbin "data/maps/OldaleTown_Mart/border.bin"
-
-	.align 2
-OldaleTown_Mart_MapBlockdata: @ 84270A0
-	.incbin "data/maps/OldaleTown_Mart/map.bin"
-
-	.align 2
-BattleFrontier_Mart_MapAttributes: @ 8427150
-FallarborTown_Mart_MapAttributes: @ 8427150
-FortreeCity_Mart_MapAttributes: @ 8427150
-LavaridgeTown_Mart_MapAttributes: @ 8427150
-LilycoveCity_UnusedMart_MapAttributes: @ 8427150
-MauvilleCity_Mart_MapAttributes: @ 8427150
-MossdeepCity_Mart_MapAttributes: @ 8427150
-OldaleTown_Mart_MapAttributes: @ 8427150
-PetalburgCity_Mart_MapAttributes: @ 8427150
-RustboroCity_Mart_MapAttributes: @ 8427150
-SlateportCity_Mart_MapAttributes: @ 8427150
-SootopolisCity_Mart_MapAttributes: @ 8427150
-VerdanturfTown_Mart_MapAttributes: @ 8427150
-	.4byte 0xb
-	.4byte 0x8
-	.4byte OldaleTown_Mart_MapBorder
-	.4byte OldaleTown_Mart_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-	.align 2
-DewfordTown_House1_MapBorder: @ 8427168
-	.incbin "data/maps/DewfordTown_House1/border.bin"
-
-	.align 2
-DewfordTown_House1_MapBlockdata: @ 8427170
-	.incbin "data/maps/DewfordTown_House1/map.bin"
-
-	.align 2
-DewfordTown_House1_MapAttributes: @ 8427210
-LavaridgeTown_House_MapAttributes: @ 8427210
-Route111_OldLadysRestStop_MapAttributes: @ 8427210
-	.4byte 0xa
-	.4byte 0x8
-	.4byte DewfordTown_House1_MapBorder
-	.4byte DewfordTown_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-DewfordTown_Gym_MapBorder: @ 8427228
-	.incbin "data/maps/DewfordTown_Gym/border.bin"
-
-	.align 2
-DewfordTown_Gym_MapBlockdata: @ 8427230
-	.incbin "data/maps/DewfordTown_Gym/map.bin"
-
-	.align 2
-DewfordTown_Gym_MapAttributes: @ 8427620
-	.4byte 0x12
-	.4byte 0x1c
-	.4byte DewfordTown_Gym_MapBorder
-	.4byte DewfordTown_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_DewfordGym
-
-	.align 2
-DewfordTown_Hall_MapBorder: @ 8427638
-	.incbin "data/maps/DewfordTown_Hall/border.bin"
-
-	.align 2
-DewfordTown_Hall_MapBlockdata: @ 8427640
-	.incbin "data/maps/DewfordTown_Hall/map.bin"
-
-	.align 2
-DewfordTown_Hall_MapAttributes: @ 8427774
-	.4byte 0x11
-	.4byte 0x9
-	.4byte DewfordTown_Hall_MapBorder
-	.4byte DewfordTown_Hall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-DewfordTown_House2_MapBorder: @ 842778C
-	.incbin "data/maps/DewfordTown_House2/border.bin"
-
-	.align 2
-DewfordTown_House2_MapBlockdata: @ 8427794
-	.incbin "data/maps/DewfordTown_House2/map.bin"
-
-	.align 2
-DewfordTown_House2_MapAttributes: @ 8427848
-Route113_GlassWorkshop_MapAttributes: @ 8427848
-	.4byte 0xa
-	.4byte 0x9
-	.4byte DewfordTown_House2_MapBorder
-	.4byte DewfordTown_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-LavaridgeTown_HerbShop_MapBorder: @ 8427860
-	.incbin "data/maps/LavaridgeTown_HerbShop/border.bin"
-
-	.align 2
-LavaridgeTown_HerbShop_MapBlockdata: @ 8427868
-	.incbin "data/maps/LavaridgeTown_HerbShop/map.bin"
-
-	.align 2
-LavaridgeTown_HerbShop_MapAttributes: @ 8427918
-	.4byte 0xb
-	.4byte 0x8
-	.4byte LavaridgeTown_HerbShop_MapBorder
-	.4byte LavaridgeTown_HerbShop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-	.align 2
-LavaridgeTown_Gym_1F_MapBorder: @ 8427930
-	.incbin "data/maps/LavaridgeTown_Gym_1F/border.bin"
-
-	.align 2
-LavaridgeTown_Gym_1F_MapBlockdata: @ 8427938
-	.incbin "data/maps/LavaridgeTown_Gym_1F/map.bin"
-
-	.align 2
-LavaridgeTown_Gym_1F_MapAttributes: @ 8427BC0
-	.4byte 0x11
-	.4byte 0x13
-	.4byte LavaridgeTown_Gym_1F_MapBorder
-	.4byte LavaridgeTown_Gym_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LavaridgeGym
-
-	.align 2
-LavaridgeTown_Gym_B1F_MapBorder: @ 8427BD8
-	.incbin "data/maps/LavaridgeTown_Gym_B1F/border.bin"
-
-	.align 2
-LavaridgeTown_Gym_B1F_MapBlockdata: @ 8427BE0
-	.incbin "data/maps/LavaridgeTown_Gym_B1F/map.bin"
-
-	.align 2
-LavaridgeTown_Gym_B1F_MapAttributes: @ 8427E68
-	.4byte 0x11
-	.4byte 0x13
-	.4byte LavaridgeTown_Gym_B1F_MapBorder
-	.4byte LavaridgeTown_Gym_B1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LavaridgeGym
-
-	.align 2
-LavaridgeTown_PokemonCenter_1F_MapBorder: @ 8427E80
-	.incbin "data/maps/LavaridgeTown_PokemonCenter_1F/border.bin"
-
-	.align 2
-LavaridgeTown_PokemonCenter_1F_MapBlockdata: @ 8427E88
-	.incbin "data/maps/LavaridgeTown_PokemonCenter_1F/map.bin"
-
-	.align 2
-LavaridgeTown_PokemonCenter_1F_MapAttributes: @ 8427F84
-	.4byte 0xe
-	.4byte 0x9
-	.4byte LavaridgeTown_PokemonCenter_1F_MapBorder
-	.4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
-	.align 2
-FallarborTown_LeftoverRSContestLobby_MapBorder: @ 8427F9C
-	.incbin "data/maps/FallarborTown_LeftoverRSContestLobby/border.bin"
-
-	.align 2
-FallarborTown_LeftoverRSContestLobby_MapBlockdata: @ 8427FA4
-	.incbin "data/maps/FallarborTown_LeftoverRSContestLobby/map.bin"
-
-	.align 2
-FallarborTown_LeftoverRSContestLobby_MapAttributes: @ 8428078
-	.4byte 0xf
-	.4byte 0x7
-	.4byte FallarborTown_LeftoverRSContestLobby_MapBorder
-	.4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-	.align 2
-FallarborTown_LeftoverRSContestHall_MapBorder: @ 8428090
-	.incbin "data/maps/FallarborTown_LeftoverRSContestHall/border.bin"
-
-	.align 2
-FallarborTown_LeftoverRSContestHall_MapBlockdata: @ 8428098
-	.incbin "data/maps/FallarborTown_LeftoverRSContestHall/map.bin"
-
-	.align 2
-FallarborTown_LeftoverRSContestHall_MapAttributes: @ 842838C
-	.4byte 0x15
-	.4byte 0x12
-	.4byte FallarborTown_LeftoverRSContestHall_MapBorder
-	.4byte FallarborTown_LeftoverRSContestHall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-	.align 2
-LilycoveCity_House2_MapBorder: @ 84283A4
-	.incbin "data/maps/LilycoveCity_House2/border.bin"
-
-	.align 2
-LilycoveCity_House2_MapBlockdata: @ 84283AC
-	.incbin "data/maps/LilycoveCity_House2/map.bin"
-
-	.align 2
-LilycoveCity_House2_MapAttributes: @ 842842C
-	.4byte 0x8
-	.4byte 0x8
-	.4byte LilycoveCity_House2_MapBorder
-	.4byte LilycoveCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-UnknownMapBorder_08428450: @ 8428444
-	.incbin "data/maps/UnknownMap_08428450/border.bin"
-
-	.align 2
-UnknownMapBlockdata_08428450: @ 842844C
-	.incbin "data/maps/UnknownMap_08428450/map.bin"
-
-	.align 2
-UnknownMapAttributes_08428450: @ 8428450
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_08428450
-	.4byte UnknownMapBlockdata_08428450
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-	.align 2
-VerdanturfTown_WandasHouse_MapBorder: @ 8428468
-	.incbin "data/maps/VerdanturfTown_WandasHouse/border.bin"
-
-	.align 2
-VerdanturfTown_WandasHouse_MapBlockdata: @ 8428470
-	.incbin "data/maps/VerdanturfTown_WandasHouse/map.bin"
-
-	.align 2
-VerdanturfTown_WandasHouse_MapAttributes: @ 8428580
-	.4byte 0x11
-	.4byte 0x8
-	.4byte VerdanturfTown_WandasHouse_MapBorder
-	.4byte VerdanturfTown_WandasHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-PacifidlogTown_House1_MapBorder: @ 8428598
-	.incbin "data/maps/PacifidlogTown_House1/border.bin"
-
-	.align 2
-PacifidlogTown_House1_MapBlockdata: @ 84285A0
-	.incbin "data/maps/PacifidlogTown_House1/map.bin"
-
-	.align 2
-PacifidlogTown_House1_MapAttributes: @ 8428654
-PacifidlogTown_House3_MapAttributes: @ 8428654
-PacifidlogTown_House5_MapAttributes: @ 8428654
-	.4byte 0xa
-	.4byte 0x9
-	.4byte PacifidlogTown_House1_MapBorder
-	.4byte PacifidlogTown_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-PacifidlogTown_House2_MapBorder: @ 842866C
-	.incbin "data/maps/PacifidlogTown_House2/border.bin"
-
-	.align 2
-PacifidlogTown_House2_MapBlockdata: @ 8428674
-	.incbin "data/maps/PacifidlogTown_House2/map.bin"
-
-	.align 2
-PacifidlogTown_House2_MapAttributes: @ 8428728
-PacifidlogTown_House4_MapAttributes: @ 8428728
-	.4byte 0xa
-	.4byte 0x9
-	.4byte PacifidlogTown_House2_MapBorder
-	.4byte PacifidlogTown_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-PetalburgCity_Gym_MapBorder: @ 8428740
-	.incbin "data/maps/PetalburgCity_Gym/border.bin"
-
-	.align 2
-PetalburgCity_Gym_MapBlockdata: @ 8428748
-	.incbin "data/maps/PetalburgCity_Gym/map.bin"
-
-	.align 2
-PetalburgCity_Gym_MapAttributes: @ 8428F28
-	.4byte 0x9
-	.4byte 0x70
-	.4byte PetalburgCity_Gym_MapBorder
-	.4byte PetalburgCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PetalburgGym
-
-	.align 2
-PetalburgCity_House2_MapBorder: @ 8428F40
-	.incbin "data/maps/PetalburgCity_House2/border.bin"
-
-	.align 2
-PetalburgCity_House2_MapBlockdata: @ 8428F48
-	.incbin "data/maps/PetalburgCity_House2/map.bin"
-
-	.align 2
-MossdeepCity_House4_MapAttributes: @ 8428FE8
-PetalburgCity_House2_MapAttributes: @ 8428FE8
-SlateportCity_House1_MapAttributes: @ 8428FE8
-	.4byte 0xa
-	.4byte 0x8
-	.4byte PetalburgCity_House2_MapBorder
-	.4byte PetalburgCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-SlateportCity_SternsShipyard_1F_MapBorder: @ 8429000
-	.incbin "data/maps/SlateportCity_SternsShipyard_1F/border.bin"
-
-	.align 2
-SlateportCity_SternsShipyard_1F_MapBlockdata: @ 8429008
-	.incbin "data/maps/SlateportCity_SternsShipyard_1F/map.bin"
-
-	.align 2
-SlateportCity_SternsShipyard_1F_MapAttributes: @ 8429280
-	.4byte 0x15
-	.4byte 0xf
-	.4byte SlateportCity_SternsShipyard_1F_MapBorder
-	.4byte SlateportCity_SternsShipyard_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-SlateportCity_SternsShipyard_2F_MapBorder: @ 8429298
-	.incbin "data/maps/SlateportCity_SternsShipyard_2F/border.bin"
-
-	.align 2
-SlateportCity_SternsShipyard_2F_MapBlockdata: @ 84292A0
-	.incbin "data/maps/SlateportCity_SternsShipyard_2F/map.bin"
-
-	.align 2
-SlateportCity_SternsShipyard_2F_MapAttributes: @ 84294A0
-	.4byte 0x11
-	.4byte 0xf
-	.4byte SlateportCity_SternsShipyard_2F_MapBorder
-	.4byte SlateportCity_SternsShipyard_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-UnknownMapBorder_084294C4: @ 84294B8
-	.incbin "data/maps/UnknownMap_084294C4/border.bin"
-
-	.align 2
-UnknownMapBlockdata_084294C4: @ 84294C0
-	.incbin "data/maps/UnknownMap_084294C4/map.bin"
-
-	.align 2
-UnknownMapAttributes_084294C4: @ 84294C4
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_084294C4
-	.4byte UnknownMapBlockdata_084294C4
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-	.align 2
-UnknownMapBorder_084294E8: @ 84294DC
-	.incbin "data/maps/UnknownMap_084294E8/border.bin"
-
-	.align 2
-UnknownMapBlockdata_084294E8: @ 84294E4
-	.incbin "data/maps/UnknownMap_084294E8/map.bin"
-
-	.align 2
-UnknownMapAttributes_084294E8: @ 84294E8
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_084294E8
-	.4byte UnknownMapBlockdata_084294E8
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-	.align 2
-SlateportCity_PokemonFanClub_MapBorder: @ 8429500
-	.incbin "data/maps/SlateportCity_PokemonFanClub/border.bin"
-
-	.align 2
-SlateportCity_PokemonFanClub_MapBlockdata: @ 8429508
-	.incbin "data/maps/SlateportCity_PokemonFanClub/map.bin"
-
-	.align 2
-SlateportCity_PokemonFanClub_MapAttributes: @ 842963C
-	.4byte 0xe
-	.4byte 0xb
-	.4byte SlateportCity_PokemonFanClub_MapBorder
-	.4byte SlateportCity_PokemonFanClub_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonFanClub
-
-	.align 2
-SlateportCity_OceanicMuseum_1F_MapBorder: @ 8429654
-	.incbin "data/maps/SlateportCity_OceanicMuseum_1F/border.bin"
-
-	.align 2
-SlateportCity_OceanicMuseum_1F_MapBlockdata: @ 842965C
-	.incbin "data/maps/SlateportCity_OceanicMuseum_1F/map.bin"
-
-	.align 2
-SlateportCity_OceanicMuseum_1F_MapAttributes: @ 84297C4
-	.4byte 0x14
-	.4byte 0x9
-	.4byte SlateportCity_OceanicMuseum_1F_MapBorder
-	.4byte SlateportCity_OceanicMuseum_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_OceanicMuseum
-
-	.align 2
-SlateportCity_OceanicMuseum_2F_MapBorder: @ 84297DC
-	.incbin "data/maps/SlateportCity_OceanicMuseum_2F/border.bin"
-
-	.align 2
-SlateportCity_OceanicMuseum_2F_MapBlockdata: @ 84297E4
-	.incbin "data/maps/SlateportCity_OceanicMuseum_2F/map.bin"
-
-	.align 2
-SlateportCity_OceanicMuseum_2F_MapAttributes: @ 842994C
-	.4byte 0x14
-	.4byte 0x9
-	.4byte SlateportCity_OceanicMuseum_2F_MapBorder
-	.4byte SlateportCity_OceanicMuseum_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_OceanicMuseum
-
-	.align 2
-SlateportCity_Harbor_MapBorder: @ 8429964
-	.incbin "data/maps/SlateportCity_Harbor/border.bin"
-
-	.align 2
-SlateportCity_Harbor_MapBlockdata: @ 842996C
-	.incbin "data/maps/SlateportCity_Harbor/map.bin"
-
-	.align 2
-LilycoveCity_Harbor_MapAttributes: @ 8429C3C
-SlateportCity_Harbor_MapAttributes: @ 8429C3C
-	.4byte 0x18
-	.4byte 0xf
-	.4byte SlateportCity_Harbor_MapBorder
-	.4byte SlateportCity_Harbor_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-MauvilleCity_Gym_MapBorder: @ 8429C54
-	.incbin "data/maps/MauvilleCity_Gym/border.bin"
-
-	.align 2
-MauvilleCity_Gym_MapBlockdata: @ 8429C5C
-	.incbin "data/maps/MauvilleCity_Gym/map.bin"
-
-	.align 2
-MauvilleCity_Gym_MapAttributes: @ 8429E00
-	.4byte 0xa
-	.4byte 0x15
-	.4byte MauvilleCity_Gym_MapBorder
-	.4byte MauvilleCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MauvilleGym
-
-	.align 2
-MauvilleCity_BikeShop_MapBorder: @ 8429E18
-	.incbin "data/maps/MauvilleCity_BikeShop/border.bin"
-
-	.align 2
-MauvilleCity_BikeShop_MapBlockdata: @ 8429E20
-	.incbin "data/maps/MauvilleCity_BikeShop/map.bin"
-
-	.align 2
-MauvilleCity_BikeShop_MapAttributes: @ 8429EF8
-	.4byte 0xc
-	.4byte 0x9
-	.4byte MauvilleCity_BikeShop_MapBorder
-	.4byte MauvilleCity_BikeShop_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BikeShop
-
-	.align 2
-MauvilleCity_GameCorner_MapBorder: @ 8429F10
-	.incbin "data/maps/MauvilleCity_GameCorner/border.bin"
-
-	.align 2
-MauvilleCity_GameCorner_MapBlockdata: @ 8429F18
-	.incbin "data/maps/MauvilleCity_GameCorner/map.bin"
-
-	.align 2
-MauvilleCity_GameCorner_MapAttributes: @ 842A0FC
-	.4byte 0x16
-	.4byte 0xb
-	.4byte MauvilleCity_GameCorner_MapBorder
-	.4byte MauvilleCity_GameCorner_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MauvilleGameCorner
-
-	.align 2
-RustboroCity_DevonCorp_1F_MapBorder: @ 842A114
-	.incbin "data/maps/RustboroCity_DevonCorp_1F/border.bin"
-
-	.align 2
-RustboroCity_DevonCorp_1F_MapBlockdata: @ 842A11C
-	.incbin "data/maps/RustboroCity_DevonCorp_1F/map.bin"
-
-	.align 2
-RustboroCity_DevonCorp_1F_MapAttributes: @ 842A274
-	.4byte 0x13
-	.4byte 0x9
-	.4byte RustboroCity_DevonCorp_1F_MapBorder
-	.4byte RustboroCity_DevonCorp_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Facility
-
-	.align 2
-RustboroCity_DevonCorp_2F_MapBorder: @ 842A28C
-	.incbin "data/maps/RustboroCity_DevonCorp_2F/border.bin"
-
-	.align 2
-RustboroCity_DevonCorp_2F_MapBlockdata: @ 842A294
-	.incbin "data/maps/RustboroCity_DevonCorp_2F/map.bin"
-
-	.align 2
-RustboroCity_DevonCorp_2F_MapAttributes: @ 842A3EC
-	.4byte 0x13
-	.4byte 0x9
-	.4byte RustboroCity_DevonCorp_2F_MapBorder
-	.4byte RustboroCity_DevonCorp_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-RustboroCity_Gym_MapBorder: @ 842A404
-	.incbin "data/maps/RustboroCity_Gym/border.bin"
-
-	.align 2
-RustboroCity_Gym_MapBlockdata: @ 842A40C
-	.incbin "data/maps/RustboroCity_Gym/map.bin"
-
-	.align 2
-RustboroCity_Gym_MapAttributes: @ 842A5C4
-	.4byte 0xb
-	.4byte 0x14
-	.4byte RustboroCity_Gym_MapBorder
-	.4byte RustboroCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_RustboroGym
-
-	.align 2
-RustboroCity_PokemonSchool_MapBorder: @ 842A5DC
-	.incbin "data/maps/RustboroCity_PokemonSchool/border.bin"
-
-	.align 2
-RustboroCity_PokemonSchool_MapBlockdata: @ 842A5E4
-	.incbin "data/maps/RustboroCity_PokemonSchool/map.bin"
-
-	.align 2
-RustboroCity_PokemonSchool_MapAttributes: @ 842A6EC
-	.4byte 0xc
-	.4byte 0xb
-	.4byte RustboroCity_PokemonSchool_MapBorder
-	.4byte RustboroCity_PokemonSchool_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonSchool
-
-	.align 2
-RustboroCity_House2_MapBorder: @ 842A704
-	.incbin "data/maps/RustboroCity_House2/border.bin"
-
-	.align 2
-RustboroCity_House2_MapBlockdata: @ 842A70C
-	.incbin "data/maps/RustboroCity_House2/map.bin"
-
-	.align 2
-RustboroCity_House2_MapAttributes: @ 842A7E4
-RustboroCity_House3_MapAttributes: @ 842A7E4
-	.4byte 0xc
-	.4byte 0x9
-	.4byte RustboroCity_House2_MapBorder
-	.4byte RustboroCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-RustboroCity_House1_MapBorder: @ 842A7FC
-	.incbin "data/maps/RustboroCity_House1/border.bin"
-
-	.align 2
-RustboroCity_House1_MapBlockdata: @ 842A804
-	.incbin "data/maps/RustboroCity_House1/map.bin"
-
-	.align 2
-RustboroCity_House1_MapAttributes: @ 842A8D4
-	.4byte 0xd
-	.4byte 0x8
-	.4byte RustboroCity_House1_MapBorder
-	.4byte RustboroCity_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-RustboroCity_CuttersHouse_MapBorder: @ 842A8EC
-	.incbin "data/maps/RustboroCity_CuttersHouse/border.bin"
-
-	.align 2
-RustboroCity_CuttersHouse_MapBlockdata: @ 842A8F4
-	.incbin "data/maps/RustboroCity_CuttersHouse/map.bin"
-
-	.align 2
-RustboroCity_CuttersHouse_MapAttributes: @ 842A9BC
-	.4byte 0xb
-	.4byte 0x9
-	.4byte RustboroCity_CuttersHouse_MapBorder
-	.4byte RustboroCity_CuttersHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-FortreeCity_House1_MapBorder: @ 842A9D4
-	.incbin "data/maps/FortreeCity_House1/border.bin"
-
-	.align 2
-FortreeCity_House1_MapBlockdata: @ 842A9DC
-	.incbin "data/maps/FortreeCity_House1/map.bin"
-
-	.align 2
-FortreeCity_House1_MapAttributes: @ 842AA3C
-FortreeCity_House3_MapAttributes: @ 842AA3C
-FortreeCity_House5_MapAttributes: @ 842AA3C
-	.4byte 0x8
-	.4byte 0x6
-	.4byte FortreeCity_House1_MapBorder
-	.4byte FortreeCity_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-FortreeCity_Gym_MapBorder: @ 842AA54
-	.incbin "data/maps/FortreeCity_Gym/border.bin"
-
-	.align 2
-FortreeCity_Gym_MapBlockdata: @ 842AA5C
-	.incbin "data/maps/FortreeCity_Gym/map.bin"
-
-	.align 2
-FortreeCity_Gym_MapAttributes: @ 842AE44
-	.4byte 0x14
-	.4byte 0x19
-	.4byte FortreeCity_Gym_MapBorder
-	.4byte FortreeCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_FortreeGym
-
-	.align 2
-FortreeCity_House2_MapBorder: @ 842AE5C
-	.incbin "data/maps/FortreeCity_House2/border.bin"
-
-	.align 2
-FortreeCity_House2_MapBlockdata: @ 842AE64
-	.incbin "data/maps/FortreeCity_House2/map.bin"
-
-	.align 2
-FortreeCity_House2_MapAttributes: @ 842AEC4
-FortreeCity_House4_MapAttributes: @ 842AEC4
-	.4byte 0x8
-	.4byte 0x6
-	.4byte FortreeCity_House2_MapBorder
-	.4byte FortreeCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-Route104_MrBrineysHouse_MapBorder: @ 842AEDC
-	.incbin "data/maps/Route104_MrBrineysHouse/border.bin"
-
-	.align 2
-Route104_MrBrineysHouse_MapBlockdata: @ 842AEE4
-	.incbin "data/maps/Route104_MrBrineysHouse/map.bin"
-
-	.align 2
-Route104_MrBrineysHouse_MapAttributes: @ 842AFBC
-	.4byte 0xc
-	.4byte 0x9
-	.4byte Route104_MrBrineysHouse_MapBorder
-	.4byte Route104_MrBrineysHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-LilycoveCity_LilycoveMuseum_1F_MapBorder: @ 842AFD4
-	.incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin"
-
-	.align 2
-LilycoveCity_LilycoveMuseum_1F_MapBlockdata: @ 842AFDC
-	.incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin"
-
-	.align 2
-LilycoveCity_LilycoveMuseum_1F_MapAttributes: @ 842B228
-	.4byte 0x15
-	.4byte 0xe
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapBorder
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LilycoveMuseum
-
-	.align 2
-LilycoveCity_LilycoveMuseum_2F_MapBorder: @ 842B240
-	.incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin"
-
-	.align 2
-LilycoveCity_LilycoveMuseum_2F_MapBlockdata: @ 842B248
-	.incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin"
-
-	.align 2
-LilycoveCity_LilycoveMuseum_2F_MapAttributes: @ 842B484
-	.4byte 0x16
-	.4byte 0xd
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapBorder
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LilycoveMuseum
-
-	.align 2
-LilycoveCity_ContestLobby_MapBorder: @ 842B49C
-	.incbin "data/maps/LilycoveCity_ContestLobby/border.bin"
-
-	.align 2
-LilycoveCity_ContestLobby_MapBlockdata: @ 842B4A4
-	.incbin "data/maps/LilycoveCity_ContestLobby/map.bin"
-
-	.align 2
-LilycoveCity_ContestLobby_MapAttributes: @ 842B78C
-	.4byte 0x1f
-	.4byte 0xc
-	.4byte LilycoveCity_ContestLobby_MapBorder
-	.4byte LilycoveCity_ContestLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-	.align 2
-LilycoveCity_ContestHall_MapBorder: @ 842B7A4
-	.incbin "data/maps/LilycoveCity_ContestHall/border.bin"
-
-	.align 2
-LilycoveCity_ContestHall_MapBlockdata: @ 842B7AC
-	.incbin "data/maps/LilycoveCity_ContestHall/map.bin"
-
-	.align 2
-LilycoveCity_ContestHall_MapAttributes: @ 842C4D4
-	.4byte 0x33
-	.4byte 0x21
-	.4byte LilycoveCity_ContestHall_MapBorder
-	.4byte LilycoveCity_ContestHall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-	.align 2
-LilycoveCity_PokemonTrainerFanClub_MapBorder: @ 842C4EC
-	.incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin"
-
-	.align 2
-LilycoveCity_PokemonTrainerFanClub_MapBlockdata: @ 842C4F4
-	.incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin"
-
-	.align 2
-LilycoveCity_PokemonTrainerFanClub_MapAttributes: @ 842C644
-	.4byte 0xc
-	.4byte 0xe
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapBorder
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-MossdeepCity_Gym_MapBorder: @ 842C65C
-	.incbin "data/maps/MossdeepCity_Gym/border.bin"
-
-	.align 2
-MossdeepCity_Gym_MapBlockdata: @ 842C664
-	.incbin "data/maps/MossdeepCity_Gym/map.bin"
-
-	.align 2
-MossdeepCity_Gym_MapAttributes: @ 842CDB4
-	.4byte 0x1a
-	.4byte 0x24
-	.4byte MossdeepCity_Gym_MapBorder
-	.4byte MossdeepCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MossdeepGym
-
-	.align 2
-SootopolisCity_Gym_1F_MapBorder: @ 842CDCC
-	.incbin "data/maps/SootopolisCity_Gym_1F/border.bin"
-
-	.align 2
-SootopolisCity_Gym_1F_MapBlockdata: @ 842CDD4
-	.incbin "data/maps/SootopolisCity_Gym_1F/map.bin"
-
-	.align 2
-SootopolisCity_Gym_1F_MapAttributes: @ 842D148
-	.4byte 0x11
-	.4byte 0x1a
-	.4byte SootopolisCity_Gym_1F_MapBorder
-	.4byte SootopolisCity_Gym_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_SootopolisGym
-
-	.align 2
-SootopolisCity_Gym_B1F_MapBorder: @ 842D160
-	.incbin "data/maps/SootopolisCity_Gym_B1F/border.bin"
-
-	.align 2
-SootopolisCity_Gym_B1F_MapBlockdata: @ 842D168
-	.incbin "data/maps/SootopolisCity_Gym_B1F/map.bin"
-
-	.align 2
-SootopolisCity_Gym_B1F_MapAttributes: @ 842D4DC
-	.4byte 0x11
-	.4byte 0x1a
-	.4byte SootopolisCity_Gym_B1F_MapBorder
-	.4byte SootopolisCity_Gym_B1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_SootopolisGym
-
-	.align 2
-EverGrandeCity_SidneysRoom_MapBorder: @ 842D4F4
-	.incbin "data/maps/EverGrandeCity_SidneysRoom/border.bin"
-
-	.align 2
-EverGrandeCity_SidneysRoom_MapBlockdata: @ 842D4FC
-	.incbin "data/maps/EverGrandeCity_SidneysRoom/map.bin"
-
-	.align 2
-EverGrandeCity_SidneysRoom_MapAttributes: @ 842D668
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_SidneysRoom_MapBorder
-	.4byte EverGrandeCity_SidneysRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-	.align 2
-EverGrandeCity_PhoebesRoom_MapBorder: @ 842D680
-	.incbin "data/maps/EverGrandeCity_PhoebesRoom/border.bin"
-
-	.align 2
-EverGrandeCity_PhoebesRoom_MapBlockdata: @ 842D688
-	.incbin "data/maps/EverGrandeCity_PhoebesRoom/map.bin"
-
-	.align 2
-EverGrandeCity_PhoebesRoom_MapAttributes: @ 842D7F4
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_PhoebesRoom_MapBorder
-	.4byte EverGrandeCity_PhoebesRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-	.align 2
-EverGrandeCity_GlaciasRoom_MapBorder: @ 842D80C
-	.incbin "data/maps/EverGrandeCity_GlaciasRoom/border.bin"
-
-	.align 2
-EverGrandeCity_GlaciasRoom_MapBlockdata: @ 842D814
-	.incbin "data/maps/EverGrandeCity_GlaciasRoom/map.bin"
-
-	.align 2
-EverGrandeCity_GlaciasRoom_MapAttributes: @ 842D980
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_GlaciasRoom_MapBorder
-	.4byte EverGrandeCity_GlaciasRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-	.align 2
-EverGrandeCity_DrakesRoom_MapBorder: @ 842D998
-	.incbin "data/maps/EverGrandeCity_DrakesRoom/border.bin"
-
-	.align 2
-EverGrandeCity_DrakesRoom_MapBlockdata: @ 842D9A0
-	.incbin "data/maps/EverGrandeCity_DrakesRoom/map.bin"
-
-	.align 2
-EverGrandeCity_DrakesRoom_MapAttributes: @ 842DB0C
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_DrakesRoom_MapBorder
-	.4byte EverGrandeCity_DrakesRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-	.align 2
-EverGrandeCity_ChampionsRoom_MapBorder: @ 842DB24
-	.incbin "data/maps/EverGrandeCity_ChampionsRoom/border.bin"
-
-	.align 2
-EverGrandeCity_ChampionsRoom_MapBlockdata: @ 842DB2C
-	.incbin "data/maps/EverGrandeCity_ChampionsRoom/map.bin"
-
-	.align 2
-EverGrandeCity_ChampionsRoom_MapAttributes: @ 842DC80
-	.4byte 0xd
-	.4byte 0xd
-	.4byte EverGrandeCity_ChampionsRoom_MapBorder
-	.4byte EverGrandeCity_ChampionsRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-	.align 2
-EverGrandeCity_Hall1_MapBorder: @ 842DC98
-	.incbin "data/maps/EverGrandeCity_Hall1/border.bin"
-
-	.align 2
-EverGrandeCity_Hall1_MapBlockdata: @ 842DCA0
-	.incbin "data/maps/EverGrandeCity_Hall1/map.bin"
-
-	.align 2
-EverGrandeCity_Hall1_MapAttributes: @ 842DDC0
-EverGrandeCity_Hall2_MapAttributes: @ 842DDC0
-EverGrandeCity_Hall3_MapAttributes: @ 842DDC0
-EverGrandeCity_Hall5_MapAttributes: @ 842DDC0
-	.4byte 0xb
-	.4byte 0xd
-	.4byte EverGrandeCity_Hall1_MapBorder
-	.4byte EverGrandeCity_Hall1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-	.align 2
-Route104_PrettyPetalFlowerShop_MapBorder: @ 842DDD8
-	.incbin "data/maps/Route104_PrettyPetalFlowerShop/border.bin"
-
-	.align 2
-Route104_PrettyPetalFlowerShop_MapBlockdata: @ 842DDE0
-	.incbin "data/maps/Route104_PrettyPetalFlowerShop/map.bin"
-
-	.align 2
-Route104_PrettyPetalFlowerShop_MapAttributes: @ 842DEF0
-Route104_PrototypePrettyPetalFlowerShop_MapAttributes: @ 842DEF0
-	.4byte 0xf
-	.4byte 0x9
-	.4byte Route104_PrettyPetalFlowerShop_MapBorder
-	.4byte Route104_PrettyPetalFlowerShop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PrettyPetalFlowerShop
-
-	.align 2
-Route112_CableCarStation_MapBorder: @ 842DF08
-	.incbin "data/maps/Route112_CableCarStation/border.bin"
-
-	.align 2
-Route112_CableCarStation_MapBlockdata: @ 842DF10
-	.incbin "data/maps/Route112_CableCarStation/map.bin"
-
-	.align 2
-MtChimney_CableCarStation_MapAttributes: @ 842E048
-Route112_CableCarStation_MapAttributes: @ 842E048
-	.4byte 0xd
-	.4byte 0xc
-	.4byte Route112_CableCarStation_MapBorder
-	.4byte Route112_CableCarStation_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-Route114_FossilManiacsHouse_MapBorder: @ 842E060
-	.incbin "data/maps/Route114_FossilManiacsHouse/border.bin"
-
-	.align 2
-Route114_FossilManiacsHouse_MapBlockdata: @ 842E068
-	.incbin "data/maps/Route114_FossilManiacsHouse/map.bin"
-
-	.align 2
-Route114_FossilManiacsHouse_MapAttributes: @ 842E108
-	.4byte 0xa
-	.4byte 0x8
-	.4byte Route114_FossilManiacsHouse_MapBorder
-	.4byte Route114_FossilManiacsHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-Route114_FossilManiacsTunnel_MapBorder: @ 842E120
-	.incbin "data/maps/Route114_FossilManiacsTunnel/border.bin"
-
-	.align 2
-Route114_FossilManiacsTunnel_MapBlockdata: @ 842E128
-	.incbin "data/maps/Route114_FossilManiacsTunnel/map.bin"
-
-	.align 2
-Route114_FossilManiacsTunnel_MapAttributes: @ 842E3CC
-	.4byte 0xd
-	.4byte 0x1a
-	.4byte Route114_FossilManiacsTunnel_MapBorder
-	.4byte Route114_FossilManiacsTunnel_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-	.align 2
-Route114_LanettesHouse_MapBorder: @ 842E3E4
-	.incbin "data/maps/Route114_LanettesHouse/border.bin"
-
-	.align 2
-Route114_LanettesHouse_MapBlockdata: @ 842E3EC
-	.incbin "data/maps/Route114_LanettesHouse/map.bin"
-
-	.align 2
-Route114_LanettesHouse_MapAttributes: @ 842E49C
-	.4byte 0xb
-	.4byte 0x8
-	.4byte Route114_LanettesHouse_MapBorder
-	.4byte Route114_LanettesHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
-	.align 2
-Route116_TunnelersRestHouse_MapBorder: @ 842E4B4
-	.incbin "data/maps/Route116_TunnelersRestHouse/border.bin"
-
-	.align 2
-Route116_TunnelersRestHouse_MapBlockdata: @ 842E4BC
-	.incbin "data/maps/Route116_TunnelersRestHouse/map.bin"
-
-	.align 2
-Route116_TunnelersRestHouse_MapAttributes: @ 842E570
-	.4byte 0xa
-	.4byte 0x9
-	.4byte Route116_TunnelersRestHouse_MapBorder
-	.4byte Route116_TunnelersRestHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-Route117_PokemonDayCare_MapBorder: @ 842E588
-	.incbin "data/maps/Route117_PokemonDayCare/border.bin"
-
-	.align 2
-Route117_PokemonDayCare_MapBlockdata: @ 842E590
-	.incbin "data/maps/Route117_PokemonDayCare/map.bin"
-
-	.align 2
-Route117_PokemonDayCare_MapAttributes: @ 842E668
-	.4byte 0xc
-	.4byte 0x9
-	.4byte Route117_PokemonDayCare_MapBorder
-	.4byte Route117_PokemonDayCare_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonDayCare
-
-	.align 2
-Route121_SafariZoneEntrance_MapBorder: @ 842E680
-	.incbin "data/maps/Route121_SafariZoneEntrance/border.bin"
-
-	.align 2
-Route121_SafariZoneEntrance_MapBlockdata: @ 842E688
-	.incbin "data/maps/Route121_SafariZoneEntrance/map.bin"
-
-	.align 2
-Route121_SafariZoneEntrance_MapAttributes: @ 842E880
-	.4byte 0x12
-	.4byte 0xe
-	.4byte Route121_SafariZoneEntrance_MapBorder
-	.4byte Route121_SafariZoneEntrance_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-	.align 2
-MeteorFalls_1F_1R_MapBorder: @ 842E898
-	.incbin "data/maps/MeteorFalls_1F_1R/border.bin"
-
-	.align 2
-MeteorFalls_1F_1R_MapBlockdata: @ 842E8A0
-	.incbin "data/maps/MeteorFalls_1F_1R/map.bin"
-
-	.align 2
-MeteorFalls_1F_1R_MapAttributes: @ 842F278
-	.4byte 0x1e
-	.4byte 0x2a
-	.4byte MeteorFalls_1F_1R_MapBorder
-	.4byte MeteorFalls_1F_1R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
-	.align 2
-MeteorFalls_1F_2R_MapBorder: @ 842F290
-	.incbin "data/maps/MeteorFalls_1F_2R/border.bin"
-
-	.align 2
-MeteorFalls_1F_2R_MapBlockdata: @ 842F298
-	.incbin "data/maps/MeteorFalls_1F_2R/map.bin"
-
-	.align 2
-MeteorFalls_1F_2R_MapAttributes: @ 842FA18
-	.4byte 0x1e
-	.4byte 0x20
-	.4byte MeteorFalls_1F_2R_MapBorder
-	.4byte MeteorFalls_1F_2R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
-	.align 2
-MeteorFalls_B1F_1R_MapBorder: @ 842FA30
-	.incbin "data/maps/MeteorFalls_B1F_1R/border.bin"
-
-	.align 2
-MeteorFalls_B1F_1R_MapBlockdata: @ 842FA38
-	.incbin "data/maps/MeteorFalls_B1F_1R/map.bin"
-
-	.align 2
-MeteorFalls_B1F_1R_MapAttributes: @ 84302D4
-	.4byte 0x1d
-	.4byte 0x26
-	.4byte MeteorFalls_B1F_1R_MapBorder
-	.4byte MeteorFalls_B1F_1R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
-	.align 2
-MeteorFalls_B1F_2R_MapBorder: @ 84302EC
-	.incbin "data/maps/MeteorFalls_B1F_2R/border.bin"
-
-	.align 2
-MeteorFalls_B1F_2R_MapBlockdata: @ 84302F4
-	.incbin "data/maps/MeteorFalls_B1F_2R/map.bin"
-
-	.align 2
-MeteorFalls_B1F_2R_MapAttributes: @ 8430480
-	.4byte 0xb
-	.4byte 0x12
-	.4byte MeteorFalls_B1F_2R_MapBorder
-	.4byte MeteorFalls_B1F_2R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
-	.align 2
-RusturfTunnel_MapBorder: @ 8430498
-	.incbin "data/maps/RusturfTunnel/border.bin"
-
-	.align 2
-RusturfTunnel_MapBlockdata: @ 84304A0
-	.incbin "data/maps/RusturfTunnel/map.bin"
-
-	.align 2
-RusturfTunnel_MapAttributes: @ 8430B60
-	.4byte 0x24
-	.4byte 0x18
-	.4byte RusturfTunnel_MapBorder
-	.4byte RusturfTunnel_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_RusturfTunnel
-
-	.align 2
-Underwater_SootopolisCity_MapBorder: @ 8430B78
-	.incbin "data/maps/Underwater_SootopolisCity/border.bin"
-
-	.align 2
-Underwater_SootopolisCity_MapBlockdata: @ 8430B80
-	.incbin "data/maps/Underwater_SootopolisCity/map.bin"
-
-	.align 2
-Underwater_SootopolisCity_MapAttributes: @ 8430D10
-	.4byte 0x14
-	.4byte 0xa
-	.4byte Underwater_SootopolisCity_MapBorder
-	.4byte Underwater_SootopolisCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-	.align 2
-DesertRuins_MapBorder: @ 8430D28
-	.incbin "data/maps/DesertRuins/border.bin"
-
-	.align 2
-DesertRuins_MapBlockdata: @ 8430D30
-	.incbin "data/maps/DesertRuins/map.bin"
-
-	.align 2
-DesertRuins_MapAttributes: @ 8431194
-	.4byte 0x11
-	.4byte 0x21
-	.4byte DesertRuins_MapBorder
-	.4byte DesertRuins_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-GraniteCave_1F_MapBorder: @ 84311AC
-	.incbin "data/maps/GraniteCave_1F/border.bin"
-
-	.align 2
-GraniteCave_1F_MapBlockdata: @ 84311B4
-	.incbin "data/maps/GraniteCave_1F/map.bin"
-
-	.align 2
-GraniteCave_1F_MapAttributes: @ 84316A0
-	.4byte 0x2a
-	.4byte 0xf
-	.4byte GraniteCave_1F_MapBorder
-	.4byte GraniteCave_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-GraniteCave_B1F_MapBorder: @ 84316B8
-	.incbin "data/maps/GraniteCave_B1F/border.bin"
-
-	.align 2
-GraniteCave_B1F_MapBlockdata: @ 84316C0
-	.incbin "data/maps/GraniteCave_B1F/map.bin"
-
-	.align 2
-GraniteCave_B1F_MapAttributes: @ 8431D40
-	.4byte 0x20
-	.4byte 0x1a
-	.4byte GraniteCave_B1F_MapBorder
-	.4byte GraniteCave_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-GraniteCave_B2F_MapBorder: @ 8431D58
-	.incbin "data/maps/GraniteCave_B2F/border.bin"
-
-	.align 2
-GraniteCave_B2F_MapBlockdata: @ 8431D60
-	.incbin "data/maps/GraniteCave_B2F/map.bin"
-
-	.align 2
-GraniteCave_B2F_MapAttributes: @ 84323E0
-	.4byte 0x20
-	.4byte 0x1a
-	.4byte GraniteCave_B2F_MapBorder
-	.4byte GraniteCave_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-PetalburgWoods_MapBorder: @ 84323F8
-	.incbin "data/maps/PetalburgWoods/border.bin"
-
-	.align 2
-PetalburgWoods_MapBlockdata: @ 8432400
-	.incbin "data/maps/PetalburgWoods/map.bin"
-
-	.align 2
-PetalburgWoods_MapAttributes: @ 8433480
-	.4byte 0x30
-	.4byte 0x2c
-	.4byte PetalburgWoods_MapBorder
-	.4byte PetalburgWoods_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-	.align 2
-MtChimney_MapBorder: @ 8433498
-	.incbin "data/maps/MtChimney/border.bin"
-
-	.align 2
-MtChimney_MapBlockdata: @ 84334A0
-	.incbin "data/maps/MtChimney/map.bin"
-
-	.align 2
-MtChimney_MapAttributes: @ 8434350
-	.4byte 0x28
-	.4byte 0x2f
-	.4byte MtChimney_MapBorder
-	.4byte MtChimney_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-	.align 2
-MtPyre_1F_MapBorder: @ 8434368
-	.incbin "data/maps/MtPyre_1F/border.bin"
-
-	.align 2
-MtPyre_1F_MapBlockdata: @ 8434370
-	.incbin "data/maps/MtPyre_1F/map.bin"
-
-	.align 2
-MtPyre_1F_MapAttributes: @ 84346B4
-	.4byte 0x16
-	.4byte 0x13
-	.4byte MtPyre_1F_MapBorder
-	.4byte MtPyre_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-MtPyre_2F_MapBorder: @ 84346CC
-	.incbin "data/maps/MtPyre_2F/border.bin"
-
-	.align 2
-MtPyre_2F_MapBlockdata: @ 84346D4
-	.incbin "data/maps/MtPyre_2F/map.bin"
-
-	.align 2
-MtPyre_2F_MapAttributes: @ 8434828
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_2F_MapBorder
-	.4byte MtPyre_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-MtPyre_3F_MapBorder: @ 8434840
-	.incbin "data/maps/MtPyre_3F/border.bin"
-
-	.align 2
-MtPyre_3F_MapBlockdata: @ 8434848
-	.incbin "data/maps/MtPyre_3F/map.bin"
-
-	.align 2
-MtPyre_3F_MapAttributes: @ 843499C
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_3F_MapBorder
-	.4byte MtPyre_3F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-MtPyre_4F_MapBorder: @ 84349B4
-	.incbin "data/maps/MtPyre_4F/border.bin"
-
-	.align 2
-MtPyre_4F_MapBlockdata: @ 84349BC
-	.incbin "data/maps/MtPyre_4F/map.bin"
-
-	.align 2
-MtPyre_4F_MapAttributes: @ 8434B10
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_4F_MapBorder
-	.4byte MtPyre_4F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-MtPyre_5F_MapBorder: @ 8434B28
-	.incbin "data/maps/MtPyre_5F/border.bin"
-
-	.align 2
-MtPyre_5F_MapBlockdata: @ 8434B30
-	.incbin "data/maps/MtPyre_5F/map.bin"
-
-	.align 2
-MtPyre_5F_MapAttributes: @ 8434C84
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_5F_MapBorder
-	.4byte MtPyre_5F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-MtPyre_6F_MapBorder: @ 8434C9C
-	.incbin "data/maps/MtPyre_6F/border.bin"
-
-	.align 2
-MtPyre_6F_MapBlockdata: @ 8434CA4
-	.incbin "data/maps/MtPyre_6F/map.bin"
-
-	.align 2
-MtPyre_6F_MapAttributes: @ 8434DF8
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_6F_MapBorder
-	.4byte MtPyre_6F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-AquaHideout_1F_MapBorder: @ 8434E10
-	.incbin "data/maps/AquaHideout_1F/border.bin"
-
-	.align 2
-AquaHideout_1F_MapBlockdata: @ 8434E18
-	.incbin "data/maps/AquaHideout_1F/map.bin"
-
-	.align 2
-AquaHideout_1F_MapAttributes: @ 84354A8
-	.4byte 0x1c
-	.4byte 0x1e
-	.4byte AquaHideout_1F_MapBorder
-	.4byte AquaHideout_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-AquaHideout_B1F_MapBorder: @ 84354C0
-	.incbin "data/maps/AquaHideout_B1F/border.bin"
-
-	.align 2
-AquaHideout_B1F_MapBlockdata: @ 84354C8
-	.incbin "data/maps/AquaHideout_B1F/map.bin"
-
-	.align 2
-AquaHideout_B1F_MapAttributes: @ 8435E58
-	.4byte 0x33
-	.4byte 0x18
-	.4byte AquaHideout_B1F_MapBorder
-	.4byte AquaHideout_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-AquaHideout_B2F_MapBorder: @ 8435E70
-	.incbin "data/maps/AquaHideout_B2F/border.bin"
-
-	.align 2
-AquaHideout_B2F_MapBlockdata: @ 8435E78
-	.incbin "data/maps/AquaHideout_B2F/map.bin"
-
-	.align 2
-AquaHideout_B2F_MapAttributes: @ 84364D8
-	.4byte 0x22
-	.4byte 0x18
-	.4byte AquaHideout_B2F_MapBorder
-	.4byte AquaHideout_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-Underwater_SeafloorCavern_MapBorder: @ 84364F0
-	.incbin "data/maps/Underwater_SeafloorCavern/border.bin"
-
-	.align 2
-Underwater_SeafloorCavern_MapBlockdata: @ 84364F8
-	.incbin "data/maps/Underwater_SeafloorCavern/map.bin"
-
-	.align 2
-Underwater_SeafloorCavern_MapAttributes: @ 84365F4
-	.4byte 0xe
-	.4byte 0x9
-	.4byte Underwater_SeafloorCavern_MapBorder
-	.4byte Underwater_SeafloorCavern_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-	.align 2
-SeafloorCavern_Entrance_MapBorder: @ 843660C
-	.incbin "data/maps/SeafloorCavern_Entrance/border.bin"
-
-	.align 2
-SeafloorCavern_Entrance_MapBlockdata: @ 8436614
-	.incbin "data/maps/SeafloorCavern_Entrance/map.bin"
-
-	.align 2
-SeafloorCavern_Entrance_MapAttributes: @ 8436934
-	.4byte 0x14
-	.4byte 0x14
-	.4byte SeafloorCavern_Entrance_MapBorder
-	.4byte SeafloorCavern_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-SeafloorCavern_Room1_MapBorder: @ 843694C
-	.incbin "data/maps/SeafloorCavern_Room1/border.bin"
-
-	.align 2
-SeafloorCavern_Room1_MapBlockdata: @ 8436954
-	.incbin "data/maps/SeafloorCavern_Room1/map.bin"
-
-	.align 2
-SeafloorCavern_Room1_MapAttributes: @ 8436C9C
-	.4byte 0x14
-	.4byte 0x15
-	.4byte SeafloorCavern_Room1_MapBorder
-	.4byte SeafloorCavern_Room1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-SeafloorCavern_Room2_MapBorder: @ 8436CB4
-	.incbin "data/maps/SeafloorCavern_Room2/border.bin"
-
-	.align 2
-SeafloorCavern_Room2_MapBlockdata: @ 8436CBC
-	.incbin "data/maps/SeafloorCavern_Room2/map.bin"
-
-	.align 2
-SeafloorCavern_Room2_MapAttributes: @ 8436E6C
-	.4byte 0x12
-	.4byte 0xc
-	.4byte SeafloorCavern_Room2_MapBorder
-	.4byte SeafloorCavern_Room2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-SeafloorCavern_Room3_MapBorder: @ 8436E84
-	.incbin "data/maps/SeafloorCavern_Room3/border.bin"
-
-	.align 2
-SeafloorCavern_Room3_MapBlockdata: @ 8436E8C
-	.incbin "data/maps/SeafloorCavern_Room3/map.bin"
-
-	.align 2
-SeafloorCavern_Room3_MapAttributes: @ 84370AC
-	.4byte 0x10
-	.4byte 0x11
-	.4byte SeafloorCavern_Room3_MapBorder
-	.4byte SeafloorCavern_Room3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-SeafloorCavern_Room4_MapBorder: @ 84370C4
-	.incbin "data/maps/SeafloorCavern_Room4/border.bin"
-
-	.align 2
-SeafloorCavern_Room4_MapBlockdata: @ 84370CC
-	.incbin "data/maps/SeafloorCavern_Room4/map.bin"
-
-	.align 2
-SeafloorCavern_Room4_MapAttributes: @ 8437378
-	.4byte 0x12
-	.4byte 0x13
-	.4byte SeafloorCavern_Room4_MapBorder
-	.4byte SeafloorCavern_Room4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-SeafloorCavern_Room5_MapBorder: @ 8437390
-	.incbin "data/maps/SeafloorCavern_Room5/border.bin"
-
-	.align 2
-SeafloorCavern_Room5_MapBlockdata: @ 8437398
-	.incbin "data/maps/SeafloorCavern_Room5/map.bin"
-
-	.align 2
-SeafloorCavern_Room5_MapAttributes: @ 84376B8
-	.4byte 0x14
-	.4byte 0x14
-	.4byte SeafloorCavern_Room5_MapBorder
-	.4byte SeafloorCavern_Room5_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-SeafloorCavern_Room6_MapBorder: @ 84376D0
-	.incbin "data/maps/SeafloorCavern_Room6/border.bin"
-
-	.align 2
-SeafloorCavern_Room6_MapBlockdata: @ 84376D8
-	.incbin "data/maps/SeafloorCavern_Room6/map.bin"
-
-	.align 2
-SeafloorCavern_Room6_MapAttributes: @ 8437B28
-	.4byte 0x18
-	.4byte 0x17
-	.4byte SeafloorCavern_Room6_MapBorder
-	.4byte SeafloorCavern_Room6_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-SeafloorCavern_Room7_MapBorder: @ 8437B40
-	.incbin "data/maps/SeafloorCavern_Room7/border.bin"
-
-	.align 2
-SeafloorCavern_Room7_MapBlockdata: @ 8437B48
-	.incbin "data/maps/SeafloorCavern_Room7/map.bin"
-
-	.align 2
-SeafloorCavern_Room7_MapAttributes: @ 8437FC8
-	.4byte 0x17
-	.4byte 0x19
-	.4byte SeafloorCavern_Room7_MapBorder
-	.4byte SeafloorCavern_Room7_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-SeafloorCavern_Room8_MapBorder: @ 8437FE0
-	.incbin "data/maps/SeafloorCavern_Room8/border.bin"
-
-	.align 2
-SeafloorCavern_Room8_MapBlockdata: @ 8437FE8
-	.incbin "data/maps/SeafloorCavern_Room8/map.bin"
-
-	.align 2
-SeafloorCavern_Room8_MapAttributes: @ 843811C
-	.4byte 0xb
-	.4byte 0xe
-	.4byte SeafloorCavern_Room8_MapBorder
-	.4byte SeafloorCavern_Room8_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-SeafloorCavern_Room9_MapBorder: @ 8438134
-	.incbin "data/maps/SeafloorCavern_Room9/border.bin"
-
-	.align 2
-SeafloorCavern_Room9_MapBlockdata: @ 843813C
-	.incbin "data/maps/SeafloorCavern_Room9/map.bin"
-
-	.align 2
-SeafloorCavern_Room9_MapAttributes: @ 8438AF0
-	.4byte 0x1b
-	.4byte 0x2e
-	.4byte SeafloorCavern_Room9_MapBorder
-	.4byte SeafloorCavern_Room9_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-CaveOfOrigin_Entrance_MapBorder: @ 8438B08
-	.incbin "data/maps/CaveOfOrigin_Entrance/border.bin"
-
-	.align 2
-CaveOfOrigin_Entrance_MapBlockdata: @ 8438B10
-	.incbin "data/maps/CaveOfOrigin_Entrance/map.bin"
-
-	.align 2
-CaveOfOrigin_Entrance_MapAttributes: @ 8438EEC
-	.4byte 0x13
-	.4byte 0x1a
-	.4byte CaveOfOrigin_Entrance_MapBorder
-	.4byte CaveOfOrigin_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-CaveOfOrigin_1F_MapBorder: @ 8438F04
-	.incbin "data/maps/CaveOfOrigin_1F/border.bin"
-
-	.align 2
-CaveOfOrigin_1F_MapBlockdata: @ 8438F0C
-	.incbin "data/maps/CaveOfOrigin_1F/map.bin"
-
-	.align 2
-CaveOfOrigin_1F_MapAttributes: @ 8439330
-	.4byte 0x17
-	.4byte 0x17
-	.4byte CaveOfOrigin_1F_MapBorder
-	.4byte CaveOfOrigin_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-CaveOfOrigin_UnusedRubySapphireMap1_MapBorder: @ 8439348
-	.incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin"
-
-	.align 2
-CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata: @ 8439350
-	.incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin"
-
-	.align 2
-CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes: @ 8439774
-	.4byte 0x17
-	.4byte 0x17
-	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBorder
-	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-CaveOfOrigin_UnusedRubySapphireMap2_MapBorder: @ 843978C
-	.incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin"
-
-	.align 2
-CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata: @ 8439794
-	.incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin"
-
-	.align 2
-CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes: @ 8439B08
-	.4byte 0x15
-	.4byte 0x15
-	.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBorder
-	.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-CaveOfOrigin_UnusedRubySapphireMap3_MapBorder: @ 8439B20
-	.incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin"
-
-	.align 2
-CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata: @ 8439B28
-	.incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin"
-
-	.align 2
-CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes: @ 8439E48
-	.4byte 0x13
-	.4byte 0x15
-	.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBorder
-	.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-CaveOfOrigin_B1F_MapBorder: @ 8439E60
-	.incbin "data/maps/CaveOfOrigin_B1F/border.bin"
-
-	.align 2
-CaveOfOrigin_B1F_MapBlockdata: @ 8439E68
-	.incbin "data/maps/CaveOfOrigin_B1F/map.bin"
-
-	.align 2
-CaveOfOrigin_B1F_MapAttributes: @ 843A13C
-	.4byte 0x13
-	.4byte 0x13
-	.4byte CaveOfOrigin_B1F_MapBorder
-	.4byte CaveOfOrigin_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-VictoryRoad_1F_MapBorder: @ 843A154
-	.incbin "data/maps/VictoryRoad_1F/border.bin"
-
-	.align 2
-VictoryRoad_1F_MapBlockdata: @ 843A15C
-	.incbin "data/maps/VictoryRoad_1F/map.bin"
-
-	.align 2
-VictoryRoad_1F_MapAttributes: @ 843B188
-	.4byte 0x2e
-	.4byte 0x2d
-	.4byte VictoryRoad_1F_MapBorder
-	.4byte VictoryRoad_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-ShoalCave_LowTideEntranceRoom_MapBorder: @ 843B1A0
-	.incbin "data/maps/ShoalCave_LowTideEntranceRoom/border.bin"
-
-	.align 2
-ShoalCave_LowTideEntranceRoom_MapBlockdata: @ 843B1A8
-	.incbin "data/maps/ShoalCave_LowTideEntranceRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideEntranceRoom_MapAttributes: @ 843BB3C
-	.4byte 0x23
-	.4byte 0x23
-	.4byte ShoalCave_LowTideEntranceRoom_MapBorder
-	.4byte ShoalCave_LowTideEntranceRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-ShoalCave_LowTideInnerRoom_MapBorder: @ 843BB54
-	.incbin "data/maps/ShoalCave_LowTideInnerRoom/border.bin"
-
-	.align 2
-ShoalCave_LowTideInnerRoom_MapBlockdata: @ 843BB5C
-	.incbin "data/maps/ShoalCave_LowTideInnerRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideInnerRoom_MapAttributes: @ 843C904
-	.4byte 0x2e
-	.4byte 0x26
-	.4byte ShoalCave_LowTideInnerRoom_MapBorder
-	.4byte ShoalCave_LowTideInnerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-ShoalCave_LowTideStairsRoom_MapBorder: @ 843C91C
-	.incbin "data/maps/ShoalCave_LowTideStairsRoom/border.bin"
-
-	.align 2
-ShoalCave_LowTideStairsRoom_MapBlockdata: @ 843C924
-	.incbin "data/maps/ShoalCave_LowTideStairsRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideStairsRoom_MapAttributes: @ 843CB9C
-	.4byte 0x15
-	.4byte 0xf
-	.4byte ShoalCave_LowTideStairsRoom_MapBorder
-	.4byte ShoalCave_LowTideStairsRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-ShoalCave_LowTideLowerRoom_MapBorder: @ 843CBB4
-	.incbin "data/maps/ShoalCave_LowTideLowerRoom/border.bin"
-
-	.align 2
-ShoalCave_LowTideLowerRoom_MapBlockdata: @ 843CBBC
-	.incbin "data/maps/ShoalCave_LowTideLowerRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideLowerRoom_MapAttributes: @ 843CF20
-	.4byte 0x1f
-	.4byte 0xe
-	.4byte ShoalCave_LowTideLowerRoom_MapBorder
-	.4byte ShoalCave_LowTideLowerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-ShoalCave_HighTideEntranceRoom_MapBorder: @ 843CF38
-	.incbin "data/maps/ShoalCave_HighTideEntranceRoom/border.bin"
-
-	.align 2
-ShoalCave_HighTideEntranceRoom_MapBlockdata: @ 843CF40
-	.incbin "data/maps/ShoalCave_HighTideEntranceRoom/map.bin"
-
-	.align 2
-ShoalCave_HighTideEntranceRoom_MapAttributes: @ 843D8D4
-	.4byte 0x23
-	.4byte 0x23
-	.4byte ShoalCave_HighTideEntranceRoom_MapBorder
-	.4byte ShoalCave_HighTideEntranceRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-ShoalCave_HighTideInnerRoom_MapBorder: @ 843D8EC
-	.incbin "data/maps/ShoalCave_HighTideInnerRoom/border.bin"
-
-	.align 2
-ShoalCave_HighTideInnerRoom_MapBlockdata: @ 843D8F4
-	.incbin "data/maps/ShoalCave_HighTideInnerRoom/map.bin"
-
-	.align 2
-ShoalCave_HighTideInnerRoom_MapAttributes: @ 843E69C
-	.4byte 0x2e
-	.4byte 0x26
-	.4byte ShoalCave_HighTideInnerRoom_MapBorder
-	.4byte ShoalCave_HighTideInnerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-UnknownMapBorder_0843E6C0: @ 843E6B4
-	.incbin "data/maps/UnknownMap_0843E6C0/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0843E6C0: @ 843E6BC
-	.incbin "data/maps/UnknownMap_0843E6C0/map.bin"
-
-	.align 2
-UnknownMapAttributes_0843E6C0: @ 843E6C0
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_0843E6C0
-	.4byte UnknownMapBlockdata_0843E6C0
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-UnknownMapBorder_0843E6E4: @ 843E6D8
-	.incbin "data/maps/UnknownMap_0843E6E4/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0843E6E4: @ 843E6E0
-	.incbin "data/maps/UnknownMap_0843E6E4/map.bin"
-
-	.align 2
-UnknownMapAttributes_0843E6E4: @ 843E6E4
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_0843E6E4
-	.4byte UnknownMapBlockdata_0843E6E4
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-UnknownMapBorder_0843E708: @ 843E6FC
-	.incbin "data/maps/UnknownMap_0843E708/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0843E708: @ 843E704
-	.incbin "data/maps/UnknownMap_0843E708/map.bin"
-
-	.align 2
-UnknownMapAttributes_0843E708: @ 843E708
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_0843E708
-	.4byte UnknownMapBlockdata_0843E708
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-UnknownMapBorder_0843E72C: @ 843E720
-	.incbin "data/maps/UnknownMap_0843E72C/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0843E72C: @ 843E728
-	.incbin "data/maps/UnknownMap_0843E72C/map.bin"
-
-	.align 2
-UnknownMapAttributes_0843E72C: @ 843E72C
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_0843E72C
-	.4byte UnknownMapBlockdata_0843E72C
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-UnknownMapBorder_0843E750: @ 843E744
-	.incbin "data/maps/UnknownMap_0843E750/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0843E750: @ 843E74C
-	.incbin "data/maps/UnknownMap_0843E750/map.bin"
-
-	.align 2
-UnknownMapAttributes_0843E750: @ 843E750
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_0843E750
-	.4byte UnknownMapBlockdata_0843E750
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-UnknownMapBorder_0843E774: @ 843E768
-	.incbin "data/maps/UnknownMap_0843E774/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0843E774: @ 843E770
-	.incbin "data/maps/UnknownMap_0843E774/map.bin"
-
-	.align 2
-UnknownMapAttributes_0843E774: @ 843E774
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_0843E774
-	.4byte UnknownMapBlockdata_0843E774
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-UnknownMapBorder_0843E798: @ 843E78C
-	.incbin "data/maps/UnknownMap_0843E798/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0843E798: @ 843E794
-	.incbin "data/maps/UnknownMap_0843E798/map.bin"
-
-	.align 2
-UnknownMapAttributes_0843E798: @ 843E798
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_0843E798
-	.4byte UnknownMapBlockdata_0843E798
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-UnknownMapBorder_0843E7BC: @ 843E7B0
-	.incbin "data/maps/UnknownMap_0843E7BC/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0843E7BC: @ 843E7B8
-	.incbin "data/maps/UnknownMap_0843E7BC/map.bin"
-
-	.align 2
-UnknownMapAttributes_0843E7BC: @ 843E7BC
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_0843E7BC
-	.4byte UnknownMapBlockdata_0843E7BC
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-UnknownMapBorder_0843E7E0: @ 843E7D4
-	.incbin "data/maps/UnknownMap_0843E7E0/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0843E7E0: @ 843E7DC
-	.incbin "data/maps/UnknownMap_0843E7E0/map.bin"
-
-	.align 2
-UnknownMapAttributes_0843E7E0: @ 843E7E0
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_0843E7E0
-	.4byte UnknownMapBlockdata_0843E7E0
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-UnknownMapBorder_0843E804: @ 843E7F8
-	.incbin "data/maps/UnknownMap_0843E804/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0843E804: @ 843E800
-	.incbin "data/maps/UnknownMap_0843E804/map.bin"
-
-	.align 2
-UnknownMapAttributes_0843E804: @ 843E804
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_0843E804
-	.4byte UnknownMapBlockdata_0843E804
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-UnknownMapBorder_0843E828: @ 843E81C
-	.incbin "data/maps/UnknownMap_0843E828/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0843E828: @ 843E824
-	.incbin "data/maps/UnknownMap_0843E828/map.bin"
-
-	.align 2
-UnknownMapAttributes_0843E828: @ 843E828
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_0843E828
-	.4byte UnknownMapBlockdata_0843E828
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-UnknownMapBorder_0843E84C: @ 843E840
-	.incbin "data/maps/UnknownMap_0843E84C/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0843E84C: @ 843E848
-	.incbin "data/maps/UnknownMap_0843E84C/map.bin"
-
-	.align 2
-UnknownMapAttributes_0843E84C: @ 843E84C
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_0843E84C
-	.4byte UnknownMapBlockdata_0843E84C
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-UnknownMapBorder_0843E870: @ 843E864
-	.incbin "data/maps/UnknownMap_0843E870/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0843E870: @ 843E86C
-	.incbin "data/maps/UnknownMap_0843E870/map.bin"
-
-	.align 2
-UnknownMapAttributes_0843E870: @ 843E870
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_0843E870
-	.4byte UnknownMapBlockdata_0843E870
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_0843E894: @ 843E888
-	.incbin "data/maps/UnknownMap_0843E894/border.bin"
-
-UnknownMapBlockdata_0843E894: @ 843E890
-	.incbin "data/maps/UnknownMap_0843E894/map.bin"
-
-	.align 2
-UnknownMapAttributes_0843E894: @ 843E894
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_0843E894
-	.4byte UnknownMapBlockdata_0843E894
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-NewMauville_Entrance_MapBorder: @ 843E8AC
-	.incbin "data/maps/NewMauville_Entrance/border.bin"
-
-	.align 2
-NewMauville_Entrance_MapBlockdata: @ 843E8B4
-	.incbin "data/maps/NewMauville_Entrance/map.bin"
-
-	.align 2
-NewMauville_Entrance_MapAttributes: @ 843E958
-	.4byte 0x9
-	.4byte 0x9
-	.4byte NewMauville_Entrance_MapBorder
-	.4byte NewMauville_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-NewMauville_Inside_MapBorder: @ 843E970
-	.incbin "data/maps/NewMauville_Inside/border.bin"
-
-	.align 2
-NewMauville_Inside_MapBlockdata: @ 843E978
-	.incbin "data/maps/NewMauville_Inside/map.bin"
-
-	.align 2
-NewMauville_Inside_MapAttributes: @ 843F69C
-	.4byte 0x29
-	.4byte 0x29
-	.4byte NewMauville_Inside_MapBorder
-	.4byte NewMauville_Inside_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BikeShop
-
-	.align 2
-AbandonedShip_Deck_MapBorder: @ 843F6B4
-	.incbin "data/maps/AbandonedShip_Deck/border.bin"
-
-	.align 2
-AbandonedShip_Deck_MapBlockdata: @ 843F6BC
-	.incbin "data/maps/AbandonedShip_Deck/map.bin"
-
-	.align 2
-AbandonedShip_Deck_MapAttributes: @ 843FA84
-	.4byte 0x17
-	.4byte 0x15
-	.4byte AbandonedShip_Deck_MapBorder
-	.4byte AbandonedShip_Deck_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-AbandonedShip_Corridors_1F_MapBorder: @ 843FA9C
-	.incbin "data/maps/AbandonedShip_Corridors_1F/border.bin"
-
-	.align 2
-AbandonedShip_Corridors_1F_MapBlockdata: @ 843FAA4
-	.incbin "data/maps/AbandonedShip_Corridors_1F/map.bin"
-
-	.align 2
-AbandonedShip_Corridors_1F_MapAttributes: @ 843FC54
-	.4byte 0x12
-	.4byte 0xc
-	.4byte AbandonedShip_Corridors_1F_MapBorder
-	.4byte AbandonedShip_Corridors_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
-	.align 2
-AbandonedShip_Rooms_1F_MapBorder: @ 843FC6C
-	.incbin "data/maps/AbandonedShip_Rooms_1F/border.bin"
-
-	.align 2
-AbandonedShip_Rooms_1F_MapBlockdata: @ 843FC74
-	.incbin "data/maps/AbandonedShip_Rooms_1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms_1F_MapAttributes: @ 843FED8
-	.4byte 0x12
-	.4byte 0x11
-	.4byte AbandonedShip_Rooms_1F_MapBorder
-	.4byte AbandonedShip_Rooms_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
-	.align 2
-AbandonedShip_Corridors_B1F_MapBorder: @ 843FEF0
-	.incbin "data/maps/AbandonedShip_Corridors_B1F/border.bin"
-
-	.align 2
-AbandonedShip_Corridors_B1F_MapBlockdata: @ 843FEF8
-	.incbin "data/maps/AbandonedShip_Corridors_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Corridors_B1F_MapAttributes: @ 843FFFC
-	.4byte 0xd
-	.4byte 0xa
-	.4byte AbandonedShip_Corridors_B1F_MapBorder
-	.4byte AbandonedShip_Corridors_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
-	.align 2
-AbandonedShip_Rooms_B1F_MapBorder: @ 8440014
-	.incbin "data/maps/AbandonedShip_Rooms_B1F/border.bin"
-
-	.align 2
-AbandonedShip_Rooms_B1F_MapBlockdata: @ 844001C
-	.incbin "data/maps/AbandonedShip_Rooms_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms_B1F_MapAttributes: @ 84401CC
-	.4byte 0x1b
-	.4byte 0x8
-	.4byte AbandonedShip_Rooms_B1F_MapBorder
-	.4byte AbandonedShip_Rooms_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
-	.align 2
-AbandonedShip_Rooms2_B1F_MapBorder: @ 84401E4
-	.incbin "data/maps/AbandonedShip_Rooms2_B1F/border.bin"
-
-	.align 2
-AbandonedShip_Rooms2_B1F_MapBlockdata: @ 84401EC
-	.incbin "data/maps/AbandonedShip_Rooms2_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms2_B1F_MapAttributes: @ 844030C
-	.4byte 0x12
-	.4byte 0x8
-	.4byte AbandonedShip_Rooms2_B1F_MapBorder
-	.4byte AbandonedShip_Rooms2_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
-	.align 2
-AbandonedShip_Underwater1_MapBorder: @ 8440324
-	.incbin "data/maps/AbandonedShip_Underwater1/border.bin"
-
-	.align 2
-AbandonedShip_Underwater1_MapBlockdata: @ 844032C
-	.incbin "data/maps/AbandonedShip_Underwater1/map.bin"
-
-	.align 2
-AbandonedShip_Underwater1_MapAttributes: @ 84403AC
-	.4byte 0x8
-	.4byte 0x8
-	.4byte AbandonedShip_Underwater1_MapBorder
-	.4byte AbandonedShip_Underwater1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
-	.align 2
-AbandonedShip_Room_B1F_MapBorder: @ 84403C4
-	.incbin "data/maps/AbandonedShip_Room_B1F/border.bin"
-
-	.align 2
-AbandonedShip_Room_B1F_MapBlockdata: @ 84403CC
-	.incbin "data/maps/AbandonedShip_Room_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Room_B1F_MapAttributes: @ 844045C
-	.4byte 0x9
-	.4byte 0x8
-	.4byte AbandonedShip_Room_B1F_MapBorder
-	.4byte AbandonedShip_Room_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
-	.align 2
-AbandonedShip_Rooms2_1F_MapBorder: @ 8440474
-	.incbin "data/maps/AbandonedShip_Rooms2_1F/border.bin"
-
-	.align 2
-AbandonedShip_Rooms2_1F_MapBlockdata: @ 844047C
-	.incbin "data/maps/AbandonedShip_Rooms2_1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms2_1F_MapAttributes: @ 84405B0
-	.4byte 0x9
-	.4byte 0x11
-	.4byte AbandonedShip_Rooms2_1F_MapBorder
-	.4byte AbandonedShip_Rooms2_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
-	.align 2
-AbandonedShip_CaptainsOffice_MapBorder: @ 84405C8
-	.incbin "data/maps/AbandonedShip_CaptainsOffice/border.bin"
-
-	.align 2
-AbandonedShip_CaptainsOffice_MapBlockdata: @ 84405D0
-	.incbin "data/maps/AbandonedShip_CaptainsOffice/map.bin"
-
-	.align 2
-AbandonedShip_CaptainsOffice_MapAttributes: @ 8440650
-	.4byte 0x9
-	.4byte 0x7
-	.4byte AbandonedShip_CaptainsOffice_MapBorder
-	.4byte AbandonedShip_CaptainsOffice_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-AbandonedShip_Underwater2_MapBorder: @ 8440668
-	.incbin "data/maps/AbandonedShip_Underwater2/border.bin"
-
-	.align 2
-AbandonedShip_Underwater2_MapBlockdata: @ 8440670
-	.incbin "data/maps/AbandonedShip_Underwater2/map.bin"
-
-	.align 2
-AbandonedShip_Underwater2_MapAttributes: @ 8440798
-	.4byte 0x15
-	.4byte 0x7
-	.4byte AbandonedShip_Underwater2_MapBorder
-	.4byte AbandonedShip_Underwater2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
-	.align 2
-SecretBase_RedCave1_MapBorder: @ 84407B0
-	.incbin "data/maps/SecretBase_RedCave1/border.bin"
-
-	.align 2
-SecretBase_RedCave1_MapBlockdata: @ 84407B8
-	.incbin "data/maps/SecretBase_RedCave1/map.bin"
-
-	.align 2
-SecretBase_RedCave1_MapAttributes: @ 8440880
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_RedCave1_MapBorder
-	.4byte SecretBase_RedCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
-	.align 2
-SecretBase_BrownCave1_MapBorder: @ 8440898
-	.incbin "data/maps/SecretBase_BrownCave1/border.bin"
-
-	.align 2
-SecretBase_BrownCave1_MapBlockdata: @ 84408A0
-	.incbin "data/maps/SecretBase_BrownCave1/map.bin"
-
-	.align 2
-SecretBase_BrownCave1_MapAttributes: @ 8440968
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_BrownCave1_MapBorder
-	.4byte SecretBase_BrownCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
-	.align 2
-SecretBase_BlueCave1_MapBorder: @ 8440980
-	.incbin "data/maps/SecretBase_BlueCave1/border.bin"
-
-	.align 2
-SecretBase_BlueCave1_MapBlockdata: @ 8440988
-	.incbin "data/maps/SecretBase_BlueCave1/map.bin"
-
-	.align 2
-SecretBase_BlueCave1_MapAttributes: @ 8440A50
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_BlueCave1_MapBorder
-	.4byte SecretBase_BlueCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
-	.align 2
-SecretBase_YellowCave1_MapBorder: @ 8440A68
-	.incbin "data/maps/SecretBase_YellowCave1/border.bin"
-
-	.align 2
-SecretBase_YellowCave1_MapBlockdata: @ 8440A70
-	.incbin "data/maps/SecretBase_YellowCave1/map.bin"
-
-	.align 2
-SecretBase_YellowCave1_MapAttributes: @ 8440B38
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_YellowCave1_MapBorder
-	.4byte SecretBase_YellowCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
-	.align 2
-SecretBase_Tree1_MapBorder: @ 8440B50
-	.incbin "data/maps/SecretBase_Tree1/border.bin"
-
-	.align 2
-SecretBase_Tree1_MapBlockdata: @ 8440B58
-	.incbin "data/maps/SecretBase_Tree1/map.bin"
-
-	.align 2
-SecretBase_Tree1_MapAttributes: @ 8440C20
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_Tree1_MapBorder
-	.4byte SecretBase_Tree1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
-	.align 2
-SecretBase_Shrub1_MapBorder: @ 8440C38
-	.incbin "data/maps/SecretBase_Shrub1/border.bin"
-
-	.align 2
-SecretBase_Shrub1_MapBlockdata: @ 8440C40
-	.incbin "data/maps/SecretBase_Shrub1/map.bin"
-
-	.align 2
-SecretBase_Shrub1_MapAttributes: @ 8440D08
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_Shrub1_MapBorder
-	.4byte SecretBase_Shrub1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
-	.align 2
-SecretBase_RedCave2_MapBorder: @ 8440D20
-	.incbin "data/maps/SecretBase_RedCave2/border.bin"
-
-	.align 2
-SecretBase_RedCave2_MapBlockdata: @ 8440D28
-	.incbin "data/maps/SecretBase_RedCave2/map.bin"
-
-	.align 2
-SecretBase_RedCave2_MapAttributes: @ 8440E08
-	.4byte 0x7
-	.4byte 0x10
-	.4byte SecretBase_RedCave2_MapBorder
-	.4byte SecretBase_RedCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
-	.align 2
-SecretBase_BrownCave2_MapBorder: @ 8440E20
-	.incbin "data/maps/SecretBase_BrownCave2/border.bin"
-
-	.align 2
-SecretBase_BrownCave2_MapBlockdata: @ 8440E28
-	.incbin "data/maps/SecretBase_BrownCave2/map.bin"
-
-	.align 2
-SecretBase_BrownCave2_MapAttributes: @ 8440F24
-	.4byte 0xe
-	.4byte 0x9
-	.4byte SecretBase_BrownCave2_MapBorder
-	.4byte SecretBase_BrownCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
-	.align 2
-SecretBase_BlueCave2_MapBorder: @ 8440F3C
-	.incbin "data/maps/SecretBase_BlueCave2/border.bin"
-
-	.align 2
-SecretBase_BlueCave2_MapBlockdata: @ 8440F44
-	.incbin "data/maps/SecretBase_BlueCave2/map.bin"
-
-	.align 2
-SecretBase_BlueCave2_MapAttributes: @ 8441018
-	.4byte 0xf
-	.4byte 0x7
-	.4byte SecretBase_BlueCave2_MapBorder
-	.4byte SecretBase_BlueCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
-	.align 2
-SecretBase_YellowCave2_MapBorder: @ 8441030
-	.incbin "data/maps/SecretBase_YellowCave2/border.bin"
-
-	.align 2
-SecretBase_YellowCave2_MapBlockdata: @ 8441038
-	.incbin "data/maps/SecretBase_YellowCave2/map.bin"
-
-	.align 2
-SecretBase_YellowCave2_MapAttributes: @ 8441134
-	.4byte 0xe
-	.4byte 0x9
-	.4byte SecretBase_YellowCave2_MapBorder
-	.4byte SecretBase_YellowCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
-	.align 2
-SecretBase_Tree2_MapBorder: @ 844114C
-	.incbin "data/maps/SecretBase_Tree2/border.bin"
-
-	.align 2
-SecretBase_Tree2_MapBlockdata: @ 8441154
-	.incbin "data/maps/SecretBase_Tree2/map.bin"
-
-	.align 2
-SecretBase_Tree2_MapAttributes: @ 8441234
-	.4byte 0x7
-	.4byte 0x10
-	.4byte SecretBase_Tree2_MapBorder
-	.4byte SecretBase_Tree2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
-	.align 2
-SecretBase_Shrub2_MapBorder: @ 844124C
-	.incbin "data/maps/SecretBase_Shrub2/border.bin"
-
-	.align 2
-SecretBase_Shrub2_MapBlockdata: @ 8441254
-	.incbin "data/maps/SecretBase_Shrub2/map.bin"
-
-	.align 2
-SecretBase_Shrub2_MapAttributes: @ 8441328
-	.4byte 0xf
-	.4byte 0x7
-	.4byte SecretBase_Shrub2_MapBorder
-	.4byte SecretBase_Shrub2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
-	.align 2
-SecretBase_RedCave3_MapBorder: @ 8441340
-	.incbin "data/maps/SecretBase_RedCave3/border.bin"
-
-	.align 2
-SecretBase_RedCave3_MapBlockdata: @ 8441348
-	.incbin "data/maps/SecretBase_RedCave3/map.bin"
-
-	.align 2
-SecretBase_RedCave3_MapAttributes: @ 8441438
-	.4byte 0xf
-	.4byte 0x8
-	.4byte SecretBase_RedCave3_MapBorder
-	.4byte SecretBase_RedCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
-	.align 2
-SecretBase_BrownCave3_MapBorder: @ 8441450
-	.incbin "data/maps/SecretBase_BrownCave3/border.bin"
-
-	.align 2
-SecretBase_BrownCave3_MapBlockdata: @ 8441458
-	.incbin "data/maps/SecretBase_BrownCave3/map.bin"
-
-	.align 2
-SecretBase_BrownCave3_MapAttributes: @ 84415A4
-	.4byte 0xf
-	.4byte 0xb
-	.4byte SecretBase_BrownCave3_MapBorder
-	.4byte SecretBase_BrownCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
-	.align 2
-SecretBase_BlueCave3_MapBorder: @ 84415BC
-	.incbin "data/maps/SecretBase_BlueCave3/border.bin"
-
-	.align 2
-SecretBase_BlueCave3_MapBlockdata: @ 84415C4
-	.incbin "data/maps/SecretBase_BlueCave3/map.bin"
-
-	.align 2
-SecretBase_BlueCave3_MapAttributes: @ 8441718
-	.4byte 0xa
-	.4byte 0x11
-	.4byte SecretBase_BlueCave3_MapBorder
-	.4byte SecretBase_BlueCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
-	.align 2
-SecretBase_YellowCave3_MapBorder: @ 8441730
-	.incbin "data/maps/SecretBase_YellowCave3/border.bin"
-
-	.align 2
-SecretBase_YellowCave3_MapBlockdata: @ 8441738
-	.incbin "data/maps/SecretBase_YellowCave3/map.bin"
-
-	.align 2
-SecretBase_YellowCave3_MapAttributes: @ 8441840
-	.4byte 0xc
-	.4byte 0xb
-	.4byte SecretBase_YellowCave3_MapBorder
-	.4byte SecretBase_YellowCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
-	.align 2
-SecretBase_Tree3_MapBorder: @ 8441858
-	.incbin "data/maps/SecretBase_Tree3/border.bin"
-
-	.align 2
-SecretBase_Tree3_MapBlockdata: @ 8441860
-	.incbin "data/maps/SecretBase_Tree3/map.bin"
-
-	.align 2
-SecretBase_Tree3_MapAttributes: @ 8441970
-	.4byte 0x11
-	.4byte 0x8
-	.4byte SecretBase_Tree3_MapBorder
-	.4byte SecretBase_Tree3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
-	.align 2
-SecretBase_Shrub3_MapBorder: @ 8441988
-	.incbin "data/maps/SecretBase_Shrub3/border.bin"
-
-	.align 2
-SecretBase_Shrub3_MapBlockdata: @ 8441990
-	.incbin "data/maps/SecretBase_Shrub3/map.bin"
-
-	.align 2
-SecretBase_Shrub3_MapAttributes: @ 8441AB0
-	.4byte 0xd
-	.4byte 0xb
-	.4byte SecretBase_Shrub3_MapBorder
-	.4byte SecretBase_Shrub3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
-	.align 2
-SecretBase_RedCave4_MapBorder: @ 8441AC8
-	.incbin "data/maps/SecretBase_RedCave4/border.bin"
-
-	.align 2
-SecretBase_RedCave4_MapBlockdata: @ 8441AD0
-	.incbin "data/maps/SecretBase_RedCave4/map.bin"
-
-	.align 2
-SecretBase_RedCave4_MapAttributes: @ 8441BE0
-	.4byte 0x9
-	.4byte 0xf
-	.4byte SecretBase_RedCave4_MapBorder
-	.4byte SecretBase_RedCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
-	.align 2
-SecretBase_BrownCave4_MapBorder: @ 8441BF8
-	.incbin "data/maps/SecretBase_BrownCave4/border.bin"
-
-	.align 2
-SecretBase_BrownCave4_MapBlockdata: @ 8441C00
-	.incbin "data/maps/SecretBase_BrownCave4/map.bin"
-
-	.align 2
-SecretBase_BrownCave4_MapAttributes: @ 8441D50
-	.4byte 0xe
-	.4byte 0xc
-	.4byte SecretBase_BrownCave4_MapBorder
-	.4byte SecretBase_BrownCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
-	.align 2
-SecretBase_BlueCave4_MapBorder: @ 8441D68
-	.incbin "data/maps/SecretBase_BlueCave4/border.bin"
-
-	.align 2
-SecretBase_BlueCave4_MapBlockdata: @ 8441D70
-	.incbin "data/maps/SecretBase_BlueCave4/map.bin"
-
-	.align 2
-SecretBase_BlueCave4_MapAttributes: @ 8441EA4
-	.4byte 0x9
-	.4byte 0x11
-	.4byte SecretBase_BlueCave4_MapBorder
-	.4byte SecretBase_BlueCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
-	.align 2
-SecretBase_YellowCave4_MapBorder: @ 8441EBC
-	.incbin "data/maps/SecretBase_YellowCave4/border.bin"
-
-	.align 2
-SecretBase_YellowCave4_MapBlockdata: @ 8441EC4
-	.incbin "data/maps/SecretBase_YellowCave4/map.bin"
-
-	.align 2
-SecretBase_YellowCave4_MapAttributes: @ 8442030
-	.4byte 0xd
-	.4byte 0xe
-	.4byte SecretBase_YellowCave4_MapBorder
-	.4byte SecretBase_YellowCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
-	.align 2
-SecretBase_Tree4_MapBorder: @ 8442048
-	.incbin "data/maps/SecretBase_Tree4/border.bin"
-
-	.align 2
-SecretBase_Tree4_MapBlockdata: @ 8442050
-	.incbin "data/maps/SecretBase_Tree4/map.bin"
-
-	.align 2
-SecretBase_Tree4_MapAttributes: @ 84421D8
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SecretBase_Tree4_MapBorder
-	.4byte SecretBase_Tree4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
-	.align 2
-SecretBase_Shrub4_MapBorder: @ 84421F0
-	.incbin "data/maps/SecretBase_Shrub4/border.bin"
-
-	.align 2
-SecretBase_Shrub4_MapBlockdata: @ 84421F8
-	.incbin "data/maps/SecretBase_Shrub4/map.bin"
-
-	.align 2
-SecretBase_Shrub4_MapAttributes: @ 844232C
-	.4byte 0xe
-	.4byte 0xb
-	.4byte SecretBase_Shrub4_MapBorder
-	.4byte SecretBase_Shrub4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
-	.align 2
-SingleBattleColosseum_MapBorder: @ 8442344
-	.incbin "data/maps/SingleBattleColosseum/border.bin"
-
-	.align 2
-SingleBattleColosseum_MapBlockdata: @ 844234C
-	.incbin "data/maps/SingleBattleColosseum/map.bin"
-
-	.align 2
-SingleBattleColosseum_MapAttributes: @ 8442448
-	.4byte 0xe
-	.4byte 0x9
-	.4byte SingleBattleColosseum_MapBorder
-	.4byte SingleBattleColosseum_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-	.align 2
-TradeCenter_MapBorder: @ 8442460
-	.incbin "data/maps/TradeCenter/border.bin"
-
-	.align 2
-TradeCenter_MapBlockdata: @ 8442468
-	.incbin "data/maps/TradeCenter/map.bin"
-
-	.align 2
-TradeCenter_MapAttributes: @ 8442540
-	.4byte 0xc
-	.4byte 0x9
-	.4byte TradeCenter_MapBorder
-	.4byte TradeCenter_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-	.align 2
-RecordCorner_MapBorder: @ 8442558
-	.incbin "data/maps/RecordCorner/border.bin"
-
-	.align 2
-RecordCorner_MapBlockdata: @ 8442560
-	.incbin "data/maps/RecordCorner/map.bin"
-
-	.align 2
-RecordCorner_MapAttributes: @ 84426F0
-	.4byte 0x14
-	.4byte 0xa
-	.4byte RecordCorner_MapBorder
-	.4byte RecordCorner_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-	.align 2
-DoubleBattleColosseum_MapBorder: @ 8442708
-	.incbin "data/maps/DoubleBattleColosseum/border.bin"
-
-	.align 2
-DoubleBattleColosseum_MapBlockdata: @ 8442710
-	.incbin "data/maps/DoubleBattleColosseum/map.bin"
-
-	.align 2
-DoubleBattleColosseum_MapAttributes: @ 844280C
-	.4byte 0xe
-	.4byte 0x9
-	.4byte DoubleBattleColosseum_MapBorder
-	.4byte DoubleBattleColosseum_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-	.align 2
-LinkContestRoom1_MapBorder: @ 8442824
-	.incbin "data/maps/LinkContestRoom1/border.bin"
-
-	.align 2
-LinkContestRoom1_MapBlockdata: @ 844282C
-	.incbin "data/maps/LinkContestRoom1/map.bin"
-
-	.align 2
-LinkContestRoom1_MapAttributes: @ 8442978
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom1_MapBorder
-	.4byte LinkContestRoom1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-	.align 2
-UnknownMap_25_29_MapBorder: @ 8442990
-	.incbin "data/maps/UnknownMap_25_29/border.bin"
-
-	.align 2
-UnknownMap_25_29_MapBlockdata: @ 8442998
-	.incbin "data/maps/UnknownMap_25_29/map.bin"
-
-	.align 2
-UnknownMap_25_29_MapAttributes: @ 844299C
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_29_MapBorder
-	.4byte UnknownMap_25_29_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-	.align 2
-UnknownMap_25_30_MapBorder: @ 84429B4
-	.incbin "data/maps/UnknownMap_25_30/border.bin"
-
-	.align 2
-UnknownMap_25_30_MapBlockdata: @ 84429BC
-	.incbin "data/maps/UnknownMap_25_30/map.bin"
-
-	.align 2
-UnknownMap_25_30_MapAttributes: @ 84429C0
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_30_MapBorder
-	.4byte UnknownMap_25_30_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-	.align 2
-UnknownMap_25_31_MapBorder: @ 84429D8
-	.incbin "data/maps/UnknownMap_25_31/border.bin"
-
-	.align 2
-UnknownMap_25_31_MapBlockdata: @ 84429E0
-	.incbin "data/maps/UnknownMap_25_31/map.bin"
-
-	.align 2
-UnknownMap_25_31_MapAttributes: @ 84429E4
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_31_MapBorder
-	.4byte UnknownMap_25_31_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-	.align 2
-UnknownMap_25_32_MapBorder: @ 84429FC
-	.incbin "data/maps/UnknownMap_25_32/border.bin"
-
-	.align 2
-UnknownMap_25_32_MapBlockdata: @ 8442A04
-	.incbin "data/maps/UnknownMap_25_32/map.bin"
-
-	.align 2
-UnknownMap_25_32_MapAttributes: @ 8442A08
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_32_MapBorder
-	.4byte UnknownMap_25_32_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-	.align 2
-UnknownMap_25_33_MapBorder: @ 8442A20
-	.incbin "data/maps/UnknownMap_25_33/border.bin"
-
-	.align 2
-UnknownMap_25_33_MapBlockdata: @ 8442A28
-	.incbin "data/maps/UnknownMap_25_33/map.bin"
-
-	.align 2
-UnknownMap_25_33_MapAttributes: @ 8442A2C
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_33_MapBorder
-	.4byte UnknownMap_25_33_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-	.align 2
-UnknownMap_25_34_MapBorder: @ 8442A44
-	.incbin "data/maps/UnknownMap_25_34/border.bin"
-
-	.align 2
-UnknownMap_25_34_MapBlockdata: @ 8442A4C
-	.incbin "data/maps/UnknownMap_25_34/map.bin"
-
-	.align 2
-UnknownMap_25_34_MapAttributes: @ 8442A50
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_34_MapBorder
-	.4byte UnknownMap_25_34_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-	.align 2
-LinkContestRoom2_MapBorder: @ 8442A68
-	.incbin "data/maps/LinkContestRoom2/border.bin"
-
-	.align 2
-LinkContestRoom2_MapBlockdata: @ 8442A70
-	.incbin "data/maps/LinkContestRoom2/map.bin"
-
-	.align 2
-LinkContestRoom2_MapAttributes: @ 8442BBC
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom2_MapBorder
-	.4byte LinkContestRoom2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-	.align 2
-LinkContestRoom3_MapBorder: @ 8442BD4
-	.incbin "data/maps/LinkContestRoom3/border.bin"
-
-	.align 2
-LinkContestRoom3_MapBlockdata: @ 8442BDC
-	.incbin "data/maps/LinkContestRoom3/map.bin"
-
-	.align 2
-LinkContestRoom3_MapAttributes: @ 8442D28
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom3_MapBorder
-	.4byte LinkContestRoom3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-	.align 2
-LinkContestRoom4_MapBorder: @ 8442D40
-	.incbin "data/maps/LinkContestRoom4/border.bin"
-
-	.align 2
-LinkContestRoom4_MapBlockdata: @ 8442D48
-	.incbin "data/maps/LinkContestRoom4/map.bin"
-
-	.align 2
-LinkContestRoom4_MapAttributes: @ 8442E94
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom4_MapBorder
-	.4byte LinkContestRoom4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-	.align 2
-LinkContestRoom5_MapBorder: @ 8442EAC
-	.incbin "data/maps/LinkContestRoom5/border.bin"
-
-	.align 2
-LinkContestRoom5_MapBlockdata: @ 8442EB4
-	.incbin "data/maps/LinkContestRoom5/map.bin"
-
-	.align 2
-LinkContestRoom5_MapAttributes: @ 8443000
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom5_MapBorder
-	.4byte LinkContestRoom5_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-	.align 2
-LinkContestRoom6_MapBorder: @ 8443018
-	.incbin "data/maps/LinkContestRoom6/border.bin"
-
-	.align 2
-LinkContestRoom6_MapBlockdata: @ 8443020
-	.incbin "data/maps/LinkContestRoom6/map.bin"
-
-	.align 2
-LinkContestRoom6_MapAttributes: @ 844316C
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom6_MapBorder
-	.4byte LinkContestRoom6_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-	.align 2
-InsideOfTruck_MapBorder: @ 8443184
-	.incbin "data/maps/InsideOfTruck/border.bin"
-
-	.align 2
-InsideOfTruck_MapBlockdata: @ 844318C
-	.incbin "data/maps/InsideOfTruck/map.bin"
-
-	.align 2
-InsideOfTruck_MapAttributes: @ 84431C0
-	.4byte 0x5
-	.4byte 0x5
-	.4byte InsideOfTruck_MapBorder
-	.4byte InsideOfTruck_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideOfTruck
-
-	.align 2
-SafariZone_Northwest_MapBorder: @ 84431D8
-	.incbin "data/maps/SafariZone_Northwest/border.bin"
-
-	.align 2
-SafariZone_Northwest_MapBlockdata: @ 84431E0
-	.incbin "data/maps/SafariZone_Northwest/map.bin"
-
-	.align 2
-SafariZone_Northwest_MapAttributes: @ 8443E60
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Northwest_MapBorder
-	.4byte SafariZone_Northwest_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-	.align 2
-SafariZone_North_MapBorder: @ 8443E78
-	.incbin "data/maps/SafariZone_North/border.bin"
-
-	.align 2
-SafariZone_North_MapBlockdata: @ 8443E80
-	.incbin "data/maps/SafariZone_North/map.bin"
-
-	.align 2
-SafariZone_North_MapAttributes: @ 8444B00
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_North_MapBorder
-	.4byte SafariZone_North_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-	.align 2
-SafariZone_Southwest_MapBorder: @ 8444B18
-	.incbin "data/maps/SafariZone_Southwest/border.bin"
-
-	.align 2
-SafariZone_Southwest_MapBlockdata: @ 8444B20
-	.incbin "data/maps/SafariZone_Southwest/map.bin"
-
-	.align 2
-SafariZone_Southwest_MapAttributes: @ 84457A0
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Southwest_MapBorder
-	.4byte SafariZone_Southwest_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-	.align 2
-SafariZone_South_MapBorder: @ 84457B8
-	.incbin "data/maps/SafariZone_South/border.bin"
-
-	.align 2
-SafariZone_South_MapBlockdata: @ 84457C0
-	.incbin "data/maps/SafariZone_South/map.bin"
-
-	.align 2
-SafariZone_South_MapAttributes: @ 8446440
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_South_MapBorder
-	.4byte SafariZone_South_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-	.align 2
-UnknownMapBorder_08447028: @ 8446458
-	.incbin "data/maps/UnknownMap_08447028/border.bin"
-
-	.align 2
-UnknownMapBlockdata_08447028: @ 8446460
-	.incbin "data/maps/UnknownMap_08447028/map.bin"
-
-	.align 2
-UnknownMapAttributes_08447028: @ 8447028
-	.4byte 0x3A
-	.4byte 0x1A
-	.4byte UnknownMapBorder_08447028
-	.4byte UnknownMapBlockdata_08447028
-	.4byte gTileset_General
-	.4byte 0
-
-	.align 2
-Route109_SeashoreHouse_MapBorder: @ 8447040
-	.incbin "data/maps/Route109_SeashoreHouse/border.bin"
-
-	.align 2
-Route109_SeashoreHouse_MapBlockdata: @ 8447048
-	.incbin "data/maps/Route109_SeashoreHouse/map.bin"
-
-	.align 2
-Route109_SeashoreHouse_MapAttributes: @ 8447174
-	.4byte 0xf
-	.4byte 0xa
-	.4byte Route109_SeashoreHouse_MapBorder
-	.4byte Route109_SeashoreHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_SeashoreHouse
-
-	.align 2
-Route110_TrickHouseEntrance_MapBorder: @ 844718C
-	.incbin "data/maps/Route110_TrickHouseEntrance/border.bin"
-
-	.align 2
-Route110_TrickHouseEntrance_MapBlockdata: @ 8447194
-	.incbin "data/maps/Route110_TrickHouseEntrance/map.bin"
-
-	.align 2
-Route110_TrickHouseEntrance_MapAttributes: @ 8447254
-	.4byte 0xc
-	.4byte 0x8
-	.4byte Route110_TrickHouseEntrance_MapBorder
-	.4byte Route110_TrickHouseEntrance_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-Route110_TrickHouseEnd_MapBorder: @ 844726C
-	.incbin "data/maps/Route110_TrickHouseEnd/border.bin"
-
-	.align 2
-Route110_TrickHouseEnd_MapBlockdata: @ 8447274
-	.incbin "data/maps/Route110_TrickHouseEnd/map.bin"
-
-	.align 2
-Route110_TrickHouseEnd_MapAttributes: @ 8447334
-	.4byte 0xc
-	.4byte 0x8
-	.4byte Route110_TrickHouseEnd_MapBorder
-	.4byte Route110_TrickHouseEnd_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-Route110_TrickHouseCorridor_MapBorder: @ 844734C
-	.incbin "data/maps/Route110_TrickHouseCorridor/border.bin"
-
-	.align 2
-Route110_TrickHouseCorridor_MapBlockdata: @ 8447354
-	.incbin "data/maps/Route110_TrickHouseCorridor/map.bin"
-
-	.align 2
-Route110_TrickHouseCorridor_MapAttributes: @ 8447624
-	.4byte 0xf
-	.4byte 0x18
-	.4byte Route110_TrickHouseCorridor_MapBorder
-	.4byte Route110_TrickHouseCorridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-Route110_TrickHousePuzzle1_MapBorder: @ 844763C
-	.incbin "data/maps/Route110_TrickHousePuzzle1/border.bin"
-
-	.align 2
-Route110_TrickHousePuzzle1_MapBlockdata: @ 8447644
-	.incbin "data/maps/Route110_TrickHousePuzzle1/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle1_MapAttributes: @ 84478D8
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle1_MapBorder
-	.4byte Route110_TrickHousePuzzle1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-	.align 2
-Route110_TrickHousePuzzle2_MapBorder: @ 84478F0
-	.incbin "data/maps/Route110_TrickHousePuzzle2/border.bin"
-
-	.align 2
-Route110_TrickHousePuzzle2_MapBlockdata: @ 84478F8
-	.incbin "data/maps/Route110_TrickHousePuzzle2/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle2_MapAttributes: @ 8447B8C
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle2_MapBorder
-	.4byte Route110_TrickHousePuzzle2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-	.align 2
-Route110_TrickHousePuzzle3_MapBorder: @ 8447BA4
-	.incbin "data/maps/Route110_TrickHousePuzzle3/border.bin"
-
-	.align 2
-Route110_TrickHousePuzzle3_MapBlockdata: @ 8447BAC
-	.incbin "data/maps/Route110_TrickHousePuzzle3/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle3_MapAttributes: @ 8447E40
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle3_MapBorder
-	.4byte Route110_TrickHousePuzzle3_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-	.align 2
-Route110_TrickHousePuzzle4_MapBorder: @ 8447E58
-	.incbin "data/maps/Route110_TrickHousePuzzle4/border.bin"
-
-	.align 2
-Route110_TrickHousePuzzle4_MapBlockdata: @ 8447E60
-	.incbin "data/maps/Route110_TrickHousePuzzle4/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle4_MapAttributes: @ 84480F4
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle4_MapBorder
-	.4byte Route110_TrickHousePuzzle4_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-	.align 2
-Route110_TrickHousePuzzle5_MapBorder: @ 844810C
-	.incbin "data/maps/Route110_TrickHousePuzzle5/border.bin"
-
-	.align 2
-Route110_TrickHousePuzzle5_MapBlockdata: @ 8448114
-	.incbin "data/maps/Route110_TrickHousePuzzle5/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle5_MapAttributes: @ 84483A8
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle5_MapBorder
-	.4byte Route110_TrickHousePuzzle5_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-	.align 2
-Route110_TrickHousePuzzle6_MapBorder: @ 84483C0
-	.incbin "data/maps/Route110_TrickHousePuzzle6/border.bin"
-
-	.align 2
-Route110_TrickHousePuzzle6_MapBlockdata: @ 84483C8
-	.incbin "data/maps/Route110_TrickHousePuzzle6/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle6_MapAttributes: @ 844865C
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle6_MapBorder
-	.4byte Route110_TrickHousePuzzle6_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-	.align 2
-Route110_TrickHousePuzzle7_MapBorder: @ 8448674
-	.incbin "data/maps/Route110_TrickHousePuzzle7/border.bin"
-
-	.align 2
-Route110_TrickHousePuzzle7_MapBlockdata: @ 844867C
-	.incbin "data/maps/Route110_TrickHousePuzzle7/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle7_MapAttributes: @ 8448910
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle7_MapBorder
-	.4byte Route110_TrickHousePuzzle7_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-	.align 2
-Route110_TrickHousePuzzle8_MapBorder: @ 8448928
-	.incbin "data/maps/Route110_TrickHousePuzzle8/border.bin"
-
-	.align 2
-Route110_TrickHousePuzzle8_MapBlockdata: @ 8448930
-	.incbin "data/maps/Route110_TrickHousePuzzle8/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle8_MapAttributes: @ 8448BC4
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle8_MapBorder
-	.4byte Route110_TrickHousePuzzle8_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-	.align 2
-FortreeCity_DecorationShop_MapBorder: @ 8448BDC
-	.incbin "data/maps/FortreeCity_DecorationShop/border.bin"
-
-	.align 2
-FortreeCity_DecorationShop_MapBlockdata: @ 8448BE4
-	.incbin "data/maps/FortreeCity_DecorationShop/map.bin"
-
-	.align 2
-FortreeCity_DecorationShop_MapAttributes: @ 8448C44
-	.4byte 0x8
-	.4byte 0x6
-	.4byte FortreeCity_DecorationShop_MapBorder
-	.4byte FortreeCity_DecorationShop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-Route110_SeasideCyclingRoadEntrance1_MapBorder: @ 8448C5C
-	.incbin "data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin"
-
-	.align 2
-Route110_SeasideCyclingRoadEntrance1_MapBlockdata: @ 8448C64
-	.incbin "data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin"
-
-	.align 2
-Route110_SeasideCyclingRoadEntrance1_MapAttributes: @ 8448D18
-Route110_SeasideCyclingRoadEntrance2_MapAttributes: @ 8448D18
-	.4byte 0xf
-	.4byte 0x6
-	.4byte Route110_SeasideCyclingRoadEntrance1_MapBorder
-	.4byte Route110_SeasideCyclingRoadEntrance1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-	.align 2
-LilycoveCity_DepartmentStore_1F_MapBorder: @ 8448D30
-	.incbin "data/maps/LilycoveCity_DepartmentStore_1F/border.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_1F_MapBlockdata: @ 8448D38
-	.incbin "data/maps/LilycoveCity_DepartmentStore_1F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_1F_MapAttributes: @ 8448E58
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_1F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-	.align 2
-LilycoveCity_DepartmentStore_2F_MapBorder: @ 8448E70
-	.incbin "data/maps/LilycoveCity_DepartmentStore_2F/border.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_2F_MapBlockdata: @ 8448E78
-	.incbin "data/maps/LilycoveCity_DepartmentStore_2F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_2F_MapAttributes: @ 8448F98
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_2F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-	.align 2
-LilycoveCity_DepartmentStore_3F_MapBorder: @ 8448FB0
-	.incbin "data/maps/LilycoveCity_DepartmentStore_3F/border.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_3F_MapBlockdata: @ 8448FB8
-	.incbin "data/maps/LilycoveCity_DepartmentStore_3F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_3F_MapAttributes: @ 84490D8
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_3F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_3F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-	.align 2
-LilycoveCity_DepartmentStore_4F_MapBorder: @ 84490F0
-	.incbin "data/maps/LilycoveCity_DepartmentStore_4F/border.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_4F_MapBlockdata: @ 84490F8
-	.incbin "data/maps/LilycoveCity_DepartmentStore_4F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_4F_MapAttributes: @ 8449218
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_4F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_4F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-	.align 2
-LilycoveCity_DepartmentStore_5F_MapBorder: @ 8449230
-	.incbin "data/maps/LilycoveCity_DepartmentStore_5F/border.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_5F_MapBlockdata: @ 8449238
-	.incbin "data/maps/LilycoveCity_DepartmentStore_5F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_5F_MapAttributes: @ 8449358
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_5F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_5F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-	.align 2
-LilycoveCity_DepartmentStoreRooftop_MapBorder: @ 8449370
-	.incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin"
-
-	.align 2
-LilycoveCity_DepartmentStoreRooftop_MapBlockdata: @ 8449378
-	.incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStoreRooftop_MapAttributes: @ 8449528
-	.4byte 0x12
-	.4byte 0xc
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapBorder
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-	.align 2
-Route130_MapBorder: @ 8449540
-	.incbin "data/maps/Route130/border.bin"
-
-	.align 2
-Route130_MapBlockdata: @ 8449548
-	.incbin "data/maps/Route130/map.bin"
-
-	.align 2
-Route130_MapAttributes: @ 844AE48
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route130_MapBorder
-	.4byte Route130_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-BattleFrontier_BattleTowerLobby_MapBorder: @ 844AE60
-	.incbin "data/maps/BattleFrontier_BattleTowerLobby/border.bin"
-
-	.align 2
-BattleFrontier_BattleTowerLobby_MapBlockdata: @ 844AE68
-	.incbin "data/maps/BattleFrontier_BattleTowerLobby/map.bin"
-
-	.align 2
-BattleFrontier_BattleTowerLobby_MapAttributes: @ 844B05C
-	.4byte 0x19
-	.4byte 0xa
-	.4byte BattleFrontier_BattleTowerLobby_MapBorder
-	.4byte BattleFrontier_BattleTowerLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
-	.align 2
-BattleFrontier_OutsideWest_MapBorder: @ 844B074
-	.incbin "data/maps/BattleFrontier_OutsideWest/border.bin"
-
-	.align 2
-BattleFrontier_OutsideWest_MapBlockdata: @ 844B07C
-	.incbin "data/maps/BattleFrontier_OutsideWest/map.bin"
-
-	.align 2
-BattleFrontier_OutsideWest_MapAttributes: @ 844CFFC
-	.4byte 0x38
-	.4byte 0x48
-	.4byte BattleFrontier_OutsideWest_MapBorder
-	.4byte BattleFrontier_OutsideWest_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BattleFrontierOutsideWest
-
-	.align 2
-BattleFrontier_BattleTowerElevator_MapBorder: @ 844D014
-	.incbin "data/maps/BattleFrontier_BattleTowerElevator/border.bin"
-
-	.align 2
-BattleFrontier_BattleTowerElevator_MapBlockdata: @ 844D01C
-	.incbin "data/maps/BattleFrontier_BattleTowerElevator/map.bin"
-
-	.align 2
-BattleFrontier_BattleTowerElevator_MapAttributes: @ 844D064
-TrainerHill_Elevator_MapAttributes: @ 844D064
-	.4byte 0x5
-	.4byte 0x7
-	.4byte BattleFrontier_BattleTowerElevator_MapBorder
-	.4byte BattleFrontier_BattleTowerElevator_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
-	.align 2
-BattleFrontier_BattleTowerCorridor_MapBorder: @ 844D07C
-	.incbin "data/maps/BattleFrontier_BattleTowerCorridor/border.bin"
-
-	.align 2
-BattleFrontier_BattleTowerCorridor_MapBlockdata: @ 844D084
-	.incbin "data/maps/BattleFrontier_BattleTowerCorridor/map.bin"
-
-	.align 2
-BattleFrontier_BattleTowerCorridor_MapAttributes: @ 844D130
-	.4byte 0x11
-	.4byte 0x5
-	.4byte BattleFrontier_BattleTowerCorridor_MapBorder
-	.4byte BattleFrontier_BattleTowerCorridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
-	.align 2
-BattleFrontier_BattleTowerBattleRoom_MapBorder: @ 844D148
-	.incbin "data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin"
-
-	.align 2
-BattleFrontier_BattleTowerBattleRoom_MapBlockdata: @ 844D150
-	.incbin "data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattleTowerBattleRoom2_MapAttributes: @ 844D204
-BattleFrontier_BattleTowerBattleRoom_MapAttributes: @ 844D204
-	.4byte 0xa
-	.4byte 0x9
-	.4byte BattleFrontier_BattleTowerBattleRoom_MapBorder
-	.4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
-	.align 2
-RustboroCity_DevonCorp_3F_MapBorder: @ 844D21C
-	.incbin "data/maps/RustboroCity_DevonCorp_3F/border.bin"
-
-	.align 2
-RustboroCity_DevonCorp_3F_MapBlockdata: @ 844D224
-	.incbin "data/maps/RustboroCity_DevonCorp_3F/map.bin"
-
-	.align 2
-RustboroCity_DevonCorp_3F_MapAttributes: @ 844D37C
-	.4byte 0x13
-	.4byte 0x9
-	.4byte RustboroCity_DevonCorp_3F_MapBorder
-	.4byte RustboroCity_DevonCorp_3F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Facility
-
-	.align 2
-EverGrandeCity_PokemonLeague_1F_MapBorder: @ 844D394
-	.incbin "data/maps/EverGrandeCity_PokemonLeague_1F/border.bin"
-
-	.align 2
-EverGrandeCity_PokemonLeague_1F_MapBlockdata: @ 844D39C
-	.incbin "data/maps/EverGrandeCity_PokemonLeague_1F/map.bin"
-
-	.align 2
-EverGrandeCity_PokemonLeague_1F_MapAttributes: @ 844D564
-	.4byte 0x13
-	.4byte 0xc
-	.4byte EverGrandeCity_PokemonLeague_1F_MapBorder
-	.4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
-	.align 2
-Route119_WeatherInstitute_1F_MapBorder: @ 844D57C
-	.incbin "data/maps/Route119_WeatherInstitute_1F/border.bin"
-
-	.align 2
-Route119_WeatherInstitute_1F_MapBlockdata: @ 844D584
-	.incbin "data/maps/Route119_WeatherInstitute_1F/map.bin"
-
-	.align 2
-Route119_WeatherInstitute_1F_MapAttributes: @ 844D78C
-	.4byte 0x14
-	.4byte 0xd
-	.4byte Route119_WeatherInstitute_1F_MapBorder
-	.4byte Route119_WeatherInstitute_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
-	.align 2
-Route119_WeatherInstitute_2F_MapBorder: @ 844D7A4
-	.incbin "data/maps/Route119_WeatherInstitute_2F/border.bin"
-
-	.align 2
-Route119_WeatherInstitute_2F_MapBlockdata: @ 844D7AC
-	.incbin "data/maps/Route119_WeatherInstitute_2F/map.bin"
-
-	.align 2
-Route119_WeatherInstitute_2F_MapAttributes: @ 844D964
-	.4byte 0x14
-	.4byte 0xb
-	.4byte Route119_WeatherInstitute_2F_MapBorder
-	.4byte Route119_WeatherInstitute_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
-	.align 2
-LilycoveCity_DepartmentStoreElevator_MapBorder: @ 844D97C
-	.incbin "data/maps/LilycoveCity_DepartmentStoreElevator/border.bin"
-
-	.align 2
-LilycoveCity_DepartmentStoreElevator_MapBlockdata: @ 844D984
-	.incbin "data/maps/LilycoveCity_DepartmentStoreElevator/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStoreElevator_MapAttributes: @ 844D9C0
-	.4byte 0x5
-	.4byte 0x6
-	.4byte LilycoveCity_DepartmentStoreElevator_MapBorder
-	.4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
-	.align 2
-Underwater1_MapBorder: @ 844D9D8
-	.incbin "data/maps/Underwater1/border.bin"
-
-	.align 2
-Underwater1_MapBlockdata: @ 844D9E0
-	.incbin "data/maps/Underwater1/map.bin"
-
-	.align 2
-Underwater1_MapAttributes: @ 8450BE0
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Underwater1_MapBorder
-	.4byte Underwater1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-	.align 2
-MossdeepCity_SpaceCenter_1F_MapBorder: @ 8450BF8
-	.incbin "data/maps/MossdeepCity_SpaceCenter_1F/border.bin"
-
-	.align 2
-MossdeepCity_SpaceCenter_1F_MapBlockdata: @ 8450C00
-	.incbin "data/maps/MossdeepCity_SpaceCenter_1F/map.bin"
-
-	.align 2
-MossdeepCity_SpaceCenter_1F_MapAttributes: @ 8450D40
-	.4byte 0x10
-	.4byte 0xa
-	.4byte MossdeepCity_SpaceCenter_1F_MapBorder
-	.4byte MossdeepCity_SpaceCenter_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-MossdeepCity_SpaceCenter_2F_MapBorder: @ 8450D58
-	.incbin "data/maps/MossdeepCity_SpaceCenter_2F/border.bin"
-
-	.align 2
-MossdeepCity_SpaceCenter_2F_MapBlockdata: @ 8450D60
-	.incbin "data/maps/MossdeepCity_SpaceCenter_2F/map.bin"
-
-	.align 2
-MossdeepCity_SpaceCenter_2F_MapAttributes: @ 8450EA0
-	.4byte 0x10
-	.4byte 0xa
-	.4byte MossdeepCity_SpaceCenter_2F_MapBorder
-	.4byte MossdeepCity_SpaceCenter_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-SSTidalCorridor_MapBorder: @ 8450EB8
-	.incbin "data/maps/SSTidalCorridor/border.bin"
-
-	.align 2
-SSTidalCorridor_MapBlockdata: @ 8450EC0
-	.incbin "data/maps/SSTidalCorridor/map.bin"
-
-	.align 2
-SSTidalCorridor_MapAttributes: @ 8451094
-	.4byte 0x12
-	.4byte 0xd
-	.4byte SSTidalCorridor_MapBorder
-	.4byte SSTidalCorridor_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
-	.align 2
-SSTidalLowerDeck_MapBorder: @ 84510AC
-	.incbin "data/maps/SSTidalLowerDeck/border.bin"
-
-	.align 2
-SSTidalLowerDeck_MapBlockdata: @ 84510B4
-	.incbin "data/maps/SSTidalLowerDeck/map.bin"
-
-	.align 2
-SSTidalLowerDeck_MapAttributes: @ 8451270
-	.4byte 0x11
-	.4byte 0xd
-	.4byte SSTidalLowerDeck_MapBorder
-	.4byte SSTidalLowerDeck_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
-	.align 2
-SSTidalRooms_MapBorder: @ 8451288
-	.incbin "data/maps/SSTidalRooms/border.bin"
-
-	.align 2
-SSTidalRooms_MapBlockdata: @ 8451290
-	.incbin "data/maps/SSTidalRooms/map.bin"
-
-	.align 2
-SSTidalRooms_MapAttributes: @ 84517A0
-	.4byte 0x24
-	.4byte 0x12
-	.4byte SSTidalRooms_MapBorder
-	.4byte SSTidalRooms_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
-	.align 2
-IslandCave_MapBorder: @ 84517B8
-	.incbin "data/maps/IslandCave/border.bin"
-
-	.align 2
-IslandCave_MapBlockdata: @ 84517C0
-	.incbin "data/maps/IslandCave/map.bin"
-
-	.align 2
-IslandCave_MapAttributes: @ 8451C24
-	.4byte 0x11
-	.4byte 0x21
-	.4byte IslandCave_MapBorder
-	.4byte IslandCave_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-AncientTomb_MapBorder: @ 8451C3C
-	.incbin "data/maps/AncientTomb/border.bin"
-
-	.align 2
-AncientTomb_MapBlockdata: @ 8451C44
-	.incbin "data/maps/AncientTomb/map.bin"
-
-	.align 2
-AncientTomb_MapAttributes: @ 84520A8
-	.4byte 0x11
-	.4byte 0x21
-	.4byte AncientTomb_MapBorder
-	.4byte AncientTomb_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-Underwater_Route134_MapBorder: @ 84520C0
-	.incbin "data/maps/Underwater_Route134/border.bin"
-
-	.align 2
-Underwater_Route134_MapBlockdata: @ 84520C8
-	.incbin "data/maps/Underwater_Route134/map.bin"
-
-	.align 2
-Underwater_Route134_MapAttributes: @ 8452230
-	.4byte 0x12
-	.4byte 0xa
-	.4byte Underwater_Route134_MapBorder
-	.4byte Underwater_Route134_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-	.align 2
-Underwater_SealedChamber_MapBorder: @ 8452248
-	.incbin "data/maps/Underwater_SealedChamber/border.bin"
-
-	.align 2
-Underwater_SealedChamber_MapBlockdata: @ 8452250
-	.incbin "data/maps/Underwater_SealedChamber/map.bin"
-
-	.align 2
-Underwater_SealedChamber_MapAttributes: @ 8452A90
-	.4byte 0x16
-	.4byte 0x30
-	.4byte Underwater_SealedChamber_MapBorder
-	.4byte Underwater_SealedChamber_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-	.align 2
-SealedChamber_OuterRoom_MapBorder: @ 8452AA8
-	.incbin "data/maps/SealedChamber_OuterRoom/border.bin"
-
-	.align 2
-SealedChamber_OuterRoom_MapBlockdata: @ 8452AB0
-	.incbin "data/maps/SealedChamber_OuterRoom/map.bin"
-
-	.align 2
-SealedChamber_OuterRoom_MapAttributes: @ 8452E78
-	.4byte 0x15
-	.4byte 0x17
-	.4byte SealedChamber_OuterRoom_MapBorder
-	.4byte SealedChamber_OuterRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-VictoryRoad_B1F_MapBorder: @ 8452E90
-	.incbin "data/maps/VictoryRoad_B1F/border.bin"
-
-	.align 2
-VictoryRoad_B1F_MapBlockdata: @ 8452E98
-	.incbin "data/maps/VictoryRoad_B1F/map.bin"
-
-	.align 2
-VictoryRoad_B1F_MapAttributes: @ 84539BC
-	.4byte 0x2e
-	.4byte 0x1f
-	.4byte VictoryRoad_B1F_MapBorder
-	.4byte VictoryRoad_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-VictoryRoad_B2F_MapBorder: @ 84539D4
-	.incbin "data/maps/VictoryRoad_B2F/border.bin"
-
-	.align 2
-VictoryRoad_B2F_MapBlockdata: @ 84539DC
-	.incbin "data/maps/VictoryRoad_B2F/map.bin"
-
-	.align 2
-VictoryRoad_B2F_MapAttributes: @ 8454500
-	.4byte 0x2e
-	.4byte 0x1f
-	.4byte VictoryRoad_B2F_MapBorder
-	.4byte VictoryRoad_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-Route104_Prototype_MapBorder: @ 8454518
-	.incbin "data/maps/Route104_Prototype/border.bin"
-
-	.align 2
-Route104_Prototype_MapBlockdata: @ 8454520
-	.incbin "data/maps/Route104_Prototype/map.bin"
-
-	.align 2
-Route104_Prototype_MapAttributes: @ 8454524
-	.4byte 0x1
-	.4byte 0x1
-	.4byte Route104_Prototype_MapBorder
-	.4byte Route104_Prototype_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-	.align 2
-GraniteCave_StevensRoom_MapBorder: @ 845453C
-	.incbin "data/maps/GraniteCave_StevensRoom/border.bin"
-
-	.align 2
-GraniteCave_StevensRoom_MapBlockdata: @ 8454544
-	.incbin "data/maps/GraniteCave_StevensRoom/map.bin"
-
-	.align 2
-GraniteCave_StevensRoom_MapAttributes: @ 84546E8
-	.4byte 0xf
-	.4byte 0xe
-	.4byte GraniteCave_StevensRoom_MapBorder
-	.4byte GraniteCave_StevensRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-AbandonedShip_HiddenFloorCorridors_MapBorder: @ 8454700
-	.incbin "data/maps/AbandonedShip_HiddenFloorCorridors/border.bin"
-
-	.align 2
-AbandonedShip_HiddenFloorCorridors_MapBlockdata: @ 8454708
-	.incbin "data/maps/AbandonedShip_HiddenFloorCorridors/map.bin"
-
-	.align 2
-AbandonedShip_HiddenFloorCorridors_MapAttributes: @ 8454828
-	.4byte 0xd
-	.4byte 0xb
-	.4byte AbandonedShip_HiddenFloorCorridors_MapBorder
-	.4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
-	.align 2
-SouthernIsland_Exterior_MapBorder: @ 8454840
-	.incbin "data/maps/SouthernIsland_Exterior/border.bin"
-
-	.align 2
-SouthernIsland_Exterior_MapBlockdata: @ 8454848
-	.incbin "data/maps/SouthernIsland_Exterior/map.bin"
-
-	.align 2
-SouthernIsland_Exterior_MapAttributes: @ 8455004
-	.4byte 0x21
-	.4byte 0x1e
-	.4byte SouthernIsland_Exterior_MapBorder
-	.4byte SouthernIsland_Exterior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-	.align 2
-SouthernIsland_Interior_MapBorder: @ 845501C
-	.incbin "data/maps/SouthernIsland_Interior/border.bin"
-
-	.align 2
-SouthernIsland_Interior_MapBlockdata: @ 8455024
-	.incbin "data/maps/SouthernIsland_Interior/map.bin"
-
-	.align 2
-SouthernIsland_Interior_MapAttributes: @ 8455534
-	.4byte 0x1b
-	.4byte 0x18
-	.4byte SouthernIsland_Interior_MapBorder
-	.4byte SouthernIsland_Interior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-	.align 2
-JaggedPass_MapBorder: @ 845554C
-	.incbin "data/maps/JaggedPass/border.bin"
-
-	.align 2
-JaggedPass_MapBlockdata: @ 8455554
-	.incbin "data/maps/JaggedPass/map.bin"
-
-	.align 2
-JaggedPass_MapAttributes: @ 845601C
-	.4byte 0x1e
-	.4byte 0x2e
-	.4byte JaggedPass_MapBorder
-	.4byte JaggedPass_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-	.align 2
-FieryPath_MapBorder: @ 8456034
-	.incbin "data/maps/FieryPath/border.bin"
-
-	.align 2
-FieryPath_MapBlockdata: @ 845603C
-	.incbin "data/maps/FieryPath/map.bin"
-
-	.align 2
-FieryPath_MapAttributes: @ 8456AA0
-	.4byte 0x23
-	.4byte 0x26
-	.4byte FieryPath_MapBorder
-	.4byte FieryPath_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-	.align 2
-RustboroCity_Flat2_1F_MapBorder: @ 8456AB8
-	.incbin "data/maps/RustboroCity_Flat2_1F/border.bin"
-
-	.align 2
-RustboroCity_Flat2_1F_MapBlockdata: @ 8456AC0
-	.incbin "data/maps/RustboroCity_Flat2_1F/map.bin"
-
-	.align 2
-RustboroCity_Flat2_1F_MapAttributes: @ 8456BBC
-	.4byte 0xe
-	.4byte 0x9
-	.4byte RustboroCity_Flat2_1F_MapBorder
-	.4byte RustboroCity_Flat2_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-RustboroCity_Flat2_2F_MapBorder: @ 8456BD4
-	.incbin "data/maps/RustboroCity_Flat2_2F/border.bin"
-
-	.align 2
-RustboroCity_Flat2_2F_MapBlockdata: @ 8456BDC
-	.incbin "data/maps/RustboroCity_Flat2_2F/map.bin"
-
-	.align 2
-RustboroCity_Flat2_2F_MapAttributes: @ 8456CD8
-	.4byte 0xe
-	.4byte 0x9
-	.4byte RustboroCity_Flat2_2F_MapBorder
-	.4byte RustboroCity_Flat2_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-RustboroCity_Flat2_3F_MapBorder: @ 8456CF0
-	.incbin "data/maps/RustboroCity_Flat2_3F/border.bin"
-
-	.align 2
-RustboroCity_Flat2_3F_MapBlockdata: @ 8456CF8
-	.incbin "data/maps/RustboroCity_Flat2_3F/map.bin"
-
-	.align 2
-RustboroCity_Flat2_3F_MapAttributes: @ 8456DF4
-	.4byte 0xe
-	.4byte 0x9
-	.4byte RustboroCity_Flat2_3F_MapBorder
-	.4byte RustboroCity_Flat2_3F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-SootopolisCity_LotadAndSeedotHouse_MapBorder: @ 8456E0C
-	.incbin "data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin"
-
-	.align 2
-SootopolisCity_LotadAndSeedotHouse_MapBlockdata: @ 8456E14
-	.incbin "data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin"
-
-	.align 2
-SootopolisCity_LotadAndSeedotHouse_MapAttributes: @ 8456E84
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_LotadAndSeedotHouse_MapBorder
-	.4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-EverGrandeCity_HallOfFame_MapBorder: @ 8456E9C
-	.incbin "data/maps/EverGrandeCity_HallOfFame/border.bin"
-
-	.align 2
-EverGrandeCity_HallOfFame_MapBlockdata: @ 8456EA4
-	.incbin "data/maps/EverGrandeCity_HallOfFame/map.bin"
-
-	.align 2
-EverGrandeCity_HallOfFame_MapAttributes: @ 84570A4
-	.4byte 0xf
-	.4byte 0x11
-	.4byte EverGrandeCity_HallOfFame_MapBorder
-	.4byte EverGrandeCity_HallOfFame_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-	.align 2
-LilycoveCity_CoveLilyMotel_1F_MapBorder: @ 84570BC
-	.incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin"
-
-	.align 2
-LilycoveCity_CoveLilyMotel_1F_MapBlockdata: @ 84570C4
-	.incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin"
-
-	.align 2
-LilycoveCity_CoveLilyMotel_1F_MapAttributes: @ 845719C
-	.4byte 0xc
-	.4byte 0x9
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapBorder
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-LilycoveCity_CoveLilyMotel_2F_MapBorder: @ 84571B4
-	.incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin"
-
-	.align 2
-LilycoveCity_CoveLilyMotel_2F_MapBlockdata: @ 84571BC
-	.incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin"
-
-	.align 2
-LilycoveCity_CoveLilyMotel_2F_MapAttributes: @ 8457294
-	.4byte 0xc
-	.4byte 0x9
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapBorder
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-Route124_DivingTreasureHuntersHouse_MapBorder: @ 84572AC
-	.incbin "data/maps/Route124_DivingTreasureHuntersHouse/border.bin"
-
-	.align 2
-Route124_DivingTreasureHuntersHouse_MapBlockdata: @ 84572B4
-	.incbin "data/maps/Route124_DivingTreasureHuntersHouse/map.bin"
-
-	.align 2
-Route124_DivingTreasureHuntersHouse_MapAttributes: @ 8457368
-	.4byte 0xa
-	.4byte 0x9
-	.4byte Route124_DivingTreasureHuntersHouse_MapBorder
-	.4byte Route124_DivingTreasureHuntersHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-MtPyre_Exterior_MapBorder: @ 8457380
-	.incbin "data/maps/MtPyre_Exterior/border.bin"
-
-	.align 2
-MtPyre_Exterior_MapBlockdata: @ 8457388
-	.incbin "data/maps/MtPyre_Exterior/map.bin"
-
-	.align 2
-MtPyre_Exterior_MapAttributes: @ 84582AC
-	.4byte 0x26
-	.4byte 0x33
-	.4byte MtPyre_Exterior_MapBorder
-	.4byte MtPyre_Exterior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-MtPyre_Summit_MapBorder: @ 84582C4
-	.incbin "data/maps/MtPyre_Summit/border.bin"
-
-	.align 2
-MtPyre_Summit_MapBlockdata: @ 84582CC
-	.incbin "data/maps/MtPyre_Summit/map.bin"
-
-	.align 2
-MtPyre_Summit_MapAttributes: @ 8459140
-	.4byte 0x32
-	.4byte 0x25
-	.4byte MtPyre_Summit_MapBorder
-	.4byte MtPyre_Summit_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-SealedChamber_InnerRoom_MapBorder: @ 8459158
-	.incbin "data/maps/SealedChamber_InnerRoom/border.bin"
-
-	.align 2
-SealedChamber_InnerRoom_MapBlockdata: @ 8459160
-	.incbin "data/maps/SealedChamber_InnerRoom/map.bin"
-
-	.align 2
-SealedChamber_InnerRoom_MapAttributes: @ 8459528
-	.4byte 0x15
-	.4byte 0x17
-	.4byte SealedChamber_InnerRoom_MapBorder
-	.4byte SealedChamber_InnerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-MossdeepCity_GameCorner_1F_MapBorder: @ 8459540
-	.incbin "data/maps/MossdeepCity_GameCorner_1F/border.bin"
-
-	.align 2
-MossdeepCity_GameCorner_1F_MapBlockdata: @ 8459548
-	.incbin "data/maps/MossdeepCity_GameCorner_1F/map.bin"
-
-	.align 2
-MossdeepCity_GameCorner_1F_MapAttributes: @ 8459638
-	.4byte 0xc
-	.4byte 0xa
-	.4byte MossdeepCity_GameCorner_1F_MapBorder
-	.4byte MossdeepCity_GameCorner_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MossdeepGameCorner
-
-	.align 2
-MossdeepCity_GameCorner_B1F_MapBorder: @ 8459650
-	.incbin "data/maps/MossdeepCity_GameCorner_B1F/border.bin"
-
-	.align 2
-MossdeepCity_GameCorner_B1F_MapBlockdata: @ 8459658
-	.incbin "data/maps/MossdeepCity_GameCorner_B1F/map.bin"
-
-	.align 2
-MossdeepCity_GameCorner_B1F_MapAttributes: @ 8459730
-	.4byte 0xc
-	.4byte 0x9
-	.4byte MossdeepCity_GameCorner_B1F_MapBorder
-	.4byte MossdeepCity_GameCorner_B1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-SootopolisCity_House1_MapBorder: @ 8459748
-	.incbin "data/maps/SootopolisCity_House1/border.bin"
-
-	.align 2
-SootopolisCity_House1_MapBlockdata: @ 8459750
-	.incbin "data/maps/SootopolisCity_House1/map.bin"
-
-	.align 2
-SootopolisCity_House1_MapAttributes: @ 84597C0
-SootopolisCity_House4_MapAttributes: @ 84597C0
-SootopolisCity_House7_MapAttributes: @ 84597C0
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_House1_MapBorder
-	.4byte SootopolisCity_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-SootopolisCity_House2_MapBorder: @ 84597D8
-	.incbin "data/maps/SootopolisCity_House2/border.bin"
-
-	.align 2
-SootopolisCity_House2_MapBlockdata: @ 84597E0
-	.incbin "data/maps/SootopolisCity_House2/map.bin"
-
-	.align 2
-SootopolisCity_House2_MapAttributes: @ 8459850
-SootopolisCity_House5_MapAttributes: @ 8459850
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_House2_MapBorder
-	.4byte SootopolisCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-SootopolisCity_House3_MapBorder: @ 8459868
-	.incbin "data/maps/SootopolisCity_House3/border.bin"
-
-	.align 2
-SootopolisCity_House3_MapBlockdata: @ 8459870
-	.incbin "data/maps/SootopolisCity_House3/map.bin"
-
-	.align 2
-SootopolisCity_House3_MapAttributes: @ 84598E0
-SootopolisCity_House6_MapAttributes: @ 84598E0
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_House3_MapBorder
-	.4byte SootopolisCity_House3_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-AbandonedShip_HiddenFloorRooms_MapBorder: @ 84598F8
-	.incbin "data/maps/AbandonedShip_HiddenFloorRooms/border.bin"
-
-	.align 2
-AbandonedShip_HiddenFloorRooms_MapBlockdata: @ 8459900
-	.incbin "data/maps/AbandonedShip_HiddenFloorRooms/map.bin"
-
-	.align 2
-AbandonedShip_HiddenFloorRooms_MapAttributes: @ 8459E28
-	.4byte 0x2c
-	.4byte 0xf
-	.4byte AbandonedShip_HiddenFloorRooms_MapBorder
-	.4byte AbandonedShip_HiddenFloorRooms_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideShip
-
-	.align 2
-ScorchedSlab_MapBorder: @ 8459E40
-	.incbin "data/maps/ScorchedSlab/border.bin"
-
-	.align 2
-ScorchedSlab_MapBlockdata: @ 8459E48
-	.incbin "data/maps/ScorchedSlab/map.bin"
-
-	.align 2
-ScorchedSlab_MapAttributes: @ 845A0A0
-	.4byte 0xf
-	.4byte 0x14
-	.4byte ScorchedSlab_MapBorder
-	.4byte ScorchedSlab_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-UnknownMapBorder_0845A394: @ 845A0B8
-	.incbin "data/maps/UnknownMap_0845A394/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0845A394: @ 845A0C0
-	.incbin "data/maps/UnknownMap_0845A394/map.bin"
-	
-	.align 2
-UnknownMapAttributes_0845A394: @ 845A394
-	.4byte 0x13
-	.4byte 0x13
-	.4byte UnknownMapBorder_0845A394
-	.4byte UnknownMapBlockdata_0845A394
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-RustboroCity_Flat1_1F_MapBorder: @ 845A3AC
-	.incbin "data/maps/RustboroCity_Flat1_1F/border.bin"
-
-	.align 2
-RustboroCity_Flat1_1F_MapBlockdata: @ 845A3B4
-	.incbin "data/maps/RustboroCity_Flat1_1F/map.bin"
-
-	.align 2
-RustboroCity_Flat1_1F_MapAttributes: @ 845A494
-	.4byte 0xe
-	.4byte 0x8
-	.4byte RustboroCity_Flat1_1F_MapBorder
-	.4byte RustboroCity_Flat1_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-RustboroCity_Flat1_2F_MapBorder: @ 845A4AC
-	.incbin "data/maps/RustboroCity_Flat1_2F/border.bin"
-
-	.align 2
-RustboroCity_Flat1_2F_MapBlockdata: @ 845A4B4
-	.incbin "data/maps/RustboroCity_Flat1_2F/map.bin"
-
-	.align 2
-RustboroCity_Flat1_2F_MapAttributes: @ 845A594
-	.4byte 0xe
-	.4byte 0x8
-	.4byte RustboroCity_Flat1_2F_MapBorder
-	.4byte RustboroCity_Flat1_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-EverGrandeCity_Hall4_MapBorder: @ 845A5AC
-	.incbin "data/maps/EverGrandeCity_Hall4/border.bin"
-
-	.align 2
-EverGrandeCity_Hall4_MapBlockdata: @ 845A5B4
-	.incbin "data/maps/EverGrandeCity_Hall4/map.bin"
-
-	.align 2
-EverGrandeCity_Hall4_MapAttributes: @ 845A8A0
-	.4byte 0xb
-	.4byte 0x22
-	.4byte EverGrandeCity_Hall4_MapBorder
-	.4byte EverGrandeCity_Hall4_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-	.align 2
-AquaHideout_UnusedRubyMap1_MapBorder: @ 845A8B8
-	.incbin "data/maps/AquaHideout_UnusedRubyMap1/border.bin"
-
-	.align 2
-AquaHideout_UnusedRubyMap1_MapBlockdata: @ 845A8C0
-	.incbin "data/maps/AquaHideout_UnusedRubyMap1/map.bin"
-
-	.align 2
-AquaHideout_UnusedRubyMap1_MapAttributes: @ 845AF50
-	.4byte 0x1c
-	.4byte 0x1e
-	.4byte AquaHideout_UnusedRubyMap1_MapBorder
-	.4byte AquaHideout_UnusedRubyMap1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-AquaHideout_UnusedRubyMap2_MapBorder: @ 845AF68
-	.incbin "data/maps/AquaHideout_UnusedRubyMap2/border.bin"
-
-	.align 2
-AquaHideout_UnusedRubyMap2_MapBlockdata: @ 845AF70
-	.incbin "data/maps/AquaHideout_UnusedRubyMap2/map.bin"
-
-	.align 2
-AquaHideout_UnusedRubyMap2_MapAttributes: @ 845BB10
-	.4byte 0x3e
-	.4byte 0x18
-	.4byte AquaHideout_UnusedRubyMap2_MapBorder
-	.4byte AquaHideout_UnusedRubyMap2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-AquaHideout_UnusedRubyMap3_MapBorder: @ 845BB28
-	.incbin "data/maps/AquaHideout_UnusedRubyMap3/border.bin"
-
-	.align 2
-AquaHideout_UnusedRubyMap3_MapBlockdata: @ 845BB30
-	.incbin "data/maps/AquaHideout_UnusedRubyMap3/map.bin"
-
-	.align 2
-AquaHideout_UnusedRubyMap3_MapAttributes: @ 845C190
-	.4byte 0x22
-	.4byte 0x18
-	.4byte AquaHideout_UnusedRubyMap3_MapBorder
-	.4byte AquaHideout_UnusedRubyMap3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-	.align 2
-UnknownMapBorder_0845D470: @ 845C1A8
-	.incbin "data/maps/UnknownMap_0845D470/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0845D470: @ 845C1B0
-	.incbin "data/maps/UnknownMap_0845D470/map.bin"
-	
-	.align 2
-UnknownMapAttributes_0845D470: @ 845D470
-	.4byte 0x3C
-	.4byte 0x28
-	.4byte UnknownMapBorder_0845D470
-	.4byte UnknownMapBlockdata_0845D470
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-SkyPillar_Entrance_MapBorder: @ 845D488
-	.incbin "data/maps/SkyPillar_Entrance/border.bin"
-
-	.align 2
-SkyPillar_Entrance_MapBlockdata: @ 845D490
-	.incbin "data/maps/SkyPillar_Entrance/map.bin"
-
-	.align 2
-SkyPillar_Entrance_MapAttributes: @ 845D718
-	.4byte 0x12
-	.4byte 0x12
-	.4byte SkyPillar_Entrance_MapBorder
-	.4byte SkyPillar_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-SkyPillar_Outside_MapBorder: @ 845D730
-	.incbin "data/maps/SkyPillar_Outside/border.bin"
-
-	.align 2
-SkyPillar_Outside_MapBlockdata: @ 845D738
-	.incbin "data/maps/SkyPillar_Outside/map.bin"
-
-	.align 2
-SkyPillar_Outside_MapAttributes: @ 845DC40
-	.4byte 0x1c
-	.4byte 0x17
-	.4byte SkyPillar_Outside_MapBorder
-	.4byte SkyPillar_Outside_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-SkyPillar_1F_MapBorder: @ 845DC58
-	.incbin "data/maps/SkyPillar_1F/border.bin"
-
-	.align 2
-SkyPillar_1F_MapBlockdata: @ 845DC60
-	.incbin "data/maps/SkyPillar_1F/map.bin"
-
-	.align 2
-SkyPillar_1F_MapAttributes: @ 845DDE8
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_1F_MapBorder
-	.4byte SkyPillar_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-SkyPillar_2F_MapBorder: @ 845DE00
-	.incbin "data/maps/SkyPillar_2F/border.bin"
-
-	.align 2
-SkyPillar_2F_MapBlockdata: @ 845DE08
-	.incbin "data/maps/SkyPillar_2F/map.bin"
-
-	.align 2
-SkyPillar_2F_MapAttributes: @ 845DF90
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_2F_MapBorder
-	.4byte SkyPillar_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-SkyPillar_3F_MapBorder: @ 845DFA8
-	.incbin "data/maps/SkyPillar_3F/border.bin"
-
-	.align 2
-SkyPillar_3F_MapBlockdata: @ 845DFB0
-	.incbin "data/maps/SkyPillar_3F/map.bin"
-
-	.align 2
-SkyPillar_3F_MapAttributes: @ 845E138
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_3F_MapBorder
-	.4byte SkyPillar_3F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-SkyPillar_4F_MapBorder: @ 845E150
-	.incbin "data/maps/SkyPillar_4F/border.bin"
-
-	.align 2
-SkyPillar_4F_MapBlockdata: @ 845E158
-	.incbin "data/maps/SkyPillar_4F/map.bin"
-
-	.align 2
-SkyPillar_4F_MapAttributes: @ 845E2E0
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_4F_MapBorder
-	.4byte SkyPillar_4F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-UnknownMapBorder_0845ECB4: @ 845E2F8
-	.incbin "data/maps/UnknownMap_0845ECB4/border.bin"
-	
-	.align 2
-UnknownMapBlockdata_0845ECB4: @ 845E300
-	.incbin "data/maps/UnknownMap_0845ECB4/map.bin"
-	
-	.align 2
-UnknownMapAttributes_0845ECB4: @ 845ECB4
-	.4byte 0x1B
-	.4byte 0x2E
-	.4byte UnknownMapBorder_0845ECB4
-	.4byte UnknownMapBlockdata_0845ECB4
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-MossdeepCity_StevensHouse_MapBorder: @ 845ECCC
-	.incbin "data/maps/MossdeepCity_StevensHouse/border.bin"
-
-	.align 2
-MossdeepCity_StevensHouse_MapBlockdata: @ 845ECD4
-	.incbin "data/maps/MossdeepCity_StevensHouse/map.bin"
-
-	.align 2
-MossdeepCity_StevensHouse_MapAttributes: @ 845ED84
-	.4byte 0xb
-	.4byte 0x8
-	.4byte MossdeepCity_StevensHouse_MapBorder
-	.4byte MossdeepCity_StevensHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-ShoalCave_LowTideIceRoom_MapBorder: @ 845ED9C
-	.incbin "data/maps/ShoalCave_LowTideIceRoom/border.bin"
-
-	.align 2
-ShoalCave_LowTideIceRoom_MapBlockdata: @ 845EDA4
-	.incbin "data/maps/ShoalCave_LowTideIceRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideIceRoom_MapAttributes: @ 845F254
-	.4byte 0x14
-	.4byte 0x1e
-	.4byte ShoalCave_LowTideIceRoom_MapBorder
-	.4byte ShoalCave_LowTideIceRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-SafariZone_RestHouse_MapBorder: @ 845F26C
-	.incbin "data/maps/SafariZone_RestHouse/border.bin"
-
-	.align 2
-SafariZone_RestHouse_MapBlockdata: @ 845F274
-	.incbin "data/maps/SafariZone_RestHouse/map.bin"
-
-	.align 2
-SafariZone_RestHouse_MapAttributes: @ 845F328
-	.4byte 0xa
-	.4byte 0x9
-	.4byte SafariZone_RestHouse_MapBorder
-	.4byte SafariZone_RestHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-	.align 2
-SkyPillar_5F_MapBorder: @ 845F340
-	.incbin "data/maps/SkyPillar_5F/border.bin"
-
-	.align 2
-SkyPillar_5F_MapBlockdata: @ 845F348
-	.incbin "data/maps/SkyPillar_5F/map.bin"
-
-	.align 2
-SkyPillar_5F_MapAttributes: @ 845F4D0
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_5F_MapBorder
-	.4byte SkyPillar_5F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-SkyPillar_Top_MapBorder: @ 845F4E8
-	.incbin "data/maps/SkyPillar_Top/border.bin"
-
-	.align 2
-SkyPillar_Top_MapBlockdata: @ 845F4F0
-	.incbin "data/maps/SkyPillar_Top/map.bin"
-
-	.align 2
-SkyPillar_Top_MapAttributes: @ 845FA00
-	.4byte 0x1b
-	.4byte 0x18
-	.4byte SkyPillar_Top_MapBorder
-	.4byte SkyPillar_Top_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-BattleFrontier_BattleDomeLobby_MapBorder: @ 845FA18
-	.incbin "data/maps/BattleFrontier_BattleDomeLobby/border.bin"
-
-	.align 2
-BattleFrontier_BattleDomeLobby_MapBlockdata: @ 845FA20
-	.incbin "data/maps/BattleFrontier_BattleDomeLobby/map.bin"
-
-	.align 2
-BattleFrontier_BattleDomeLobby_MapAttributes: @ 845FD30
-	.4byte 0x17
-	.4byte 0x11
-	.4byte BattleFrontier_BattleDomeLobby_MapBorder
-	.4byte BattleFrontier_BattleDomeLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleDome
-
-	.align 2
-BattleFrontier_BattleDomeCorridor_MapBorder: @ 845FD48
-	.incbin "data/maps/BattleFrontier_BattleDomeCorridor/border.bin"
-
-	.align 2
-BattleFrontier_BattleDomeCorridor_MapBlockdata: @ 845FD50
-	.incbin "data/maps/BattleFrontier_BattleDomeCorridor/map.bin"
-
-	.align 2
-BattleFrontier_BattleDomeCorridor_MapAttributes: @ 845FFF0
-	.4byte 0x30
-	.4byte 0x7
-	.4byte BattleFrontier_BattleDomeCorridor_MapBorder
-	.4byte BattleFrontier_BattleDomeCorridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleDome
-
-	.align 2
-BattleFrontier_BattleDomePreBattleRoom_MapBorder: @ 8460008
-	.incbin "data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin"
-
-	.align 2
-BattleFrontier_BattleDomePreBattleRoom_MapBlockdata: @ 8460010
-	.incbin "data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattleDomePreBattleRoom_MapAttributes: @ 84600A0
-	.4byte 0x9
-	.4byte 0x8
-	.4byte BattleFrontier_BattleDomePreBattleRoom_MapBorder
-	.4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleDome
-
-	.align 2
-BattleFrontier_BattleDomeBattleRoom_MapBorder: @ 84600B8
-	.incbin "data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin"
-
-	.align 2
-BattleFrontier_BattleDomeBattleRoom_MapBlockdata: @ 84600C0
-	.incbin "data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattleDomeBattleRoom_MapAttributes: @ 8460250
-	.4byte 0x14
-	.4byte 0xa
-	.4byte BattleFrontier_BattleDomeBattleRoom_MapBorder
-	.4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleDome
-
-	.align 2
-MagmaHideout_1F_MapBorder: @ 8460268
-	.incbin "data/maps/MagmaHideout_1F/border.bin"
-
-	.align 2
-MagmaHideout_1F_MapBlockdata: @ 8460270
-	.incbin "data/maps/MagmaHideout_1F/map.bin"
-
-	.align 2
-MagmaHideout_1F_MapAttributes: @ 8460D6C
-	.4byte 0x25
-	.4byte 0x26
-	.4byte MagmaHideout_1F_MapBorder
-	.4byte MagmaHideout_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-	.align 2
-MagmaHideout_2F_1R_MapBorder: @ 8460D84
-	.incbin "data/maps/MagmaHideout_2F_1R/border.bin"
-
-	.align 2
-MagmaHideout_2F_1R_MapBlockdata: @ 8460D8C
-	.incbin "data/maps/MagmaHideout_2F_1R/map.bin"
-
-	.align 2
-MagmaHideout_2F_1R_MapAttributes: @ 846179C
-	.4byte 0x21
-	.4byte 0x27
-	.4byte MagmaHideout_2F_1R_MapBorder
-	.4byte MagmaHideout_2F_1R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-	.align 2
-MagmaHideout_2F_2R_MapBorder: @ 84617B4
-	.incbin "data/maps/MagmaHideout_2F_2R/border.bin"
-
-	.align 2
-MagmaHideout_2F_2R_MapBlockdata: @ 84617BC
-	.incbin "data/maps/MagmaHideout_2F_2R/map.bin"
-
-	.align 2
-MagmaHideout_2F_2R_MapAttributes: @ 8462274
-	.4byte 0x31
-	.4byte 0x1c
-	.4byte MagmaHideout_2F_2R_MapBorder
-	.4byte MagmaHideout_2F_2R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-	.align 2
-MagmaHideout_3F_1R_MapBorder: @ 846228C
-	.incbin "data/maps/MagmaHideout_3F_1R/border.bin"
-
-	.align 2
-MagmaHideout_3F_1R_MapBlockdata: @ 8462294
-	.incbin "data/maps/MagmaHideout_3F_1R/map.bin"
-
-	.align 2
-MagmaHideout_3F_1R_MapAttributes: @ 84627D4
-	.4byte 0x1c
-	.4byte 0x18
-	.4byte MagmaHideout_3F_1R_MapBorder
-	.4byte MagmaHideout_3F_1R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-	.align 2
-MagmaHideout_3F_2R_MapBorder: @ 84627EC
-	.incbin "data/maps/MagmaHideout_3F_2R/border.bin"
-
-	.align 2
-MagmaHideout_3F_2R_MapBlockdata: @ 84627F4
-	.incbin "data/maps/MagmaHideout_3F_2R/map.bin"
-
-	.align 2
-MagmaHideout_3F_2R_MapAttributes: @ 8462B24
-	.4byte 0x18
-	.4byte 0x11
-	.4byte MagmaHideout_3F_2R_MapBorder
-	.4byte MagmaHideout_3F_2R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-	.align 2
-MagmaHideout_4F_MapBorder: @ 8462B3C
-	.incbin "data/maps/MagmaHideout_4F/border.bin"
-
-	.align 2
-MagmaHideout_4F_MapBlockdata: @ 8462B44
-	.incbin "data/maps/MagmaHideout_4F/map.bin"
-
-	.align 2
-MagmaHideout_4F_MapAttributes: @ 846382C
-	.4byte 0x3b
-	.4byte 0x1c
-	.4byte MagmaHideout_4F_MapBorder
-	.4byte MagmaHideout_4F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-	.align 2
-BattleFrontier_BattlePalaceLobby_MapBorder: @ 8463844
-	.incbin "data/maps/BattleFrontier_BattlePalaceLobby/border.bin"
-
-	.align 2
-BattleFrontier_BattlePalaceLobby_MapBlockdata: @ 846384C
-	.incbin "data/maps/BattleFrontier_BattlePalaceLobby/map.bin"
-
-	.align 2
-BattleFrontier_BattlePalaceLobby_MapAttributes: @ 8463AA4
-	.4byte 0x19
-	.4byte 0xc
-	.4byte BattleFrontier_BattlePalaceLobby_MapBorder
-	.4byte BattleFrontier_BattlePalaceLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePalace
-
-	.align 2
-BattleFrontier_BattlePalaceCorridor_MapBorder: @ 8463ABC
-	.incbin "data/maps/BattleFrontier_BattlePalaceCorridor/border.bin"
-
-	.align 2
-BattleFrontier_BattlePalaceCorridor_MapBlockdata: @ 8463AC4
-	.incbin "data/maps/BattleFrontier_BattlePalaceCorridor/map.bin"
-
-	.align 2
-BattleFrontier_BattlePalaceCorridor_MapAttributes: @ 8463CA0
-	.4byte 0x11
-	.4byte 0xe
-	.4byte BattleFrontier_BattlePalaceCorridor_MapBorder
-	.4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BattlePalace
-
-	.align 2
-BattleFrontier_BattlePalaceBattleRoom_MapBorder: @ 8463CB8
-	.incbin "data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin"
-
-	.align 2
-BattleFrontier_BattlePalaceBattleRoom_MapBlockdata: @ 8463CC0
-	.incbin "data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattlePalaceBattleRoom_MapAttributes: @ 8463DEC
-	.4byte 0xf
-	.4byte 0xa
-	.4byte BattleFrontier_BattlePalaceBattleRoom_MapBorder
-	.4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BattlePalace
-
-	.align 2
-BattleFrontier_OutsideEast_MapBorder: @ 8463E04
-	.incbin "data/maps/BattleFrontier_OutsideEast/border.bin"
-
-	.align 2
-BattleFrontier_OutsideEast_MapBlockdata: @ 8463E0C
-	.incbin "data/maps/BattleFrontier_OutsideEast/map.bin"
-
-	.align 2
-BattleFrontier_OutsideEast_MapAttributes: @ 846668C
-	.4byte 0x48
-	.4byte 0x48
-	.4byte BattleFrontier_OutsideEast_MapBorder
-	.4byte BattleFrontier_OutsideEast_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BattleFrontierOutsideEast
-
-	.align 2
-BattleFrontier_BattleFactoryLobby_MapBorder: @ 84666A4
-	.incbin "data/maps/BattleFrontier_BattleFactoryLobby/border.bin"
-
-	.align 2
-BattleFrontier_BattleFactoryLobby_MapBlockdata: @ 84666AC
-	.incbin "data/maps/BattleFrontier_BattleFactoryLobby/map.bin"
-
-	.align 2
-BattleFrontier_BattleFactoryLobby_MapAttributes: @ 8466874
-	.4byte 0x13
-	.4byte 0xc
-	.4byte BattleFrontier_BattleFactoryLobby_MapBorder
-	.4byte BattleFrontier_BattleFactoryLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFactory
-
-	.align 2
-BattleFrontier_BattleFactoryPreBattleRoom_MapBorder: @ 846688C
-	.incbin "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin"
-
-	.align 2
-BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata: @ 8466894
-	.incbin "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes: @ 8466A70
-	.4byte 0x11
-	.4byte 0xe
-	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBorder
-	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFactory
-
-	.align 2
-BattleFrontier_BattleFactoryBattleRoom_MapBorder: @ 8466A88
-	.incbin "data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin"
-
-	.align 2
-BattleFrontier_BattleFactoryBattleRoom_MapBlockdata: @ 8466A90
-	.incbin "data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattleFactoryBattleRoom_MapAttributes: @ 8466BC8
-	.4byte 0xd
-	.4byte 0xc
-	.4byte BattleFrontier_BattleFactoryBattleRoom_MapBorder
-	.4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFactory
-
-	.align 2
-BattleFrontier_BattlePikeLobby_MapBorder: @ 8466BE0
-	.incbin "data/maps/BattleFrontier_BattlePikeLobby/border.bin"
-
-	.align 2
-BattleFrontier_BattlePikeLobby_MapBlockdata: @ 8466BE8
-	.incbin "data/maps/BattleFrontier_BattlePikeLobby/map.bin"
-
-	.align 2
-BattleFrontier_BattlePikeLobby_MapAttributes: @ 8466D08
-	.4byte 0xb
-	.4byte 0xd
-	.4byte BattleFrontier_BattlePikeLobby_MapBorder
-	.4byte BattleFrontier_BattlePikeLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePike
-
-	.align 2
-BattleFrontier_BattlePikeCorridor_MapBorder: @ 8466D20
-	.incbin "data/maps/BattleFrontier_BattlePikeCorridor/border.bin"
-
-	.align 2
-BattleFrontier_BattlePikeCorridor_MapBlockdata: @ 8466D28
-	.incbin "data/maps/BattleFrontier_BattlePikeCorridor/map.bin"
-
-	.align 2
-BattleFrontier_BattlePikeCorridor_MapAttributes: @ 8466E08
-	.4byte 0xe
-	.4byte 0x8
-	.4byte BattleFrontier_BattlePikeCorridor_MapBorder
-	.4byte BattleFrontier_BattlePikeCorridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePike
-
-	.align 2
-BattleFrontier_BattlePikeThreePathRoom_MapBorder: @ 8466E20
-	.incbin "data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin"
-
-	.align 2
-BattleFrontier_BattlePikeThreePathRoom_MapBlockdata: @ 8466E28
-	.incbin "data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattlePikeThreePathRoom_MapAttributes: @ 8466F48
-	.4byte 0xd
-	.4byte 0xb
-	.4byte BattleFrontier_BattlePikeThreePathRoom_MapBorder
-	.4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePike
-
-	.align 2
-BattleFrontier_BattlePikeRandomRoom1_MapBorder: @ 8466F60
-	.incbin "data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin"
-
-	.align 2
-BattleFrontier_BattlePikeRandomRoom1_MapBlockdata: @ 8466F68
-	.incbin "data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin"
-
-	.align 2
-BattleFrontier_BattlePikeRandomRoom1_MapAttributes: @ 8466FF8
-	.4byte 0x9
-	.4byte 0x8
-	.4byte BattleFrontier_BattlePikeRandomRoom1_MapBorder
-	.4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePike
-
-	.align 2
-BattleFrontier_BattlePikeRandomRoom2_MapBorder: @ 8467010
-	.incbin "data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin"
-
-	.align 2
-BattleFrontier_BattlePikeRandomRoom2_MapBlockdata: @ 8467018
-	.incbin "data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin"
-
-	.align 2
-BattleFrontier_BattlePikeRandomRoom2_MapAttributes: @ 8467068
-	.4byte 0x5
-	.4byte 0x8
-	.4byte BattleFrontier_BattlePikeRandomRoom2_MapBorder
-	.4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePike
-
-	.align 2
-BattleFrontier_BattleArenaLobby_MapBorder: @ 8467080
-	.incbin "data/maps/BattleFrontier_BattleArenaLobby/border.bin"
-
-	.align 2
-BattleFrontier_BattleArenaLobby_MapBlockdata: @ 8467088
-	.incbin "data/maps/BattleFrontier_BattleArenaLobby/map.bin"
-
-	.align 2
-BattleFrontier_BattleArenaLobby_MapAttributes: @ 8467228
-	.4byte 0x10
-	.4byte 0xd
-	.4byte BattleFrontier_BattleArenaLobby_MapBorder
-	.4byte BattleFrontier_BattleArenaLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleArena
-
-	.align 2
-BattleFrontier_BattleArenaCorridor_MapBorder: @ 8467240
-	.incbin "data/maps/BattleFrontier_BattleArenaCorridor/border.bin"
-
-	.align 2
-BattleFrontier_BattleArenaCorridor_MapBlockdata: @ 8467248
-	.incbin "data/maps/BattleFrontier_BattleArenaCorridor/map.bin"
-
-	.align 2
-BattleFrontier_BattleArenaCorridor_MapAttributes: @ 8467440
-	.4byte 0x12
-	.4byte 0xe
-	.4byte BattleFrontier_BattleArenaCorridor_MapBorder
-	.4byte BattleFrontier_BattleArenaCorridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleArena
-
-	.align 2
-BattleFrontier_BattleArenaBattleRoom_MapBorder: @ 8467458
-	.incbin "data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin"
-
-	.align 2
-BattleFrontier_BattleArenaBattleRoom_MapBlockdata: @ 8467460
-	.incbin "data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattleArenaBattleRoom_MapAttributes: @ 84675C0
-	.4byte 0x10
-	.4byte 0xb
-	.4byte BattleFrontier_BattleArenaBattleRoom_MapBorder
-	.4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleArena
-
-	.align 2
-UnknownMapBorder_08469200: @ 84675D8
-	.incbin "data/maps/UnknownMap_08469200/border.bin"
-
-	.align 2
-UnknownMapBlockdata_08469200: @ 84675E0
-	.incbin "data/maps/UnknownMap_08469200/map.bin"
-
-	.align 2
-UnknownMapAttributes_08469200: @ 8469200
-	.4byte 0x3C
-	.4byte 0x3C
-	.4byte UnknownMapBorder_08469200
-	.4byte UnknownMapBlockdata_08469200
-	.4byte gTileset_General
-	.4byte gTileset_Sootopolis
-
-	.align 2
-BattleFrontier_BattlePikeRandomRoom3_MapBorder: @ 8469218
-	.incbin "data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin"
-
-	.align 2
-BattleFrontier_BattlePikeRandomRoom3_MapBlockdata: @ 8469220
-	.incbin "data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin"
-
-	.align 2
-BattleFrontier_BattlePikeRandomRoom3_MapAttributes: @ 8469388
-	.4byte 0x9
-	.4byte 0x14
-	.4byte BattleFrontier_BattlePikeRandomRoom3_MapBorder
-	.4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePike
-
-	.align 2
-UnknownMapBorder_084693AC: @ 84693A0
-	.incbin "data/maps/UnknownMap_084693AC/border.bin"
-
-	.align 2
-UnknownMapBlockdata_084693AC: @ 84693A8
-	.incbin "data/maps/UnknownMap_084693AC/map.bin"
-
-	.align 2
-UnknownMapAttributes_084693AC: @ 84693AC
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_084693AC
-	.4byte UnknownMapBlockdata_084693AC
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePike
-
-	.align 2
-BattleFrontier_BattlePyramidLobby_MapBorder: @ 84693C4
-	.incbin "data/maps/BattleFrontier_BattlePyramidLobby/border.bin"
-
-	.align 2
-BattleFrontier_BattlePyramidLobby_MapBlockdata: @ 84693CC
-	.incbin "data/maps/BattleFrontier_BattlePyramidLobby/map.bin"
-
-	.align 2
-BattleFrontier_BattlePyramidLobby_MapAttributes: @ 84695E8
-	.4byte 0xf
-	.4byte 0x12
-	.4byte BattleFrontier_BattlePyramidLobby_MapBorder
-	.4byte BattleFrontier_BattlePyramidLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattleFrontier_BattlePyramidEmptySquare_MapBorder: @ 8469600
-	.incbin "data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin"
-
-	.align 2
-BattleFrontier_BattlePyramidEmptySquare_MapBlockdata: @ 8469608
-	.incbin "data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin"
-
-	.align 2
-BattleFrontier_BattlePyramidEmptySquare_MapAttributes: @ 8469688
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattleFrontier_BattlePyramidEmptySquare_MapBorder
-	.4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare01_MapBorder: @ 84696A0
-	.incbin "data/maps/BattlePyramidSquare01/border.bin"
-
-	.align 2
-BattlePyramidSquare01_MapBlockdata: @ 84696A8
-	.incbin "data/maps/BattlePyramidSquare01/map.bin"
-
-	.align 2
-BattlePyramidSquare01_MapAttributes: @ 8469728
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare01_MapBorder
-	.4byte BattlePyramidSquare01_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare02_MapBorder: @ 8469740
-	.incbin "data/maps/BattlePyramidSquare02/border.bin"
-
-	.align 2
-BattlePyramidSquare02_MapBlockdata: @ 8469748
-	.incbin "data/maps/BattlePyramidSquare02/map.bin"
-
-	.align 2
-BattlePyramidSquare02_MapAttributes: @ 84697C8
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare02_MapBorder
-	.4byte BattlePyramidSquare02_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare03_MapBorder: @ 84697E0
-	.incbin "data/maps/BattlePyramidSquare03/border.bin"
-
-	.align 2
-BattlePyramidSquare03_MapBlockdata: @ 84697E8
-	.incbin "data/maps/BattlePyramidSquare03/map.bin"
-
-	.align 2
-BattlePyramidSquare03_MapAttributes: @ 8469868
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare03_MapBorder
-	.4byte BattlePyramidSquare03_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare04_MapBorder: @ 8469880
-	.incbin "data/maps/BattlePyramidSquare04/border.bin"
-
-	.align 2
-BattlePyramidSquare04_MapBlockdata: @ 8469888
-	.incbin "data/maps/BattlePyramidSquare04/map.bin"
-
-	.align 2
-BattlePyramidSquare04_MapAttributes: @ 8469908
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare04_MapBorder
-	.4byte BattlePyramidSquare04_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare05_MapBorder: @ 8469920
-	.incbin "data/maps/BattlePyramidSquare05/border.bin"
-
-	.align 2
-BattlePyramidSquare05_MapBlockdata: @ 8469928
-	.incbin "data/maps/BattlePyramidSquare05/map.bin"
-
-	.align 2
-BattlePyramidSquare05_MapAttributes: @ 84699A8
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare05_MapBorder
-	.4byte BattlePyramidSquare05_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare06_MapBorder: @ 84699C0
-	.incbin "data/maps/BattlePyramidSquare06/border.bin"
-
-	.align 2
-BattlePyramidSquare06_MapBlockdata: @ 84699C8
-	.incbin "data/maps/BattlePyramidSquare06/map.bin"
-
-	.align 2
-BattlePyramidSquare06_MapAttributes: @ 8469A48
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare06_MapBorder
-	.4byte BattlePyramidSquare06_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare07_MapBorder: @ 8469A60
-	.incbin "data/maps/BattlePyramidSquare07/border.bin"
-
-	.align 2
-BattlePyramidSquare07_MapBlockdata: @ 8469A68
-	.incbin "data/maps/BattlePyramidSquare07/map.bin"
-
-	.align 2
-BattlePyramidSquare07_MapAttributes: @ 8469AE8
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare07_MapBorder
-	.4byte BattlePyramidSquare07_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare08_MapBorder: @ 8469B00
-	.incbin "data/maps/BattlePyramidSquare08/border.bin"
-
-	.align 2
-BattlePyramidSquare08_MapBlockdata: @ 8469B08
-	.incbin "data/maps/BattlePyramidSquare08/map.bin"
-
-	.align 2
-BattlePyramidSquare08_MapAttributes: @ 8469B88
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare08_MapBorder
-	.4byte BattlePyramidSquare08_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare09_MapBorder: @ 8469BA0
-	.incbin "data/maps/BattlePyramidSquare09/border.bin"
-
-	.align 2
-BattlePyramidSquare09_MapBlockdata: @ 8469BA8
-	.incbin "data/maps/BattlePyramidSquare09/map.bin"
-
-	.align 2
-BattlePyramidSquare09_MapAttributes: @ 8469C28
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare09_MapBorder
-	.4byte BattlePyramidSquare09_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare10_MapBorder: @ 8469C40
-	.incbin "data/maps/BattlePyramidSquare10/border.bin"
-
-	.align 2
-BattlePyramidSquare10_MapBlockdata: @ 8469C48
-	.incbin "data/maps/BattlePyramidSquare10/map.bin"
-
-	.align 2
-BattlePyramidSquare10_MapAttributes: @ 8469CC8
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare10_MapBorder
-	.4byte BattlePyramidSquare10_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare11_MapBorder: @ 8469CE0
-	.incbin "data/maps/BattlePyramidSquare11/border.bin"
-
-	.align 2
-BattlePyramidSquare11_MapBlockdata: @ 8469CE8
-	.incbin "data/maps/BattlePyramidSquare11/map.bin"
-
-	.align 2
-BattlePyramidSquare11_MapAttributes: @ 8469D68
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare11_MapBorder
-	.4byte BattlePyramidSquare11_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare12_MapBorder: @ 8469D80
-	.incbin "data/maps/BattlePyramidSquare12/border.bin"
-
-	.align 2
-BattlePyramidSquare12_MapBlockdata: @ 8469D88
-	.incbin "data/maps/BattlePyramidSquare12/map.bin"
-
-	.align 2
-BattlePyramidSquare12_MapAttributes: @ 8469E08
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare12_MapBorder
-	.4byte BattlePyramidSquare12_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare13_MapBorder: @ 8469E20
-	.incbin "data/maps/BattlePyramidSquare13/border.bin"
-
-	.align 2
-BattlePyramidSquare13_MapBlockdata: @ 8469E28
-	.incbin "data/maps/BattlePyramidSquare13/map.bin"
-
-	.align 2
-BattlePyramidSquare13_MapAttributes: @ 8469EA8
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare13_MapBorder
-	.4byte BattlePyramidSquare13_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare14_MapBorder: @ 8469EC0
-	.incbin "data/maps/BattlePyramidSquare14/border.bin"
-
-	.align 2
-BattlePyramidSquare14_MapBlockdata: @ 8469EC8
-	.incbin "data/maps/BattlePyramidSquare14/map.bin"
-
-	.align 2
-BattlePyramidSquare14_MapAttributes: @ 8469F48
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare14_MapBorder
-	.4byte BattlePyramidSquare14_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare15_MapBorder: @ 8469F60
-	.incbin "data/maps/BattlePyramidSquare15/border.bin"
-
-	.align 2
-BattlePyramidSquare15_MapBlockdata: @ 8469F68
-	.incbin "data/maps/BattlePyramidSquare15/map.bin"
-
-	.align 2
-BattlePyramidSquare15_MapAttributes: @ 8469FE8
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare15_MapBorder
-	.4byte BattlePyramidSquare15_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattlePyramidSquare16_MapBorder: @ 846A000
-	.incbin "data/maps/BattlePyramidSquare16/border.bin"
-
-	.align 2
-BattlePyramidSquare16_MapBlockdata: @ 846A008
-	.incbin "data/maps/BattlePyramidSquare16/map.bin"
-
-	.align 2
-BattlePyramidSquare16_MapAttributes: @ 846A088
-	.4byte 0x8
-	.4byte 0x8
-	.4byte BattlePyramidSquare16_MapBorder
-	.4byte BattlePyramidSquare16_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-BattleFrontier_BattlePyramidTop_MapBorder: @ 846A0A0
-	.incbin "data/maps/BattleFrontier_BattlePyramidTop/border.bin"
-
-	.align 2
-BattleFrontier_BattlePyramidTop_MapBlockdata: @ 846A0A8
-	.incbin "data/maps/BattleFrontier_BattlePyramidTop/map.bin"
-
-	.align 2
-BattleFrontier_BattlePyramidTop_MapAttributes: @ 846A6C4
-	.4byte 0x22
-	.4byte 0x17
-	.4byte BattleFrontier_BattlePyramidTop_MapBorder
-	.4byte BattleFrontier_BattlePyramidTop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattlePyramid
-
-	.align 2
-MagmaHideout_3F_3R_MapBorder: @ 846A6DC
-	.incbin "data/maps/MagmaHideout_3F_3R/border.bin"
-
-	.align 2
-MagmaHideout_3F_3R_MapBlockdata: @ 846A6E4
-	.incbin "data/maps/MagmaHideout_3F_3R/map.bin"
-
-	.align 2
-MagmaHideout_3F_3R_MapAttributes: @ 846AD14
-	.4byte 0x21
-	.4byte 0x18
-	.4byte MagmaHideout_3F_3R_MapBorder
-	.4byte MagmaHideout_3F_3R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-	.align 2
-MagmaHideout_2F_3R_MapBorder: @ 846AD2C
-	.incbin "data/maps/MagmaHideout_2F_3R/border.bin"
-
-	.align 2
-MagmaHideout_2F_3R_MapBlockdata: @ 846AD34
-	.incbin "data/maps/MagmaHideout_2F_3R/map.bin"
-
-	.align 2
-MagmaHideout_2F_3R_MapAttributes: @ 846B61C
-	.4byte 0x3c
-	.4byte 0x13
-	.4byte MagmaHideout_2F_3R_MapBorder
-	.4byte MagmaHideout_2F_3R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-	.align 2
-MirageTower_1F_MapBorder: @ 846B634
-	.incbin "data/maps/MirageTower_1F/border.bin"
-
-	.align 2
-MirageTower_1F_MapBlockdata: @ 846B63C
-	.incbin "data/maps/MirageTower_1F/map.bin"
-
-	.align 2
-MirageTower_1F_MapAttributes: @ 846B908
-	.4byte 0x15
-	.4byte 0x11
-	.4byte MirageTower_1F_MapBorder
-	.4byte MirageTower_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MirageTower
-
-	.align 2
-MirageTower_2F_MapBorder: @ 846B920
-	.incbin "data/maps/MirageTower_2F/border.bin"
-
-	.align 2
-MirageTower_2F_MapBlockdata: @ 846B928
-	.incbin "data/maps/MirageTower_2F/map.bin"
-
-	.align 2
-MirageTower_2F_MapAttributes: @ 846BBF4
-	.4byte 0x15
-	.4byte 0x11
-	.4byte MirageTower_2F_MapBorder
-	.4byte MirageTower_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MirageTower
-
-	.align 2
-MirageTower_3F_MapBorder: @ 846BC0C
-	.incbin "data/maps/MirageTower_3F/border.bin"
-
-	.align 2
-MirageTower_3F_MapBlockdata: @ 846BC14
-	.incbin "data/maps/MirageTower_3F/map.bin"
-
-	.align 2
-MirageTower_3F_MapAttributes: @ 846BEE0
-	.4byte 0x15
-	.4byte 0x11
-	.4byte MirageTower_3F_MapBorder
-	.4byte MirageTower_3F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MirageTower
-
-	.align 2
-FallarborTown_BattleTentLobby_MapBorder: @ 846BEF8
-	.incbin "data/maps/FallarborTown_BattleTentLobby/border.bin"
-
-	.align 2
-FallarborTown_BattleTentLobby_MapBlockdata: @ 846BF00
-	.incbin "data/maps/FallarborTown_BattleTentLobby/map.bin"
-
-	.align 2
-FallarborTown_BattleTentLobby_MapAttributes: @ 846C004
-SlateportCity_BattleTentLobby_MapAttributes: @ 846C004
-VerdanturfTown_BattleTentLobby_MapAttributes: @ 846C004
-	.4byte 0xd
-	.4byte 0xa
-	.4byte FallarborTown_BattleTentLobby_MapBorder
-	.4byte FallarborTown_BattleTentLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTent
-
-	.align 2
-FallarborTown_BattleTentCorridor_MapBorder: @ 846C01C
-	.incbin "data/maps/FallarborTown_BattleTentCorridor/border.bin"
-
-	.align 2
-FallarborTown_BattleTentCorridor_MapBlockdata: @ 846C024
-	.incbin "data/maps/FallarborTown_BattleTentCorridor/map.bin"
-
-	.align 2
-FallarborTown_BattleTentCorridor_MapAttributes: @ 846C074
-SlateportCity_BattleTentCorridor_MapAttributes: @ 846C074
-VerdanturfTown_BattleTentCorridor_MapAttributes: @ 846C074
-	.4byte 0x5
-	.4byte 0x8
-	.4byte FallarborTown_BattleTentCorridor_MapBorder
-	.4byte FallarborTown_BattleTentCorridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTent
-
-	.align 2
-FallarborTown_BattleTentBattleRoom_MapBorder: @ 846C08C
-	.incbin "data/maps/FallarborTown_BattleTentBattleRoom/border.bin"
-
-	.align 2
-FallarborTown_BattleTentBattleRoom_MapBlockdata: @ 846C094
-	.incbin "data/maps/FallarborTown_BattleTentBattleRoom/map.bin"
-
-	.align 2
-FallarborTown_BattleTentBattleRoom_MapAttributes: @ 846C148
-SlateportCity_BattleTentBattleRoom_MapAttributes: @ 846C148
-	.4byte 0xa
-	.4byte 0x9
-	.4byte FallarborTown_BattleTentBattleRoom_MapBorder
-	.4byte FallarborTown_BattleTentBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTent
-
-	.align 2
-VerdanturfTown_BattleTentBattleRoom_MapBorder: @ 846C160
-	.incbin "data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin"
-
-	.align 2
-VerdanturfTown_BattleTentBattleRoom_MapBlockdata: @ 846C168
-	.incbin "data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin"
-
-	.align 2
-VerdanturfTown_BattleTentBattleRoom_MapAttributes: @ 846C254
-	.4byte 0xd
-	.4byte 0x9
-	.4byte VerdanturfTown_BattleTentBattleRoom_MapBorder
-	.4byte VerdanturfTown_BattleTentBattleRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BattleTent
-
-	.align 2
-MirageTower_4F_MapBorder: @ 846C26C
-	.incbin "data/maps/MirageTower_4F/border.bin"
-
-	.align 2
-MirageTower_4F_MapBlockdata: @ 846C274
-	.incbin "data/maps/MirageTower_4F/map.bin"
-
-	.align 2
-MirageTower_4F_MapAttributes: @ 846C378
-	.4byte 0xd
-	.4byte 0xa
-	.4byte MirageTower_4F_MapBorder
-	.4byte MirageTower_4F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MirageTower
-
-	.align 2
-DesertUnderpass_MapBorder: @ 846C390
-	.incbin "data/maps/DesertUnderpass/border.bin"
-
-	.align 2
-DesertUnderpass_MapBlockdata: @ 846C398
-	.incbin "data/maps/DesertUnderpass/map.bin"
-
-	.align 2
-DesertUnderpass_MapAttributes: @ 846DC94
-	.4byte 0x8b
-	.4byte 0x17
-	.4byte DesertUnderpass_MapBorder
-	.4byte DesertUnderpass_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-BattleFrontier_BattleTowerMultiBattleRoom_MapBorder: @ 846DCAC
-	.incbin "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin"
-
-	.align 2
-BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata: @ 846DCB4
-	.incbin "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin"
-
-	.align 2
-BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes: @ 846DF2C
-	.4byte 0x15
-	.4byte 0xf
-	.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBorder
-	.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
-	.align 2
-BattleFrontier_BattleTowerCorridor2_MapBorder: @ 846DF44
-	.incbin "data/maps/BattleFrontier_BattleTowerCorridor2/border.bin"
-
-	.align 2
-BattleFrontier_BattleTowerCorridor2_MapBlockdata: @ 846DF4C
-	.incbin "data/maps/BattleFrontier_BattleTowerCorridor2/map.bin"
-
-	.align 2
-BattleFrontier_BattleTowerCorridor2_MapAttributes: @ 846DFF8
-	.4byte 0x11
-	.4byte 0x5
-	.4byte BattleFrontier_BattleTowerCorridor2_MapBorder
-	.4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
-	.align 2
-UnknownMapBorder_08470BD8: @ 846E010
-	.incbin "data/maps/UnknownMap_08470BD8/border.bin"
-
-	.align 2
-UnknownMapBlockdata_08470BD8: @ 846E018
-	.incbin "data/maps/UnknownMap_08470BD8/map.bin"
-
-	.align 2
-UnknownMapAttributes_08470BD8: @ 8470BD8
-	.4byte 0x28
-	.4byte 0x8C
-	.4byte UnknownMapBorder_08470BD8
-	.4byte UnknownMapBlockdata_08470BD8
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-	.align 2
-UnionRoom_MapBorder: @ 8470BF0
-	.incbin "data/maps/UnionRoom/border.bin"
-
-	.align 2
-UnionRoom_MapBlockdata: @ 8470BF8
-	.incbin "data/maps/UnionRoom/map.bin"
-
-	.align 2
-UnionRoom_MapAttributes: @ 8470D60
-	.4byte 0xf
-	.4byte 0xc
-	.4byte UnionRoom_MapBorder
-	.4byte UnionRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_UnionRoom
-
-	.align 2
-SafariZone_Northeast_MapBorder: @ 8470D78
-	.incbin "data/maps/SafariZone_Northeast/border.bin"
-
-	.align 2
-SafariZone_Northeast_MapBlockdata: @ 8470D80
-	.incbin "data/maps/SafariZone_Northeast/map.bin"
-
-	.align 2
-SafariZone_Northeast_MapAttributes: @ 8471A00
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Northeast_MapBorder
-	.4byte SafariZone_Northeast_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-	.align 2
-SafariZone_Southeast_MapBorder: @ 8471A18
-	.incbin "data/maps/SafariZone_Southeast/border.bin"
-
-	.align 2
-SafariZone_Southeast_MapBlockdata: @ 8471A20
-	.incbin "data/maps/SafariZone_Southeast/map.bin"
-
-	.align 2
-SafariZone_Southeast_MapAttributes: @ 84726A0
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Southeast_MapBorder
-	.4byte SafariZone_Southeast_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-	.align 2
-BattleFrontier_RankingHall_MapBorder: @ 84726B8
-	.incbin "data/maps/BattleFrontier_RankingHall/border.bin"
-
-	.align 2
-BattleFrontier_RankingHall_MapBlockdata: @ 84726C0
-	.incbin "data/maps/BattleFrontier_RankingHall/map.bin"
-
-	.align 2
-BattleFrontier_RankingHall_MapAttributes: @ 8472CF8
-	.4byte 0x35
-	.4byte 0xf
-	.4byte BattleFrontier_RankingHall_MapBorder
-	.4byte BattleFrontier_RankingHall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontierRankingHall
-
-	.align 2
-BattleFrontier_Lounge2_MapBorder: @ 8472D10
-	.incbin "data/maps/BattleFrontier_Lounge2/border.bin"
-
-	.align 2
-BattleFrontier_Lounge2_MapBlockdata: @ 8472D18
-	.incbin "data/maps/BattleFrontier_Lounge2/map.bin"
-
-	.align 2
-BattleFrontier_Lounge2_MapAttributes: @ 8472DE8
-BattleFrontier_Lounge5_MapAttributes: @ 8472DE8
-	.4byte 0xd
-	.4byte 0x8
-	.4byte BattleFrontier_Lounge2_MapBorder
-	.4byte BattleFrontier_Lounge2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
-	.align 2
-BattleFrontier_BattlePointExchangeServiceCorner_MapBorder: @ 8472E00
-	.incbin "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin"
-
-	.align 2
-BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata: @ 8472E08
-	.incbin "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin"
-
-	.align 2
-BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes: @ 8472F54
-	.4byte 0xf
-	.4byte 0xb
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBorder
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
-	.align 2
-BattleFrontier_ReceptionGate_MapBorder: @ 8472F6C
-	.incbin "data/maps/BattleFrontier_ReceptionGate/border.bin"
-
-	.align 2
-BattleFrontier_ReceptionGate_MapBlockdata: @ 8472F74
-	.incbin "data/maps/BattleFrontier_ReceptionGate/map.bin"
-
-	.align 2
-BattleFrontier_ReceptionGate_MapAttributes: @ 8473070
-	.4byte 0x9
-	.4byte 0xe
-	.4byte BattleFrontier_ReceptionGate_MapBorder
-	.4byte BattleFrontier_ReceptionGate_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BattleFrontier
-
-	.align 2
-ArtisanCave_B1F_MapBorder: @ 8473088
-	.incbin "data/maps/ArtisanCave_B1F/border.bin"
-
-	.align 2
-ArtisanCave_B1F_MapBlockdata: @ 8473090
-	.incbin "data/maps/ArtisanCave_B1F/map.bin"
-
-	.align 2
-ArtisanCave_B1F_MapAttributes: @ 84743F8
-	.4byte 0x2e
-	.4byte 0x36
-	.4byte ArtisanCave_B1F_MapBorder
-	.4byte ArtisanCave_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-ArtisanCave_1F_MapBorder: @ 8474410
-	.incbin "data/maps/ArtisanCave_1F/border.bin"
-
-	.align 2
-ArtisanCave_1F_MapBlockdata: @ 8474418
-	.incbin "data/maps/ArtisanCave_1F/map.bin"
-
-	.align 2
-ArtisanCave_1F_MapAttributes: @ 84747B4
-	.4byte 0x15
-	.4byte 0x16
-	.4byte ArtisanCave_1F_MapBorder
-	.4byte ArtisanCave_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-FarawayIsland_Entrance_MapBorder: @ 84747CC
-	.incbin "data/maps/FarawayIsland_Entrance/border.bin"
-
-	.align 2
-FarawayIsland_Entrance_MapBlockdata: @ 84747D4
-	.incbin "data/maps/FarawayIsland_Entrance/map.bin"
-
-	.align 2
-FarawayIsland_Entrance_MapAttributes: @ 847540C
-	.4byte 0x22
-	.4byte 0x2e
-	.4byte FarawayIsland_Entrance_MapBorder
-	.4byte FarawayIsland_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-	.align 2
-FarawayIsland_Interior_MapBorder: @ 8475424
-	.incbin "data/maps/FarawayIsland_Interior/border.bin"
-
-	.align 2
-FarawayIsland_Interior_MapBlockdata: @ 847542C
-	.incbin "data/maps/FarawayIsland_Interior/map.bin"
-
-	.align 2
-FarawayIsland_Interior_MapAttributes: @ 8475A10
-	.4byte 0x1d
-	.4byte 0x1a
-	.4byte FarawayIsland_Interior_MapBorder
-	.4byte FarawayIsland_Interior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fortree
-
-	.align 2
-BirthIsland_Exterior_MapBorder: @ 8475A28
-	.incbin "data/maps/BirthIsland_Exterior/border.bin"
-
-	.align 2
-BirthIsland_Exterior_MapBlockdata: @ 8475A30
-	.incbin "data/maps/BirthIsland_Exterior/map.bin"
-
-	.align 2
-BirthIsland_Exterior_MapAttributes: @ 8476138
-	.4byte 0x1e
-	.4byte 0x1e
-	.4byte BirthIsland_Exterior_MapBorder
-	.4byte BirthIsland_Exterior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-	.align 2
-BirthIsland_Harbor_MapBorder: @ 8476150
-	.incbin "data/maps/BirthIsland_Harbor/border.bin"
-
-	.align 2
-BirthIsland_Harbor_MapBlockdata: @ 8476158
-	.incbin "data/maps/BirthIsland_Harbor/map.bin"
-
-	.align 2
-BirthIsland_Harbor_MapAttributes: @ 8476314
-NavelRock_Harbor_MapAttributes: @ 8476314
-	.4byte 0x11
-	.4byte 0xd
-	.4byte BirthIsland_Harbor_MapBorder
-	.4byte BirthIsland_Harbor_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_IslandHarbor
-
-	.align 2
-Underwater_MarineCave_MapBorder: @ 847632C
-	.incbin "data/maps/Underwater_MarineCave/border.bin"
-
-	.align 2
-Underwater_MarineCave_MapBlockdata: @ 8476334
-	.incbin "data/maps/Underwater_MarineCave/map.bin"
-
-	.align 2
-Underwater_MarineCave_MapAttributes: @ 84764C4
-	.4byte 0x14
-	.4byte 0xa
-	.4byte Underwater_MarineCave_MapBorder
-	.4byte Underwater_MarineCave_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-	.align 2
-MarineCave_Entrance_MapBorder: @ 84764DC
-	.incbin "data/maps/MarineCave_Entrance/border.bin"
-
-	.align 2
-MarineCave_Entrance_MapBlockdata: @ 84764E4
-	.incbin "data/maps/MarineCave_Entrance/map.bin"
-
-	.align 2
-MarineCave_Entrance_MapAttributes: @ 8476804
-	.4byte 0x14
-	.4byte 0x14
-	.4byte MarineCave_Entrance_MapBorder
-	.4byte MarineCave_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-TerraCave_Entrance_MapBorder: @ 847681C
-	.incbin "data/maps/TerraCave_Entrance/border.bin"
-
-	.align 2
-TerraCave_Entrance_MapBlockdata: @ 8476824
-	.incbin "data/maps/TerraCave_Entrance/map.bin"
-
-	.align 2
-TerraCave_Entrance_MapAttributes: @ 8476B44
-	.4byte 0x14
-	.4byte 0x14
-	.4byte TerraCave_Entrance_MapBorder
-	.4byte TerraCave_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-TerraCave_End_MapBorder: @ 8476B5C
-	.incbin "data/maps/TerraCave_End/border.bin"
-
-	.align 2
-TerraCave_End_MapBlockdata: @ 8476B64
-	.incbin "data/maps/TerraCave_End/map.bin"
-
-	.align 2
-TerraCave_End_MapAttributes: @ 84771B8
-	.4byte 0x1b
-	.4byte 0x1e
-	.4byte TerraCave_End_MapBorder
-	.4byte TerraCave_End_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-Underwater6_MapBorder: @ 84771D0
-	.incbin "data/maps/Underwater6/border.bin"
-
-	.align 2
-Underwater6_MapBlockdata: @ 84771D8
-	.incbin "data/maps/Underwater6/map.bin"
-
-	.align 2
-Underwater6_MapAttributes: @ 8478AD8
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Underwater6_MapBorder
-	.4byte Underwater6_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-	.align 2
-Underwater7_MapBorder: @ 8478AF0
-	.incbin "data/maps/Underwater7/border.bin"
-
-	.align 2
-Underwater7_MapBlockdata: @ 8478AF8
-	.incbin "data/maps/Underwater7/map.bin"
-
-	.align 2
-Underwater7_MapAttributes: @ 847A3F8
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Underwater7_MapBorder
-	.4byte Underwater7_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-	.align 2
-Underwater5_MapBorder: @ 847A410
-	.incbin "data/maps/Underwater5/border.bin"
-
-	.align 2
-Underwater5_MapBlockdata: @ 847A418
-	.incbin "data/maps/Underwater5/map.bin"
-
-	.align 2
-Underwater5_MapAttributes: @ 847BD18
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Underwater5_MapBorder
-	.4byte Underwater5_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-	.align 2
-MarineCave_End_MapBorder: @ 847BD30
-	.incbin "data/maps/MarineCave_End/border.bin"
-
-	.align 2
-MarineCave_End_MapBlockdata: @ 847BD38
-	.incbin "data/maps/MarineCave_End/map.bin"
-
-	.align 2
-MarineCave_End_MapAttributes: @ 847C38C
-	.4byte 0x1b
-	.4byte 0x1e
-	.4byte MarineCave_End_MapBorder
-	.4byte MarineCave_End_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-TrainerHill_Entrance_MapBorder: @ 847C3A4
-	.incbin "data/maps/TrainerHill_Entrance/border.bin"
-
-	.align 2
-TrainerHill_Entrance_MapBlockdata: @ 847C3AC
-	.incbin "data/maps/TrainerHill_Entrance/map.bin"
-
-	.align 2
-TrainerHill_Entrance_MapAttributes: @ 847C634
-	.4byte 0x13
-	.4byte 0x11
-	.4byte TrainerHill_Entrance_MapBorder
-	.4byte TrainerHill_Entrance_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrainerHill
-
-	.align 2
-TrainerHill_1F_MapBorder: @ 847C64C
-	.incbin "data/maps/TrainerHill_1F/border.bin"
-
-	.align 2
-TrainerHill_1F_MapBlockdata: @ 847C654
-	.incbin "data/maps/TrainerHill_1F/map.bin"
-
-	.align 2
-TrainerHill_1F_MapAttributes: @ 847C8F4
-	.4byte 0x10
-	.4byte 0x15
-	.4byte TrainerHill_1F_MapBorder
-	.4byte TrainerHill_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrainerHill
-
-	.align 2
-TrainerHill_2F_MapBorder: @ 847C90C
-	.incbin "data/maps/TrainerHill_2F/border.bin"
-
-	.align 2
-TrainerHill_2F_MapBlockdata: @ 847C914
-	.incbin "data/maps/TrainerHill_2F/map.bin"
-
-	.align 2
-TrainerHill_2F_MapAttributes: @ 847CBB4
-	.4byte 0x10
-	.4byte 0x15
-	.4byte TrainerHill_2F_MapBorder
-	.4byte TrainerHill_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrainerHill
-
-	.align 2
-TrainerHill_3F_MapBorder: @ 847CBCC
-	.incbin "data/maps/TrainerHill_3F/border.bin"
-
-	.align 2
-TrainerHill_3F_MapBlockdata: @ 847CBD4
-	.incbin "data/maps/TrainerHill_3F/map.bin"
-
-	.align 2
-TrainerHill_3F_MapAttributes: @ 847CE74
-	.4byte 0x10
-	.4byte 0x15
-	.4byte TrainerHill_3F_MapBorder
-	.4byte TrainerHill_3F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrainerHill
-
-	.align 2
-TrainerHill_4F_MapBorder: @ 847CE8C
-	.incbin "data/maps/TrainerHill_4F/border.bin"
-
-	.align 2
-TrainerHill_4F_MapBlockdata: @ 847CE94
-	.incbin "data/maps/TrainerHill_4F/map.bin"
-
-	.align 2
-TrainerHill_4F_MapAttributes: @ 847D134
-	.4byte 0x10
-	.4byte 0x15
-	.4byte TrainerHill_4F_MapBorder
-	.4byte TrainerHill_4F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrainerHill
-
-	.align 2
-TrainerHill_Roof_MapBorder: @ 847D14C
-	.incbin "data/maps/TrainerHill_Roof/border.bin"
-
-	.align 2
-TrainerHill_Roof_MapBlockdata: @ 847D154
-	.incbin "data/maps/TrainerHill_Roof/map.bin"
-
-	.align 2
-TrainerHill_Roof_MapAttributes: @ 847D474
-	.4byte 0x19
-	.4byte 0x10
-	.4byte TrainerHill_Roof_MapBorder
-	.4byte TrainerHill_Roof_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrainerHill
-
-	.align 2
-AlteringCave_MapBorder: @ 847D48C
-	.incbin "data/maps/AlteringCave/border.bin"
-
-	.align 2
-AlteringCave_MapBlockdata: @ 847D494
-	.incbin "data/maps/AlteringCave/map.bin"
-
-	.align 2
-AlteringCave_MapAttributes: @ 847DA94
-	.4byte 0x20
-	.4byte 0x18
-	.4byte AlteringCave_MapBorder
-	.4byte AlteringCave_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-	.align 2
-NavelRock_Exterior_MapBorder: @ 847DAAC
-	.incbin "data/maps/NavelRock_Exterior/border.bin"
-
-	.align 2
-NavelRock_Exterior_MapBlockdata: @ 847DAB4
-	.incbin "data/maps/NavelRock_Exterior/map.bin"
-
-	.align 2
-NavelRock_Exterior_MapAttributes: @ 847DEA4
-	.4byte 0x15
-	.4byte 0x18
-	.4byte NavelRock_Exterior_MapBorder
-	.4byte NavelRock_Exterior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-	.align 2
-NavelRock_Entrance_MapBorder: @ 847DEBC
-	.incbin "data/maps/NavelRock_Entrance/border.bin"
-
-	.align 2
-NavelRock_Entrance_MapBlockdata: @ 847DEC4
-	.incbin "data/maps/NavelRock_Entrance/map.bin"
-
-	.align 2
-NavelRock_Entrance_MapAttributes: @ 847E404
-	.4byte 0x15
-	.4byte 0x20
-	.4byte NavelRock_Entrance_MapBorder
-	.4byte NavelRock_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_NavelRock
-
-	.align 2
-NavelRock_Top_MapBorder: @ 847E41C
-	.incbin "data/maps/NavelRock_Top/border.bin"
-
-	.align 2
-NavelRock_Top_MapBlockdata: @ 847E424
-	.incbin "data/maps/NavelRock_Top/map.bin"
-
-	.align 2
-NavelRock_Top_MapAttributes: @ 847E99C
-	.4byte 0x19
-	.4byte 0x1c
-	.4byte NavelRock_Top_MapBorder
-	.4byte NavelRock_Top_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_NavelRock
-
-	.align 2
-NavelRock_Bottom_MapBorder: @ 847E9B4
-	.incbin "data/maps/NavelRock_Bottom/border.bin"
-
-	.align 2
-NavelRock_Bottom_MapBlockdata: @ 847E9BC
-	.incbin "data/maps/NavelRock_Bottom/map.bin"
-
-	.align 2
-NavelRock_Bottom_MapAttributes: @ 847ED84
-	.4byte 0x16
-	.4byte 0x16
-	.4byte NavelRock_Bottom_MapBorder
-	.4byte NavelRock_Bottom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_NavelRock
-
-	.align 2
-NavelRock_Up1_MapBorder: @ 847ED9C
-	.incbin "data/maps/NavelRock_Up1/border.bin"
-
-	.align 2
-NavelRock_Up1_MapBlockdata: @ 847EDA4
-	.incbin "data/maps/NavelRock_Up1/map.bin"
-
-	.align 2
-NavelRock_Down01_MapAttributes: @ 847EE34
-NavelRock_Down03_MapAttributes: @ 847EE34
-NavelRock_Down05_MapAttributes: @ 847EE34
-NavelRock_Down07_MapAttributes: @ 847EE34
-NavelRock_Down09_MapAttributes: @ 847EE34
-NavelRock_Down11_MapAttributes: @ 847EE34
-NavelRock_Up1_MapAttributes: @ 847EE34
-NavelRock_Up3_MapAttributes: @ 847EE34
-	.4byte 0x9
-	.4byte 0x8
-	.4byte NavelRock_Up1_MapBorder
-	.4byte NavelRock_Up1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_NavelRock
-
-	.align 2
-NavelRock_Up2_MapBorder: @ 847EE4C
-	.incbin "data/maps/NavelRock_Up2/border.bin"
-
-	.align 2
-NavelRock_Up2_MapBlockdata: @ 847EE54
-	.incbin "data/maps/NavelRock_Up2/map.bin"
-
-	.align 2
-NavelRock_Down02_MapAttributes: @ 847EEE4
-NavelRock_Down04_MapAttributes: @ 847EEE4
-NavelRock_Down06_MapAttributes: @ 847EEE4
-NavelRock_Down08_MapAttributes: @ 847EEE4
-NavelRock_Down10_MapAttributes: @ 847EEE4
-NavelRock_Up2_MapAttributes: @ 847EEE4
-NavelRock_Up4_MapAttributes: @ 847EEE4
-	.4byte 0x9
-	.4byte 0x8
-	.4byte NavelRock_Up2_MapBorder
-	.4byte NavelRock_Up2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_NavelRock
-
-	.align 2
-NavelRock_B1F_MapBorder: @ 847EEFC
-	.incbin "data/maps/NavelRock_B1F/border.bin"
-
-	.align 2
-NavelRock_B1F_MapBlockdata: @ 847EF04
-	.incbin "data/maps/NavelRock_B1F/map.bin"
-
-	.align 2
-NavelRock_B1F_MapAttributes: @ 847F100
-	.4byte 0x17
-	.4byte 0xb
-	.4byte NavelRock_B1F_MapBorder
-	.4byte NavelRock_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_NavelRock
-
-	.align 2
-NavelRock_Fork_MapBorder: @ 847F118
-	.incbin "data/maps/NavelRock_Fork/border.bin"
-
-	.align 2
-NavelRock_Fork_MapBlockdata: @ 847F120
-	.incbin "data/maps/NavelRock_Fork/map.bin"
-
-	.align 2
-NavelRock_Fork_MapAttributes: @ 8480344
-	.4byte 0x1b
-	.4byte 0x56
-	.4byte NavelRock_Fork_MapBorder
-	.4byte NavelRock_Fork_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_NavelRock
-
-	.align 2
-BattleFrontier_Lounge1_MapBorder: @ 848035C
-	.incbin "data/maps/BattleFrontier_Lounge1/border.bin"
-
-	.align 2
-BattleFrontier_Lounge1_MapBlockdata: @ 8480364
-	.incbin "data/maps/BattleFrontier_Lounge1/map.bin"
-
-	.align 2
-BattleFrontier_Lounge1_MapAttributes: @ 8480418
-BattleFrontier_Lounge3_MapAttributes: @ 8480418
-BattleFrontier_Lounge4_MapAttributes: @ 8480418
-BattleFrontier_Lounge6_MapAttributes: @ 8480418
-BattleFrontier_Lounge7_MapAttributes: @ 8480418
-BattleFrontier_Lounge8_MapAttributes: @ 8480418
-BattleFrontier_Lounge9_MapAttributes: @ 8480418
-	.4byte 0x9
-	.4byte 0xa
-	.4byte BattleFrontier_Lounge1_MapBorder
-	.4byte BattleFrontier_Lounge1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
-	.align 2
-BattleFrontier_ScottsHouse_MapBorder: @ 8480430
-	.incbin "data/maps/BattleFrontier_ScottsHouse/border.bin"
-
-	.align 2
-BattleFrontier_ScottsHouse_MapBlockdata: @ 8480438
-	.incbin "data/maps/BattleFrontier_ScottsHouse/map.bin"
-
-	.align 2
-BattleFrontier_ScottsHouse_MapAttributes: @ 8480498
-	.4byte 0x6
-	.4byte 0x8
-	.4byte BattleFrontier_ScottsHouse_MapBorder
-	.4byte BattleFrontier_ScottsHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleFrontier
-
-	.align 2
-MeteorFalls_StevensCave_MapBorder: @ 84804B0
-	.incbin "data/maps/MeteorFalls_StevensCave/border.bin"
-
-	.align 2
-MeteorFalls_StevensCave_MapBlockdata: @ 84804B8
-	.incbin "data/maps/MeteorFalls_StevensCave/map.bin"
-
-	.align 2
-MeteorFalls_StevensCave_MapAttributes: @ 8480C38
-	.4byte 0x1e
-	.4byte 0x20
-	.4byte MeteorFalls_StevensCave_MapBorder
-	.4byte MeteorFalls_StevensCave_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
-	.align 2
-UnknownMapBorder_08480DAC: @ 8480C50
-	.incbin "data/maps/UnknownMap_08480DAC/border.bin"
-
-	.align 2
-UnknownMapBlockdata_08480DAC: @ 8480C58
-	.incbin "data/maps/UnknownMap_08480DAC/map.bin"
-
-	.align 2
-UnknownMapAttributes_08480DAC: @ 8480DAC
-	.4byte 0xD
-	.4byte 0xD
-	.4byte UnknownMapBorder_08480DAC
-	.4byte UnknownMapBlockdata_08480DAC
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
-	.align 2
-UnknownMapBorder_08480F54: @ 8480DC4
-	.incbin "data/maps/UnknownMap_08480F54/border.bin"
-
-	.align 2
-UnknownMapBlockdata_08480F54: @ 8480DCC
-	.incbin "data/maps/UnknownMap_08480F54/map.bin"
-
-	.align 2
-UnknownMapAttributes_08480F54: @ 8480F54
-	.4byte 0xE
-	.4byte 0xE
-	.4byte UnknownMapBorder_08480F54
-	.4byte UnknownMapBlockdata_08480F54
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-UnknownMapBorder_084810FC: @ 8480F6C
-	.incbin "data/maps/UnknownMap_084810FC/border.bin"
-
-	.align 2
-UnknownMapBlockdata_084810FC: @ 8480F74
-	.incbin "data/maps/UnknownMap_084810FC/map.bin"
-
-	.align 2
-UnknownMapAttributes_084810FC: @ 84810FC
-	.4byte 0xE
-	.4byte 0xE
-	.4byte UnknownMapBorder_084810FC
-	.4byte UnknownMapBlockdata_084810FC
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-UnknownMapBorder_084812A4: @ 8480F6C
-	.incbin "data/maps/UnknownMap_084812A4/border.bin"
-
-	.align 2
-UnknownMapBlockdata_084812A4: @ 8480F74
-	.incbin "data/maps/UnknownMap_084812A4/map.bin"
-
-	.align 2
-UnknownMapAttributes_084812A4: @ 84812A4
-	.4byte 0xE
-	.4byte 0xE
-	.4byte UnknownMapBorder_084812A4
-	.4byte UnknownMapBlockdata_084812A4
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-UnknownMapBorder_0848144C: @ 848144C
-	.incbin "data/maps/UnknownMap_0848144C/border.bin"
-
-	.align 2
-UnknownMapBlockdata_0848144C: @ 848144C
-	.incbin "data/maps/UnknownMap_0848144C/map.bin"
-
-	.align 2
-UnknownMapAttributes_0848144C: @ 848144C
-	.4byte 0xE
-	.4byte 0xE
-	.4byte UnknownMapBorder_0848144C
-	.4byte UnknownMapBlockdata_0848144C
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-UnknownMapBorder_084815F4: @ 848144C
-	.incbin "data/maps/UnknownMap_084815F4/border.bin"
-
-	.align 2
-UnknownMapBlockdata_084815F4: @ 848144C
-	.incbin "data/maps/UnknownMap_084815F4/map.bin"
-
-	.align 2
-UnknownMapAttributes_084815F4: @ 84815F4
-	.4byte 0xE
-	.4byte 0xE
-	.4byte UnknownMapBorder_084815F4
-	.4byte UnknownMapBlockdata_084815F4
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-UnknownMapBorder_08481B24: @ 848160C
-	.incbin "data/maps/UnknownMap_08481B24/border.bin"
-
-	.align 2
-UnknownMapBlockdata_08481B24: @ 8481614
-	.incbin "data/maps/UnknownMap_08481B24/map.bin"
-
-	.align 2
-UnknownMapAttributes_08481B24: @ 8481B24
-	.4byte 0x1B
-	.4byte 0x18
-	.4byte UnknownMapBorder_08481B24
-	.4byte UnknownMapBlockdata_08481B24
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-	.align 2
-SootopolisCity_MysteryEventsHouse_1F_MapBorder: @ 8481B3C
-	.incbin "data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin"
-
-	.align 2
-SootopolisCity_MysteryEventsHouse_1F_MapBlockdata: @ 8481B44
-	.incbin "data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin"
-
-	.align 2
-SootopolisCity_MysteryEventsHouse_1F_MapAttributes: @ 8481BF4
-	.4byte 0xb
-	.4byte 0x8
-	.4byte SootopolisCity_MysteryEventsHouse_1F_MapBorder
-	.4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MysteryEventsHouse
-
-	.align 2
-SootopolisCity_MysteryEventsHouse_B1F_MapBorder: @ 8481C0C
-	.incbin "data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin"
-
-	.align 2
-SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata: @ 8481C14
-	.incbin "data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin"
-
-	.align 2
-SootopolisCity_MysteryEventsHouse_B1F_MapAttributes: @ 8481CEC
-	.4byte 0xc
-	.4byte 0x9
-	.4byte SootopolisCity_MysteryEventsHouse_B1F_MapBorder
-	.4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MysteryEventsHouse
-
-	.align 2
-UnknownMapBorder_08481DBC: @ 8481D04
-	.incbin "data/maps/UnknownMap_08481DBC/border.bin"
-
-	.align 2
-UnknownMapBlockdata_08481DBC: @ 8481D0C
-	.incbin "data/maps/UnknownMap_08481DBC/map.bin"
-
-	.align 2
-UnknownMapAttributes_08481DBC: @ 8481DBC
-	.4byte 0xB
-	.4byte 0x8
-	.4byte UnknownMapBorder_08481DBC
-	.4byte UnknownMapBlockdata_08481DBC
-	.4byte gTileset_Building
-	.4byte gTileset_MysteryEventsHouse
diff --git a/data/maps/_groups.inc b/data/maps/_groups.inc
deleted file mode 100644
index f7fc7be89..000000000
--- a/data/maps/_groups.inc
+++ /dev/null
@@ -1,623 +0,0 @@
-gMapGroup0: @ 8485D60
-	.4byte PetalburgCity
-	.4byte SlateportCity
-	.4byte MauvilleCity
-	.4byte RustboroCity
-	.4byte FortreeCity
-	.4byte LilycoveCity
-	.4byte MossdeepCity
-	.4byte SootopolisCity
-	.4byte EverGrandeCity
-	.4byte LittlerootTown
-	.4byte OldaleTown
-	.4byte DewfordTown
-	.4byte LavaridgeTown
-	.4byte FallarborTown
-	.4byte VerdanturfTown
-	.4byte PacifidlogTown
-	.4byte Route101
-	.4byte Route102
-	.4byte Route103
-	.4byte Route104
-	.4byte Route105
-	.4byte Route106
-	.4byte Route107
-	.4byte Route108
-	.4byte Route109
-	.4byte Route110
-	.4byte Route111
-	.4byte Route112
-	.4byte Route113
-	.4byte Route114
-	.4byte Route115
-	.4byte Route116
-	.4byte Route117
-	.4byte Route118
-	.4byte Route119
-	.4byte Route120
-	.4byte Route121
-	.4byte Route122
-	.4byte Route123
-	.4byte Route124
-	.4byte Route125
-	.4byte Route126
-	.4byte Route127
-	.4byte Route128
-	.4byte Route129
-	.4byte Route130
-	.4byte Route131
-	.4byte Route132
-	.4byte Route133
-	.4byte Route134
-	.4byte Underwater1
-	.4byte Underwater2
-	.4byte Underwater3
-	.4byte Underwater4
-	.4byte Underwater5
-	.4byte Underwater6
-	.4byte Underwater7
-
-gMapGroup1: @ 8485E44
-	.4byte LittlerootTown_BrendansHouse_1F
-	.4byte LittlerootTown_BrendansHouse_2F
-	.4byte LittlerootTown_MaysHouse_1F
-	.4byte LittlerootTown_MaysHouse_2F
-	.4byte LittlerootTown_ProfessorBirchsLab
-
-gMapGroup2: @ 8485E58
-	.4byte OldaleTown_House1
-	.4byte OldaleTown_House2
-	.4byte OldaleTown_PokemonCenter_1F
-	.4byte OldaleTown_PokemonCenter_2F
-	.4byte OldaleTown_Mart
-
-gMapGroup3: @ 8485E6C
-	.4byte DewfordTown_House1
-	.4byte DewfordTown_PokemonCenter_1F
-	.4byte DewfordTown_PokemonCenter_2F
-	.4byte DewfordTown_Gym
-	.4byte DewfordTown_Hall
-	.4byte DewfordTown_House2
-
-gMapGroup4: @ 8485E84
-	.4byte LavaridgeTown_HerbShop
-	.4byte LavaridgeTown_Gym_1F
-	.4byte LavaridgeTown_Gym_B1F
-	.4byte LavaridgeTown_House
-	.4byte LavaridgeTown_Mart
-	.4byte LavaridgeTown_PokemonCenter_1F
-	.4byte LavaridgeTown_PokemonCenter_2F
-
-gMapGroup5: @ 8485EA0
-	.4byte FallarborTown_Mart
-	.4byte FallarborTown_BattleTentLobby
-	.4byte FallarborTown_BattleTentCorridor
-	.4byte FallarborTown_BattleTentBattleRoom
-	.4byte FallarborTown_PokemonCenter_1F
-	.4byte FallarborTown_PokemonCenter_2F
-	.4byte FallarborTown_House1
-	.4byte FallarborTown_House2
-
-gMapGroup6: @ 8485EC0
-	.4byte VerdanturfTown_BattleTentLobby
-	.4byte VerdanturfTown_BattleTentCorridor
-	.4byte VerdanturfTown_BattleTentBattleRoom
-	.4byte VerdanturfTown_Mart
-	.4byte VerdanturfTown_PokemonCenter_1F
-	.4byte VerdanturfTown_PokemonCenter_2F
-	.4byte VerdanturfTown_WandasHouse
-	.4byte VerdanturfTown_FriendshipRatersHouse
-	.4byte VerdanturfTown_House
-
-gMapGroup7: @ 8485EE4
-	.4byte PacifidlogTown_PokemonCenter_1F
-	.4byte PacifidlogTown_PokemonCenter_2F
-	.4byte PacifidlogTown_House1
-	.4byte PacifidlogTown_House2
-	.4byte PacifidlogTown_House3
-	.4byte PacifidlogTown_House4
-	.4byte PacifidlogTown_House5
-
-gMapGroup8: @ 8485F00
-	.4byte PetalburgCity_WallysHouse
-	.4byte PetalburgCity_Gym
-	.4byte PetalburgCity_House1
-	.4byte PetalburgCity_House2
-	.4byte PetalburgCity_PokemonCenter_1F
-	.4byte PetalburgCity_PokemonCenter_2F
-	.4byte PetalburgCity_Mart
-
-gMapGroup9: @ 8485F1C
-	.4byte SlateportCity_SternsShipyard_1F
-	.4byte SlateportCity_SternsShipyard_2F
-	.4byte SlateportCity_BattleTentLobby
-	.4byte SlateportCity_BattleTentCorridor
-	.4byte SlateportCity_BattleTentBattleRoom
-	.4byte SlateportCity_House1
-	.4byte SlateportCity_PokemonFanClub
-	.4byte SlateportCity_OceanicMuseum_1F
-	.4byte SlateportCity_OceanicMuseum_2F
-	.4byte SlateportCity_Harbor
-	.4byte SlateportCity_House2
-	.4byte SlateportCity_PokemonCenter_1F
-	.4byte SlateportCity_PokemonCenter_2F
-	.4byte SlateportCity_Mart
-
-gMapGroup10: @ 8485F54
-	.4byte MauvilleCity_Gym
-	.4byte MauvilleCity_BikeShop
-	.4byte MauvilleCity_House1
-	.4byte MauvilleCity_GameCorner
-	.4byte MauvilleCity_House2
-	.4byte MauvilleCity_PokemonCenter_1F
-	.4byte MauvilleCity_PokemonCenter_2F
-	.4byte MauvilleCity_Mart
-
-gMapGroup11: @ 8485F74
-	.4byte RustboroCity_DevonCorp_1F
-	.4byte RustboroCity_DevonCorp_2F
-	.4byte RustboroCity_DevonCorp_3F
-	.4byte RustboroCity_Gym
-	.4byte RustboroCity_PokemonSchool
-	.4byte RustboroCity_PokemonCenter_1F
-	.4byte RustboroCity_PokemonCenter_2F
-	.4byte RustboroCity_Mart
-	.4byte RustboroCity_Flat1_1F
-	.4byte RustboroCity_Flat1_2F
-	.4byte RustboroCity_House1
-	.4byte RustboroCity_CuttersHouse
-	.4byte RustboroCity_House2
-	.4byte RustboroCity_Flat2_1F
-	.4byte RustboroCity_Flat2_2F
-	.4byte RustboroCity_Flat2_3F
-	.4byte RustboroCity_House3
-
-gMapGroup12: @ 8485FB8
-	.4byte FortreeCity_House1
-	.4byte FortreeCity_Gym
-	.4byte FortreeCity_PokemonCenter_1F
-	.4byte FortreeCity_PokemonCenter_2F
-	.4byte FortreeCity_Mart
-	.4byte FortreeCity_House2
-	.4byte FortreeCity_House3
-	.4byte FortreeCity_House4
-	.4byte FortreeCity_House5
-	.4byte FortreeCity_DecorationShop
-
-gMapGroup13: @ 8485FE0
-	.4byte LilycoveCity_CoveLilyMotel_1F
-	.4byte LilycoveCity_CoveLilyMotel_2F
-	.4byte LilycoveCity_LilycoveMuseum_1F
-	.4byte LilycoveCity_LilycoveMuseum_2F
-	.4byte LilycoveCity_ContestLobby
-	.4byte LilycoveCity_ContestHall
-	.4byte LilycoveCity_PokemonCenter_1F
-	.4byte LilycoveCity_PokemonCenter_2F
-	.4byte LilycoveCity_UnusedMart
-	.4byte LilycoveCity_PokemonTrainerFanClub
-	.4byte LilycoveCity_Harbor
-	.4byte LilycoveCity_MoveDeletersHouse
-	.4byte LilycoveCity_House1
-	.4byte LilycoveCity_House2
-	.4byte LilycoveCity_House3
-	.4byte LilycoveCity_House4
-	.4byte LilycoveCity_DepartmentStore_1F
-	.4byte LilycoveCity_DepartmentStore_2F
-	.4byte LilycoveCity_DepartmentStore_3F
-	.4byte LilycoveCity_DepartmentStore_4F
-	.4byte LilycoveCity_DepartmentStore_5F
-	.4byte LilycoveCity_DepartmentStoreRooftop
-	.4byte LilycoveCity_DepartmentStoreElevator
-
-gMapGroup14: @ 848603C
-	.4byte MossdeepCity_Gym
-	.4byte MossdeepCity_House1
-	.4byte MossdeepCity_House2
-	.4byte MossdeepCity_PokemonCenter_1F
-	.4byte MossdeepCity_PokemonCenter_2F
-	.4byte MossdeepCity_Mart
-	.4byte MossdeepCity_House3
-	.4byte MossdeepCity_StevensHouse
-	.4byte MossdeepCity_House4
-	.4byte MossdeepCity_SpaceCenter_1F
-	.4byte MossdeepCity_SpaceCenter_2F
-	.4byte MossdeepCity_GameCorner_1F
-	.4byte MossdeepCity_GameCorner_B1F
-
-gMapGroup15: @ 8486070
-	.4byte SootopolisCity_Gym_1F
-	.4byte SootopolisCity_Gym_B1F
-	.4byte SootopolisCity_PokemonCenter_1F
-	.4byte SootopolisCity_PokemonCenter_2F
-	.4byte SootopolisCity_Mart
-	.4byte SootopolisCity_House1
-	.4byte SootopolisCity_House2
-	.4byte SootopolisCity_House3
-	.4byte SootopolisCity_House4
-	.4byte SootopolisCity_House5
-	.4byte SootopolisCity_House6
-	.4byte SootopolisCity_House7
-	.4byte SootopolisCity_LotadAndSeedotHouse
-	.4byte SootopolisCity_MysteryEventsHouse_1F
-	.4byte SootopolisCity_MysteryEventsHouse_B1F
-
-gMapGroup16: @ 84860AC
-	.4byte EverGrandeCity_SidneysRoom
-	.4byte EverGrandeCity_PhoebesRoom
-	.4byte EverGrandeCity_GlaciasRoom
-	.4byte EverGrandeCity_DrakesRoom
-	.4byte EverGrandeCity_ChampionsRoom
-	.4byte EverGrandeCity_Hall1
-	.4byte EverGrandeCity_Hall2
-	.4byte EverGrandeCity_Hall3
-	.4byte EverGrandeCity_Hall4
-	.4byte EverGrandeCity_Hall5
-	.4byte EverGrandeCity_PokemonLeague_1F
-	.4byte EverGrandeCity_HallOfFame
-	.4byte EverGrandeCity_PokemonCenter_1F
-	.4byte EverGrandeCity_PokemonCenter_2F
-	.4byte EverGrandeCity_PokemonLeague_2F
-
-gMapGroup17: @ 84860E8
-	.4byte Route104_MrBrineysHouse
-	.4byte Route104_PrettyPetalFlowerShop
-
-gMapGroup18: @ 84860F0
-	.4byte Route111_WinstrateFamilysHouse
-	.4byte Route111_OldLadysRestStop
-
-gMapGroup19: @ 84860F8
-	.4byte Route112_CableCarStation
-	.4byte MtChimney_CableCarStation
-
-gMapGroup20: @ 8486100
-	.4byte Route114_FossilManiacsHouse
-	.4byte Route114_FossilManiacsTunnel
-	.4byte Route114_LanettesHouse
-
-gMapGroup21: @ 848610C
-	.4byte Route116_TunnelersRestHouse
-
-gMapGroup22: @ 8486110
-	.4byte Route117_PokemonDayCare
-
-gMapGroup23: @ 8486114
-	.4byte Route121_SafariZoneEntrance
-
-gMapGroup24: @ 8486118
-	.4byte MeteorFalls_1F_1R
-	.4byte MeteorFalls_1F_2R
-	.4byte MeteorFalls_B1F_1R
-	.4byte MeteorFalls_B1F_2R
-	.4byte RusturfTunnel
-	.4byte Underwater_SootopolisCity
-	.4byte DesertRuins
-	.4byte GraniteCave_1F
-	.4byte GraniteCave_B1F
-	.4byte GraniteCave_B2F
-	.4byte GraniteCave_StevensRoom
-	.4byte PetalburgWoods
-	.4byte MtChimney
-	.4byte JaggedPass
-	.4byte FieryPath
-	.4byte MtPyre_1F
-	.4byte MtPyre_2F
-	.4byte MtPyre_3F
-	.4byte MtPyre_4F
-	.4byte MtPyre_5F
-	.4byte MtPyre_6F
-	.4byte MtPyre_Exterior
-	.4byte MtPyre_Summit
-	.4byte AquaHideout_1F
-	.4byte AquaHideout_B1F
-	.4byte AquaHideout_B2F
-	.4byte Underwater_SeafloorCavern
-	.4byte SeafloorCavern_Entrance
-	.4byte SeafloorCavern_Room1
-	.4byte SeafloorCavern_Room2
-	.4byte SeafloorCavern_Room3
-	.4byte SeafloorCavern_Room4
-	.4byte SeafloorCavern_Room5
-	.4byte SeafloorCavern_Room6
-	.4byte SeafloorCavern_Room7
-	.4byte SeafloorCavern_Room8
-	.4byte SeafloorCavern_Room9
-	.4byte CaveOfOrigin_Entrance
-	.4byte CaveOfOrigin_1F
-	.4byte CaveOfOrigin_UnusedRubySapphireMap1
-	.4byte CaveOfOrigin_UnusedRubySapphireMap2
-	.4byte CaveOfOrigin_UnusedRubySapphireMap3
-	.4byte CaveOfOrigin_B1F
-	.4byte VictoryRoad_1F
-	.4byte VictoryRoad_B1F
-	.4byte VictoryRoad_B2F
-	.4byte ShoalCave_LowTideEntranceRoom
-	.4byte ShoalCave_LowTideInnerRoom
-	.4byte ShoalCave_LowTideStairsRoom
-	.4byte ShoalCave_LowTideLowerRoom
-	.4byte ShoalCave_HighTideEntranceRoom
-	.4byte ShoalCave_HighTideInnerRoom
-	.4byte NewMauville_Entrance
-	.4byte NewMauville_Inside
-	.4byte AbandonedShip_Deck
-	.4byte AbandonedShip_Corridors_1F
-	.4byte AbandonedShip_Rooms_1F
-	.4byte AbandonedShip_Corridors_B1F
-	.4byte AbandonedShip_Rooms_B1F
-	.4byte AbandonedShip_Rooms2_B1F
-	.4byte AbandonedShip_Underwater1
-	.4byte AbandonedShip_Room_B1F
-	.4byte AbandonedShip_Rooms2_1F
-	.4byte AbandonedShip_CaptainsOffice
-	.4byte AbandonedShip_Underwater2
-	.4byte AbandonedShip_HiddenFloorCorridors
-	.4byte AbandonedShip_HiddenFloorRooms
-	.4byte IslandCave
-	.4byte AncientTomb
-	.4byte Underwater_Route134
-	.4byte Underwater_SealedChamber
-	.4byte SealedChamber_OuterRoom
-	.4byte SealedChamber_InnerRoom
-	.4byte ScorchedSlab
-	.4byte AquaHideout_UnusedRubyMap1
-	.4byte AquaHideout_UnusedRubyMap2
-	.4byte AquaHideout_UnusedRubyMap3
-	.4byte SkyPillar_Entrance
-	.4byte SkyPillar_Outside
-	.4byte SkyPillar_1F
-	.4byte SkyPillar_2F
-	.4byte SkyPillar_3F
-	.4byte SkyPillar_4F
-	.4byte ShoalCave_LowTideIceRoom
-	.4byte SkyPillar_5F
-	.4byte SkyPillar_Top
-	.4byte MagmaHideout_1F
-	.4byte MagmaHideout_2F_1R
-	.4byte MagmaHideout_2F_2R
-	.4byte MagmaHideout_3F_1R
-	.4byte MagmaHideout_3F_2R
-	.4byte MagmaHideout_4F
-	.4byte MagmaHideout_3F_3R
-	.4byte MagmaHideout_2F_3R
-	.4byte MirageTower_1F
-	.4byte MirageTower_2F
-	.4byte MirageTower_3F
-	.4byte MirageTower_4F
-	.4byte DesertUnderpass
-	.4byte ArtisanCave_B1F
-	.4byte ArtisanCave_1F
-	.4byte Underwater_MarineCave
-	.4byte MarineCave_Entrance
-	.4byte MarineCave_End
-	.4byte TerraCave_Entrance
-	.4byte TerraCave_End
-	.4byte AlteringCave
-	.4byte MeteorFalls_StevensCave
-
-gMapGroup25: @ 84862C8
-	.4byte SecretBase_RedCave1
-	.4byte SecretBase_BrownCave1
-	.4byte SecretBase_BlueCave1
-	.4byte SecretBase_YellowCave1
-	.4byte SecretBase_Tree1
-	.4byte SecretBase_Shrub1
-	.4byte SecretBase_RedCave2
-	.4byte SecretBase_BrownCave2
-	.4byte SecretBase_BlueCave2
-	.4byte SecretBase_YellowCave2
-	.4byte SecretBase_Tree2
-	.4byte SecretBase_Shrub2
-	.4byte SecretBase_RedCave3
-	.4byte SecretBase_BrownCave3
-	.4byte SecretBase_BlueCave3
-	.4byte SecretBase_YellowCave3
-	.4byte SecretBase_Tree3
-	.4byte SecretBase_Shrub3
-	.4byte SecretBase_RedCave4
-	.4byte SecretBase_BrownCave4
-	.4byte SecretBase_BlueCave4
-	.4byte SecretBase_YellowCave4
-	.4byte SecretBase_Tree4
-	.4byte SecretBase_Shrub4
-	.4byte SingleBattleColosseum
-	.4byte TradeCenter
-	.4byte RecordCorner
-	.4byte DoubleBattleColosseum
-	.4byte LinkContestRoom1
-	.4byte UnknownMap_25_29
-	.4byte UnknownMap_25_30
-	.4byte UnknownMap_25_31
-	.4byte UnknownMap_25_32
-	.4byte UnknownMap_25_33
-	.4byte UnknownMap_25_34
-	.4byte LinkContestRoom2
-	.4byte LinkContestRoom3
-	.4byte LinkContestRoom4
-	.4byte LinkContestRoom5
-	.4byte LinkContestRoom6
-	.4byte InsideOfTruck
-	.4byte SSTidalCorridor
-	.4byte SSTidalLowerDeck
-	.4byte SSTidalRooms
-	.4byte BattlePyramidSquare01
-	.4byte BattlePyramidSquare02
-	.4byte BattlePyramidSquare03
-	.4byte BattlePyramidSquare04
-	.4byte BattlePyramidSquare05
-	.4byte BattlePyramidSquare06
-	.4byte BattlePyramidSquare07
-	.4byte BattlePyramidSquare08
-	.4byte BattlePyramidSquare09
-	.4byte BattlePyramidSquare10
-	.4byte BattlePyramidSquare11
-	.4byte BattlePyramidSquare12
-	.4byte BattlePyramidSquare13
-	.4byte BattlePyramidSquare14
-	.4byte BattlePyramidSquare15
-	.4byte BattlePyramidSquare16
-	.4byte UnionRoom
-
-gMapGroup26: @ 84863BC
-	.4byte SafariZone_Northwest
-	.4byte SafariZone_North
-	.4byte SafariZone_Southwest
-	.4byte SafariZone_South
-	.4byte BattleFrontier_OutsideWest
-	.4byte BattleFrontier_BattleTowerLobby
-	.4byte BattleFrontier_BattleTowerElevator
-	.4byte BattleFrontier_BattleTowerCorridor
-	.4byte BattleFrontier_BattleTowerBattleRoom
-	.4byte SouthernIsland_Exterior
-	.4byte SouthernIsland_Interior
-	.4byte SafariZone_RestHouse
-	.4byte SafariZone_Northeast
-	.4byte SafariZone_Southeast
-	.4byte BattleFrontier_OutsideEast
-	.4byte BattleFrontier_BattleTowerMultiBattleRoom
-	.4byte BattleFrontier_BattleTowerCorridor2
-	.4byte BattleFrontier_BattleTowerBattleRoom2
-	.4byte BattleFrontier_BattleDomeLobby
-	.4byte BattleFrontier_BattleDomeCorridor
-	.4byte BattleFrontier_BattleDomePreBattleRoom
-	.4byte BattleFrontier_BattleDomeBattleRoom
-	.4byte BattleFrontier_BattlePalaceLobby
-	.4byte BattleFrontier_BattlePalaceCorridor
-	.4byte BattleFrontier_BattlePalaceBattleRoom
-	.4byte BattleFrontier_BattlePyramidLobby
-	.4byte BattleFrontier_BattlePyramidEmptySquare
-	.4byte BattleFrontier_BattlePyramidTop
-	.4byte BattleFrontier_BattleArenaLobby
-	.4byte BattleFrontier_BattleArenaCorridor
-	.4byte BattleFrontier_BattleArenaBattleRoom
-	.4byte BattleFrontier_BattleFactoryLobby
-	.4byte BattleFrontier_BattleFactoryPreBattleRoom
-	.4byte BattleFrontier_BattleFactoryBattleRoom
-	.4byte BattleFrontier_BattlePikeLobby
-	.4byte BattleFrontier_BattlePikeCorridor
-	.4byte BattleFrontier_BattlePikeThreePathRoom
-	.4byte BattleFrontier_BattlePikeRandomRoom1
-	.4byte BattleFrontier_BattlePikeRandomRoom2
-	.4byte BattleFrontier_BattlePikeRandomRoom3
-	.4byte BattleFrontier_RankingHall
-	.4byte BattleFrontier_Lounge1
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner
-	.4byte BattleFrontier_Lounge2
-	.4byte BattleFrontier_Lounge3
-	.4byte BattleFrontier_Lounge4
-	.4byte BattleFrontier_ScottsHouse
-	.4byte BattleFrontier_Lounge5
-	.4byte BattleFrontier_Lounge6
-	.4byte BattleFrontier_Lounge7
-	.4byte BattleFrontier_ReceptionGate
-	.4byte BattleFrontier_Lounge8
-	.4byte BattleFrontier_Lounge9
-	.4byte BattleFrontier_PokemonCenter_1F
-	.4byte BattleFrontier_PokemonCenter_2F
-	.4byte BattleFrontier_Mart
-	.4byte FarawayIsland_Entrance
-	.4byte FarawayIsland_Interior
-	.4byte BirthIsland_Exterior
-	.4byte BirthIsland_Harbor
-	.4byte TrainerHill_Entrance
-	.4byte TrainerHill_1F
-	.4byte TrainerHill_2F
-	.4byte TrainerHill_3F
-	.4byte TrainerHill_4F
-	.4byte TrainerHill_Roof
-	.4byte NavelRock_Exterior
-	.4byte NavelRock_Harbor
-	.4byte NavelRock_Entrance
-	.4byte NavelRock_B1F
-	.4byte NavelRock_Fork
-	.4byte NavelRock_Up1
-	.4byte NavelRock_Up2
-	.4byte NavelRock_Up3
-	.4byte NavelRock_Up4
-	.4byte NavelRock_Top
-	.4byte NavelRock_Down01
-	.4byte NavelRock_Down02
-	.4byte NavelRock_Down03
-	.4byte NavelRock_Down04
-	.4byte NavelRock_Down05
-	.4byte NavelRock_Down06
-	.4byte NavelRock_Down07
-	.4byte NavelRock_Down08
-	.4byte NavelRock_Down09
-	.4byte NavelRock_Down10
-	.4byte NavelRock_Down11
-	.4byte NavelRock_Bottom
-	.4byte TrainerHill_Elevator
-
-gMapGroup27: @ 8486520
-	.4byte Route104_Prototype
-	.4byte Route104_PrototypePrettyPetalFlowerShop
-
-gMapGroup28: @ 8486528
-	.4byte Route109_SeashoreHouse
-
-gMapGroup29: @ 848652C
-	.4byte Route110_TrickHouseEntrance
-	.4byte Route110_TrickHouseEnd
-	.4byte Route110_TrickHouseCorridor
-	.4byte Route110_TrickHousePuzzle1
-	.4byte Route110_TrickHousePuzzle2
-	.4byte Route110_TrickHousePuzzle3
-	.4byte Route110_TrickHousePuzzle4
-	.4byte Route110_TrickHousePuzzle5
-	.4byte Route110_TrickHousePuzzle6
-	.4byte Route110_TrickHousePuzzle7
-	.4byte Route110_TrickHousePuzzle8
-	.4byte Route110_SeasideCyclingRoadEntrance1
-	.4byte Route110_SeasideCyclingRoadEntrance2
-
-gMapGroup30: @ 8486560
-	.4byte Route113_GlassWorkshop
-
-gMapGroup31: @ 8486564
-	.4byte Route123_BerryMastersHouse
-
-gMapGroup32: @ 8486568
-	.4byte Route119_WeatherInstitute_1F
-	.4byte Route119_WeatherInstitute_2F
-	.4byte Route119_House
-
-gMapGroup33: @ 8486574
-	.4byte Route124_DivingTreasureHuntersHouse
-
-	.align 2
-gMapGroups:: @ 8486578
-	.4byte gMapGroup0
-	.4byte gMapGroup1
-	.4byte gMapGroup2
-	.4byte gMapGroup3
-	.4byte gMapGroup4
-	.4byte gMapGroup5
-	.4byte gMapGroup6
-	.4byte gMapGroup7
-	.4byte gMapGroup8
-	.4byte gMapGroup9
-	.4byte gMapGroup10
-	.4byte gMapGroup11
-	.4byte gMapGroup12
-	.4byte gMapGroup13
-	.4byte gMapGroup14
-	.4byte gMapGroup15
-	.4byte gMapGroup16
-	.4byte gMapGroup17
-	.4byte gMapGroup18
-	.4byte gMapGroup19
-	.4byte gMapGroup20
-	.4byte gMapGroup21
-	.4byte gMapGroup22
-	.4byte gMapGroup23
-	.4byte gMapGroup24
-	.4byte gMapGroup25
-	.4byte gMapGroup26
-	.4byte gMapGroup27
-	.4byte gMapGroup28
-	.4byte gMapGroup29
-	.4byte gMapGroup30
-	.4byte gMapGroup31
-	.4byte gMapGroup32
-	.4byte gMapGroup33
-
diff --git a/data/maps/attributes_table.inc b/data/maps/attributes_table.inc
deleted file mode 100644
index ef25ba2b5..000000000
--- a/data/maps/attributes_table.inc
+++ /dev/null
@@ -1,444 +0,0 @@
-    .align 2
-gMapAttributes:: @ 8481DD4
-	.4byte PetalburgCity_MapAttributes
-	.4byte SlateportCity_MapAttributes
-	.4byte MauvilleCity_MapAttributes
-	.4byte RustboroCity_MapAttributes
-	.4byte FortreeCity_MapAttributes
-	.4byte LilycoveCity_MapAttributes
-	.4byte MossdeepCity_MapAttributes
-	.4byte SootopolisCity_MapAttributes
-	.4byte EverGrandeCity_MapAttributes
-	.4byte LittlerootTown_MapAttributes
-	.4byte OldaleTown_MapAttributes
-	.4byte DewfordTown_MapAttributes
-	.4byte LavaridgeTown_MapAttributes
-	.4byte FallarborTown_MapAttributes
-	.4byte VerdanturfTown_MapAttributes
-	.4byte PacifidlogTown_MapAttributes
-	.4byte Route101_MapAttributes
-	.4byte Route102_MapAttributes
-	.4byte Route103_MapAttributes
-	.4byte Route104_MapAttributes
-	.4byte Route105_MapAttributes
-	.4byte Route106_MapAttributes
-	.4byte Route107_MapAttributes
-	.4byte Route108_MapAttributes
-	.4byte Route109_MapAttributes
-	.4byte Route110_MapAttributes
-	.4byte Route111_MapAttributes
-	.4byte Route112_MapAttributes
-	.4byte Route113_MapAttributes
-	.4byte Route114_MapAttributes
-	.4byte Route115_MapAttributes
-	.4byte Route116_MapAttributes
-	.4byte Route117_MapAttributes
-	.4byte Route118_MapAttributes
-	.4byte Route119_MapAttributes
-	.4byte Route120_MapAttributes
-	.4byte Route121_MapAttributes
-	.4byte Route122_MapAttributes
-	.4byte Route123_MapAttributes
-	.4byte Route124_MapAttributes
-	.4byte Route125_MapAttributes
-	.4byte Route126_MapAttributes
-	.4byte Route127_MapAttributes
-	.4byte Route128_MapAttributes
-	.4byte Route129_MapAttributes
-	.4byte UnknownMapAttributes_08417FC4
-	.4byte Route131_MapAttributes
-	.4byte Route132_MapAttributes
-	.4byte Route133_MapAttributes
-	.4byte Route134_MapAttributes
-	.4byte Underwater2_MapAttributes
-	.4byte Underwater3_MapAttributes
-	.4byte Underwater4_MapAttributes
-	.4byte LittlerootTown_BrendansHouse_1F_MapAttributes
-	.4byte LittlerootTown_BrendansHouse_2F_MapAttributes
-	.4byte LittlerootTown_MaysHouse_1F_MapAttributes
-	.4byte LittlerootTown_MaysHouse_2F_MapAttributes
-	.4byte LittlerootTown_ProfessorBirchsLab_MapAttributes
-	.4byte OldaleTown_House1_MapAttributes
-	.4byte OldaleTown_House2_MapAttributes
-	.4byte OldaleTown_PokemonCenter_1F_MapAttributes
-	.4byte OldaleTown_PokemonCenter_2F_MapAttributes
-	.4byte OldaleTown_Mart_MapAttributes
-	.4byte DewfordTown_House1_MapAttributes
-	.4byte DewfordTown_Gym_MapAttributes
-	.4byte DewfordTown_Hall_MapAttributes
-	.4byte DewfordTown_House2_MapAttributes
-	.4byte LavaridgeTown_HerbShop_MapAttributes
-	.4byte LavaridgeTown_Gym_1F_MapAttributes
-	.4byte LavaridgeTown_Gym_B1F_MapAttributes
-	.4byte LavaridgeTown_PokemonCenter_1F_MapAttributes
-	.4byte FallarborTown_LeftoverRSContestLobby_MapAttributes
-	.4byte FallarborTown_LeftoverRSContestHall_MapAttributes
-	.4byte LilycoveCity_House2_MapAttributes
-	.4byte UnknownMapAttributes_08428450
-	.4byte VerdanturfTown_WandasHouse_MapAttributes
-	.4byte PacifidlogTown_House1_MapAttributes
-	.4byte PacifidlogTown_House2_MapAttributes
-	.4byte PetalburgCity_Gym_MapAttributes
-	.4byte MossdeepCity_House4_MapAttributes
-	.4byte SlateportCity_SternsShipyard_1F_MapAttributes
-	.4byte SlateportCity_SternsShipyard_2F_MapAttributes
-	.4byte UnknownMapAttributes_084294C4
-	.4byte UnknownMapAttributes_084294E8
-	.4byte SlateportCity_PokemonFanClub_MapAttributes
-	.4byte SlateportCity_OceanicMuseum_1F_MapAttributes
-	.4byte SlateportCity_OceanicMuseum_2F_MapAttributes
-	.4byte LilycoveCity_Harbor_MapAttributes
-	.4byte MauvilleCity_Gym_MapAttributes
-	.4byte MauvilleCity_BikeShop_MapAttributes
-	.4byte MauvilleCity_GameCorner_MapAttributes
-	.4byte RustboroCity_DevonCorp_1F_MapAttributes
-	.4byte RustboroCity_DevonCorp_2F_MapAttributes
-	.4byte RustboroCity_Gym_MapAttributes
-	.4byte RustboroCity_PokemonSchool_MapAttributes
-	.4byte RustboroCity_House2_MapAttributes
-	.4byte RustboroCity_House1_MapAttributes
-	.4byte RustboroCity_CuttersHouse_MapAttributes
-	.4byte FortreeCity_House1_MapAttributes
-	.4byte FortreeCity_Gym_MapAttributes
-	.4byte FortreeCity_House2_MapAttributes
-	.4byte Route104_MrBrineysHouse_MapAttributes
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes
-	.4byte LilycoveCity_ContestLobby_MapAttributes
-	.4byte LilycoveCity_ContestHall_MapAttributes
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes
-	.4byte MossdeepCity_Gym_MapAttributes
-	.4byte SootopolisCity_Gym_1F_MapAttributes
-	.4byte SootopolisCity_Gym_B1F_MapAttributes
-	.4byte EverGrandeCity_SidneysRoom_MapAttributes
-	.4byte EverGrandeCity_PhoebesRoom_MapAttributes
-	.4byte EverGrandeCity_GlaciasRoom_MapAttributes
-	.4byte EverGrandeCity_DrakesRoom_MapAttributes
-	.4byte EverGrandeCity_ChampionsRoom_MapAttributes
-	.4byte EverGrandeCity_Hall1_MapAttributes
-	.4byte Route104_PrettyPetalFlowerShop_MapAttributes
-	.4byte Route112_CableCarStation_MapAttributes
-	.4byte Route114_FossilManiacsHouse_MapAttributes
-	.4byte Route114_FossilManiacsTunnel_MapAttributes
-	.4byte Route114_LanettesHouse_MapAttributes
-	.4byte Route116_TunnelersRestHouse_MapAttributes
-	.4byte Route117_PokemonDayCare_MapAttributes
-	.4byte Route121_SafariZoneEntrance_MapAttributes
-	.4byte MeteorFalls_1F_1R_MapAttributes
-	.4byte MeteorFalls_1F_2R_MapAttributes
-	.4byte MeteorFalls_B1F_1R_MapAttributes
-	.4byte MeteorFalls_B1F_2R_MapAttributes
-	.4byte RusturfTunnel_MapAttributes
-	.4byte Underwater_SootopolisCity_MapAttributes
-	.4byte DesertRuins_MapAttributes
-	.4byte GraniteCave_1F_MapAttributes
-	.4byte GraniteCave_B1F_MapAttributes
-	.4byte GraniteCave_B2F_MapAttributes
-	.4byte PetalburgWoods_MapAttributes
-	.4byte MtChimney_MapAttributes
-	.4byte MtPyre_1F_MapAttributes
-	.4byte MtPyre_2F_MapAttributes
-	.4byte MtPyre_3F_MapAttributes
-	.4byte MtPyre_4F_MapAttributes
-	.4byte MtPyre_5F_MapAttributes
-	.4byte MtPyre_6F_MapAttributes
-	.4byte AquaHideout_1F_MapAttributes
-	.4byte AquaHideout_B1F_MapAttributes
-	.4byte AquaHideout_B2F_MapAttributes
-	.4byte Underwater_SeafloorCavern_MapAttributes
-	.4byte SeafloorCavern_Entrance_MapAttributes
-	.4byte SeafloorCavern_Room1_MapAttributes
-	.4byte SeafloorCavern_Room2_MapAttributes
-	.4byte SeafloorCavern_Room3_MapAttributes
-	.4byte SeafloorCavern_Room4_MapAttributes
-	.4byte SeafloorCavern_Room5_MapAttributes
-	.4byte SeafloorCavern_Room6_MapAttributes
-	.4byte SeafloorCavern_Room7_MapAttributes
-	.4byte SeafloorCavern_Room8_MapAttributes
-	.4byte SeafloorCavern_Room9_MapAttributes
-	.4byte CaveOfOrigin_Entrance_MapAttributes
-	.4byte CaveOfOrigin_1F_MapAttributes
-	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes
-    .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes
-    .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes
-    .4byte CaveOfOrigin_B1F_MapAttributes
-	.4byte VictoryRoad_1F_MapAttributes
-	.4byte ShoalCave_LowTideEntranceRoom_MapAttributes
-	.4byte ShoalCave_LowTideInnerRoom_MapAttributes
-	.4byte ShoalCave_LowTideStairsRoom_MapAttributes
-	.4byte ShoalCave_LowTideLowerRoom_MapAttributes
-	.4byte ShoalCave_HighTideEntranceRoom_MapAttributes
-	.4byte ShoalCave_HighTideInnerRoom_MapAttributes
-    .4byte UnknownMapAttributes_0843E6C0 @ unused maps
-    .4byte UnknownMapAttributes_0843E6E4
-    .4byte UnknownMapAttributes_0843E708
-    .4byte UnknownMapAttributes_0843E72C
-    .4byte UnknownMapAttributes_0843E750
-    .4byte UnknownMapAttributes_0843E774
-    .4byte UnknownMapAttributes_0843E798
-    .4byte UnknownMapAttributes_0843E7BC
-    .4byte UnknownMapAttributes_0843E7E0
-    .4byte UnknownMapAttributes_0843E804
-    .4byte UnknownMapAttributes_0843E828
-    .4byte UnknownMapAttributes_0843E84C
-    .4byte UnknownMapAttributes_0843E870
-    .4byte UnknownMapAttributes_0843E894
-	.4byte NewMauville_Entrance_MapAttributes
-	.4byte NewMauville_Inside_MapAttributes
-	.4byte AbandonedShip_Deck_MapAttributes
-	.4byte AbandonedShip_Corridors_1F_MapAttributes
-	.4byte AbandonedShip_Rooms_1F_MapAttributes
-	.4byte AbandonedShip_Corridors_B1F_MapAttributes
-	.4byte AbandonedShip_Rooms_B1F_MapAttributes
-	.4byte AbandonedShip_Rooms2_B1F_MapAttributes
-	.4byte AbandonedShip_Underwater1_MapAttributes
-	.4byte AbandonedShip_Room_B1F_MapAttributes
-	.4byte AbandonedShip_Rooms2_1F_MapAttributes
-	.4byte AbandonedShip_CaptainsOffice_MapAttributes
-	.4byte AbandonedShip_Underwater2_MapAttributes
-	.4byte SecretBase_RedCave1_MapAttributes
-	.4byte SecretBase_BrownCave1_MapAttributes
-	.4byte SecretBase_BlueCave1_MapAttributes
-	.4byte SecretBase_YellowCave1_MapAttributes
-	.4byte SecretBase_Tree1_MapAttributes
-	.4byte SecretBase_Shrub1_MapAttributes
-	.4byte SecretBase_RedCave2_MapAttributes
-	.4byte SecretBase_BrownCave2_MapAttributes
-	.4byte SecretBase_BlueCave2_MapAttributes
-	.4byte SecretBase_YellowCave2_MapAttributes
-	.4byte SecretBase_Tree2_MapAttributes
-	.4byte SecretBase_Shrub2_MapAttributes
-	.4byte SecretBase_RedCave3_MapAttributes
-	.4byte SecretBase_BrownCave3_MapAttributes
-	.4byte SecretBase_BlueCave3_MapAttributes
-	.4byte SecretBase_YellowCave3_MapAttributes
-	.4byte SecretBase_Tree3_MapAttributes
-	.4byte SecretBase_Shrub3_MapAttributes
-	.4byte SecretBase_RedCave4_MapAttributes
-	.4byte SecretBase_BrownCave4_MapAttributes
-	.4byte SecretBase_BlueCave4_MapAttributes
-	.4byte SecretBase_YellowCave4_MapAttributes
-	.4byte SecretBase_Tree4_MapAttributes
-	.4byte SecretBase_Shrub4_MapAttributes
-	.4byte SingleBattleColosseum_MapAttributes
-	.4byte TradeCenter_MapAttributes
-	.4byte RecordCorner_MapAttributes
-	.4byte DoubleBattleColosseum_MapAttributes
-	.4byte LinkContestRoom1_MapAttributes
-	.4byte UnknownMap_25_29_MapAttributes
-	.4byte UnknownMap_25_30_MapAttributes
-	.4byte UnknownMap_25_31_MapAttributes
-	.4byte UnknownMap_25_32_MapAttributes
-	.4byte UnknownMap_25_33_MapAttributes
-	.4byte UnknownMap_25_34_MapAttributes
-	.4byte LinkContestRoom2_MapAttributes
-	.4byte LinkContestRoom3_MapAttributes
-	.4byte LinkContestRoom4_MapAttributes
-	.4byte LinkContestRoom5_MapAttributes
-	.4byte LinkContestRoom6_MapAttributes
-	.4byte InsideOfTruck_MapAttributes
-	.4byte SafariZone_Northwest_MapAttributes
-	.4byte SafariZone_North_MapAttributes
-	.4byte SafariZone_Southwest_MapAttributes
-	.4byte SafariZone_South_MapAttributes
-    .4byte UnknownMapAttributes_08447028
- 	.4byte Route109_SeashoreHouse_MapAttributes
-	.4byte Route110_TrickHouseEntrance_MapAttributes
-	.4byte Route110_TrickHouseEnd_MapAttributes
-	.4byte Route110_TrickHouseCorridor_MapAttributes
-	.4byte Route110_TrickHousePuzzle1_MapAttributes
-	.4byte Route110_TrickHousePuzzle2_MapAttributes
-	.4byte Route110_TrickHousePuzzle3_MapAttributes
-	.4byte Route110_TrickHousePuzzle4_MapAttributes
-	.4byte Route110_TrickHousePuzzle5_MapAttributes
-	.4byte Route110_TrickHousePuzzle6_MapAttributes
-	.4byte Route110_TrickHousePuzzle7_MapAttributes
-	.4byte Route110_TrickHousePuzzle8_MapAttributes
-	.4byte FortreeCity_DecorationShop_MapAttributes
-	.4byte Route110_SeasideCyclingRoadEntrance1_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_1F_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_2F_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_3F_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_4F_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_5F_MapAttributes
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes
-	.4byte Route130_MapAttributes
-	.4byte BattleFrontier_BattleTowerLobby_MapAttributes
-	.4byte BattleFrontier_OutsideWest_MapAttributes
-	.4byte BattleFrontier_BattleTowerElevator_MapAttributes
-	.4byte BattleFrontier_BattleTowerCorridor_MapAttributes
-	.4byte BattleFrontier_BattleTowerBattleRoom_MapAttributes
-	.4byte RustboroCity_DevonCorp_3F_MapAttributes
-	.4byte EverGrandeCity_PokemonLeague_1F_MapAttributes
-	.4byte Route119_WeatherInstitute_1F_MapAttributes
-	.4byte Route119_WeatherInstitute_2F_MapAttributes
-	.4byte LilycoveCity_DepartmentStoreElevator_MapAttributes
-	.4byte Underwater1_MapAttributes
-	.4byte MossdeepCity_SpaceCenter_1F_MapAttributes
-	.4byte MossdeepCity_SpaceCenter_2F_MapAttributes
-	.4byte SSTidalCorridor_MapAttributes
-	.4byte SSTidalLowerDeck_MapAttributes
-	.4byte SSTidalRooms_MapAttributes
-	.4byte IslandCave_MapAttributes
-	.4byte AncientTomb_MapAttributes
-	.4byte Underwater_Route134_MapAttributes
-	.4byte Underwater_SealedChamber_MapAttributes
-	.4byte SealedChamber_OuterRoom_MapAttributes
-	.4byte VictoryRoad_B1F_MapAttributes
-	.4byte VictoryRoad_B2F_MapAttributes
-	.4byte Route104_Prototype_MapAttributes
-	.4byte GraniteCave_StevensRoom_MapAttributes
-	.4byte AbandonedShip_HiddenFloorCorridors_MapAttributes
-	.4byte SouthernIsland_Exterior_MapAttributes
-	.4byte SouthernIsland_Interior_MapAttributes
-	.4byte JaggedPass_MapAttributes
-	.4byte FieryPath_MapAttributes
-	.4byte RustboroCity_Flat2_1F_MapAttributes
-	.4byte RustboroCity_Flat2_2F_MapAttributes
-	.4byte RustboroCity_Flat2_3F_MapAttributes
-	.4byte SootopolisCity_LotadAndSeedotHouse_MapAttributes
-	.4byte EverGrandeCity_HallOfFame_MapAttributes
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes
-	.4byte Route124_DivingTreasureHuntersHouse_MapAttributes
-	.4byte MtPyre_Exterior_MapAttributes
-	.4byte MtPyre_Summit_MapAttributes
-	.4byte SealedChamber_InnerRoom_MapAttributes
-	.4byte MossdeepCity_GameCorner_1F_MapAttributes
-	.4byte MossdeepCity_GameCorner_B1F_MapAttributes
-	.4byte SootopolisCity_House1_MapAttributes
-	.4byte SootopolisCity_House2_MapAttributes
-	.4byte SootopolisCity_House3_MapAttributes
-	.4byte AbandonedShip_HiddenFloorRooms_MapAttributes
-	.4byte ScorchedSlab_MapAttributes
-	.4byte UnknownMapAttributes_0845A394
-	.4byte RustboroCity_Flat1_1F_MapAttributes
-	.4byte RustboroCity_Flat1_2F_MapAttributes
-	.4byte EverGrandeCity_Hall4_MapAttributes
-	.4byte AquaHideout_UnusedRubyMap1_MapAttributes
-	.4byte AquaHideout_UnusedRubyMap2_MapAttributes
-	.4byte AquaHideout_UnusedRubyMap3_MapAttributes
-	.4byte UnknownMapAttributes_0845D470
-	.4byte SkyPillar_Entrance_MapAttributes
-	.4byte SkyPillar_Outside_MapAttributes
-	.4byte SkyPillar_1F_MapAttributes
-	.4byte SkyPillar_2F_MapAttributes
-	.4byte SkyPillar_3F_MapAttributes
-	.4byte SkyPillar_4F_MapAttributes
-	.4byte UnknownMapAttributes_0845ECB4
-	.4byte MossdeepCity_StevensHouse_MapAttributes
-	.4byte ShoalCave_LowTideIceRoom_MapAttributes
-	.4byte SafariZone_RestHouse_MapAttributes
-	.4byte SkyPillar_5F_MapAttributes
-	.4byte SkyPillar_Top_MapAttributes
-    .4byte BattleFrontier_BattleDomeLobby_MapAttributes
-    .4byte BattleFrontier_BattleDomeCorridor_MapAttributes
-    .4byte BattleFrontier_BattleDomePreBattleRoom_MapAttributes
-    .4byte BattleFrontier_BattleDomeBattleRoom_MapAttributes
-    .4byte MagmaHideout_1F_MapAttributes
-    .4byte MagmaHideout_2F_1R_MapAttributes
-    .4byte MagmaHideout_2F_2R_MapAttributes
-    .4byte MagmaHideout_3F_1R_MapAttributes
-    .4byte MagmaHideout_3F_2R_MapAttributes
-    .4byte MagmaHideout_4F_MapAttributes
-    .4byte BattleFrontier_BattlePalaceLobby_MapAttributes
-    .4byte BattleFrontier_BattlePalaceCorridor_MapAttributes
-    .4byte BattleFrontier_BattlePalaceBattleRoom_MapAttributes
-    .4byte BattleFrontier_OutsideEast_MapAttributes
-    .4byte BattleFrontier_BattleFactoryLobby_MapAttributes
-    .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes
-    .4byte BattleFrontier_BattleFactoryBattleRoom_MapAttributes
-    .4byte BattleFrontier_BattlePikeLobby_MapAttributes
-    .4byte BattleFrontier_BattlePikeCorridor_MapAttributes
-    .4byte BattleFrontier_BattlePikeThreePathRoom_MapAttributes
-    .4byte BattleFrontier_BattlePikeRandomRoom1_MapAttributes
-    .4byte BattleFrontier_BattlePikeRandomRoom2_MapAttributes
-    .4byte BattleFrontier_BattleArenaLobby_MapAttributes
-    .4byte BattleFrontier_BattleArenaCorridor_MapAttributes
-    .4byte BattleFrontier_BattleArenaBattleRoom_MapAttributes
-    .4byte UnknownMapAttributes_08469200
-    .4byte BattleFrontier_BattlePikeRandomRoom3_MapAttributes
-    .4byte UnknownMapAttributes_084693AC
-    .4byte BattleFrontier_BattlePyramidLobby_MapAttributes
-    .4byte BattleFrontier_BattlePyramidEmptySquare_MapAttributes
-    .4byte BattlePyramidSquare01_MapAttributes
-    .4byte BattlePyramidSquare02_MapAttributes
-    .4byte BattlePyramidSquare03_MapAttributes
-    .4byte BattlePyramidSquare04_MapAttributes
-    .4byte BattlePyramidSquare05_MapAttributes
-    .4byte BattlePyramidSquare06_MapAttributes
-    .4byte BattlePyramidSquare07_MapAttributes
-    .4byte BattlePyramidSquare08_MapAttributes
-    .4byte BattlePyramidSquare09_MapAttributes
-    .4byte BattlePyramidSquare10_MapAttributes
-    .4byte BattlePyramidSquare11_MapAttributes
-    .4byte BattlePyramidSquare12_MapAttributes
-    .4byte BattlePyramidSquare13_MapAttributes
-    .4byte BattlePyramidSquare14_MapAttributes
-    .4byte BattlePyramidSquare15_MapAttributes
-    .4byte BattlePyramidSquare16_MapAttributes
-    .4byte BattleFrontier_BattlePyramidTop_MapAttributes
-    .4byte MagmaHideout_3F_3R_MapAttributes
-    .4byte MagmaHideout_2F_3R_MapAttributes
-    .4byte MirageTower_1F_MapAttributes
-    .4byte MirageTower_2F_MapAttributes
-    .4byte MirageTower_3F_MapAttributes
-    .4byte FallarborTown_BattleTentLobby_MapAttributes
-    .4byte FallarborTown_BattleTentCorridor_MapAttributes
-    .4byte FallarborTown_BattleTentBattleRoom_MapAttributes
-    .4byte VerdanturfTown_BattleTentBattleRoom_MapAttributes
-    .4byte MirageTower_4F_MapAttributes
-    .4byte DesertUnderpass_MapAttributes
-    .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes
-    .4byte BattleFrontier_BattleTowerCorridor2_MapAttributes
-    .4byte UnknownMapAttributes_08470BD8
-    .4byte UnionRoom_MapAttributes
-    .4byte SafariZone_Northeast_MapAttributes
-    .4byte SafariZone_Southeast_MapAttributes
-    .4byte BattleFrontier_RankingHall_MapAttributes
-    .4byte BattleFrontier_Lounge2_MapAttributes
-    .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes
-    .4byte BattleFrontier_ReceptionGate_MapAttributes
-    .4byte ArtisanCave_B1F_MapAttributes
-    .4byte ArtisanCave_1F_MapAttributes
-    .4byte FarawayIsland_Entrance_MapAttributes
-    .4byte FarawayIsland_Interior_MapAttributes
-    .4byte BirthIsland_Exterior_MapAttributes
-    .4byte BirthIsland_Harbor_MapAttributes
-    .4byte Underwater_MarineCave_MapAttributes
-    .4byte MarineCave_Entrance_MapAttributes
-    .4byte TerraCave_Entrance_MapAttributes
-    .4byte TerraCave_End_MapAttributes
-    .4byte Underwater6_MapAttributes
-    .4byte Underwater7_MapAttributes
-    .4byte Underwater5_MapAttributes
-    .4byte MarineCave_End_MapAttributes
-    .4byte TrainerHill_Entrance_MapAttributes
-    .4byte TrainerHill_1F_MapAttributes
-    .4byte TrainerHill_2F_MapAttributes
-    .4byte TrainerHill_3F_MapAttributes
-    .4byte TrainerHill_4F_MapAttributes
-    .4byte TrainerHill_Roof_MapAttributes
-    .4byte AlteringCave_MapAttributes
-    .4byte NavelRock_Exterior_MapAttributes
-    .4byte NavelRock_Entrance_MapAttributes
-    .4byte NavelRock_Top_MapAttributes
-    .4byte NavelRock_Bottom_MapAttributes
-    .4byte NavelRock_Up1_MapAttributes
-    .4byte NavelRock_Up2_MapAttributes
-    .4byte NavelRock_B1F_MapAttributes
-    .4byte NavelRock_Fork_MapAttributes
-    .4byte BattleFrontier_Lounge1_MapAttributes
-    .4byte BattleFrontier_ScottsHouse_MapAttributes
-    .4byte MeteorFalls_StevensCave_MapAttributes
-    .4byte UnknownMapAttributes_08480DAC
-    .4byte UnknownMapAttributes_08480F54
-    .4byte UnknownMapAttributes_084810FC
-    .4byte UnknownMapAttributes_084812A4
-    .4byte UnknownMapAttributes_0848144C
-    .4byte UnknownMapAttributes_084815F4
-    .4byte UnknownMapAttributes_08481B24
-    .4byte SootopolisCity_MysteryEventsHouse_1F_MapAttributes
-    .4byte SootopolisCity_MysteryEventsHouse_B1F_MapAttributes
-    .4byte UnknownMapAttributes_08481DBC
-
diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc
deleted file mode 100644
index ddfab5eab..000000000
--- a/data/maps/events/AbandonedShip_CaptainsOffice.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 3, 1, 17, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100, 0, 0
-
-AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C
-	warp_def 7, 6, 3, 4, ABANDONED_SHIP_DECK
-	warp_def 8, 6, 3, 4, ABANDONED_SHIP_DECK
-
-AbandonedShip_CaptainsOffice_MapEvents:: @ 8536A9C
-	map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc
deleted file mode 100644
index c3cf0f54d..000000000
--- a/data/maps/events/AbandonedShip_Corridors_1F.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-AbandonedShip_Corridors_1F_EventObjects: @ 85366C0
-	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 17, 7, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 0, 5, 10, 3, 45, 116, 0, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0, 0, 0
-
-AbandonedShip_Corridors_1F_MapWarps: @ 85366F0
-	warp_def 9, 11, 3, 2, ABANDONED_SHIP_DECK
-	warp_def 8, 11, 3, 2, ABANDONED_SHIP_DECK
-	warp_def 0, 11, 3, 3, ABANDONED_SHIP_DECK
-	warp_def 1, 11, 3, 3, ABANDONED_SHIP_DECK
-	warp_def 11, 9, 3, 0, ABANDONED_SHIP_ROOMS_1F
-	warp_def 14, 9, 3, 3, ABANDONED_SHIP_ROOMS_1F
-	warp_def 11, 3, 3, 2, ABANDONED_SHIP_ROOMS_1F
-	warp_def 14, 3, 3, 4, ABANDONED_SHIP_ROOMS_1F
-	warp_def 3, 9, 3, 0, ABANDONED_SHIP_ROOMS_2_1F
-	warp_def 16, 2, 3, 7, ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 5, 2, 3, 6, ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 3, 3, 3, 2, ABANDONED_SHIP_ROOMS_2_1F
-
-AbandonedShip_Corridors_1F_MapEvents:: @ 8536750
-	map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/events/AbandonedShip_Corridors_B1F.inc
deleted file mode 100644
index 8903de197..000000000
--- a/data/maps/events/AbandonedShip_Corridors_B1F.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-AbandonedShip_Corridors_B1F_EventObjects: @ 8536808
-	object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 0, 2, 8, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0, 0, 0
-
-AbandonedShip_Corridors_B1F_MapWarps: @ 8536838
-	warp_def 6, 4, 3, 2, ABANDONED_SHIP_ROOMS_2_B1F
-	warp_def 3, 4, 3, 0, ABANDONED_SHIP_ROOMS_2_B1F
-	warp_def 5, 7, 3, 0, ABANDONED_SHIP_ROOMS_B1F
-	warp_def 8, 7, 3, 1, ABANDONED_SHIP_ROOMS_B1F
-	warp_def 11, 7, 3, 2, ABANDONED_SHIP_ROOMS_B1F
-	warp_def 11, 4, 3, 0, ABANDONED_SHIP_ROOM_B1F
-	warp_def 0, 2, 3, 10, ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 8, 2, 3, 9, ABANDONED_SHIP_CORRIDORS_1F
-
-AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878
-	bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DC8
-
-AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884
-	map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents
-
diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/events/AbandonedShip_Deck.inc
deleted file mode 100644
index ca01ccec8..000000000
--- a/data/maps/events/AbandonedShip_Deck.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-AbandonedShip_Deck_MapWarps: @ 8536684
-	warp_def 13, 15, 3, 0, ROUTE_108
-	warp_def 14, 15, 3, 0, ROUTE_108
-	warp_def 13, 9, 3, 1, ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 8, 9, 3, 2, ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 12, 5, 3, 0, ABANDONED_SHIP_CAPTAINS_OFFICE
-
-AbandonedShip_Deck_MapEvents:: @ 85366AC
-	map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc
deleted file mode 100644
index 3bff54076..000000000
--- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC
-	warp_def 3, 8, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
-	warp_def 6, 8, 3, 2, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
-	warp_def 9, 8, 3, 4, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
-	warp_def 3, 3, 3, 6, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
-	warp_def 6, 3, 3, 7, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
-	warp_def 9, 3, 3, 8, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
-
-AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC
-	bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A19
-	bg_event 6, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A50
-	bg_event 3, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A87
-	bg_event 9, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE
-
-AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C
-	map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents
-
diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
deleted file mode 100644
index 27756e5a3..000000000
--- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101, 0, 0
-
-AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
-	warp_def 6, 14, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 7, 14, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 21, 14, 3, 1, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 22, 14, 3, 1, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 36, 14, 3, 2, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 37, 14, 3, 2, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 6, 1, 3, 3, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 21, 1, 3, 4, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 36, 1, 3, 5, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-
-AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8
-	bg_event 42, 10, 3, 7, 0, ITEM_ROOM_1_KEY, 31, 0
-	bg_event 20, 5, 3, 7, 0, ITEM_ROOM_2_KEY, 32, 0
-	bg_event 1, 12, 3, 7, 0, ITEM_ROOM_4_KEY, 33, 0
-	bg_event 1, 2, 0, 7, 0, ITEM_ROOM_6_KEY, 34, 0
-	bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
-	bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
-	bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
-	bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
-	bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
-	bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
-
-AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60
-	map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents
-
diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc
deleted file mode 100644
index 67411fcf9..000000000
--- a/data/maps/events/AbandonedShip_Room_B1F.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-AbandonedShip_Room_B1F_EventObjects: @ 853697C
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098, 0, 0
-
-AbandonedShip_Room_B1F_MapWarps: @ 8536994
-	warp_def 4, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 5, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F
-
-AbandonedShip_Room_B1F_MapEvents:: @ 85369A4
-	map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc
deleted file mode 100644
index 4791919f6..000000000
--- a/data/maps/events/AbandonedShip_Rooms2_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8
-	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099, 0, 0
-	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 3, 2, 3, 10, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 0, 7, 2, 3, 9, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0, 0, 0
-
-AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30
-	warp_def 4, 16, 3, 8, ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 5, 16, 3, 8, ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 4, 1, 3, 11, ABANDONED_SHIP_CORRIDORS_1F
-
-AbandonedShip_Rooms2_1F_MapEvents:: @ 8536A48
-	map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc
deleted file mode 100644
index e28a2ed5b..000000000
--- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4
-	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 3, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097, 0, 0
-
-AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
-	warp_def 4, 7, 3, 1, ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 5, 7, 3, 1, ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 13, 7, 3, 0, ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 14, 7, 3, 0, ABANDONED_SHIP_CORRIDORS_B1F
-
-AbandonedShip_Rooms2_B1F_MapEvents:: @ 8536944
-	map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc
deleted file mode 100644
index fe9b6f7da..000000000
--- a/data/maps/events/AbandonedShip_Rooms_1F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-AbandonedShip_Rooms_1F_EventObjects: @ 8536764
-	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 5, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 11, 3, 8, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 10, 16, 3, 16, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0, 0, 0
-
-AbandonedShip_Rooms_1F_MapWarps: @ 85367C4
-	warp_def 4, 16, 3, 4, ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 5, 16, 3, 4, ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 4, 1, 3, 6, ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 13, 16, 3, 5, ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 13, 1, 3, 7, ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 14, 16, 3, 5, ABANDONED_SHIP_CORRIDORS_1F
-
-AbandonedShip_Rooms_1F_MapEvents:: @ 85367F4
-	map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc
deleted file mode 100644
index 631b33746..000000000
--- a/data/maps/events/AbandonedShip_Rooms_B1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-AbandonedShip_Rooms_B1F_EventObjects: @ 8536898
-	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096, 0, 0
-
-AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
-	warp_def 4, 1, 3, 2, ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 13, 1, 3, 3, ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 22, 1, 3, 4, ABANDONED_SHIP_CORRIDORS_B1F
-
-AbandonedShip_Rooms_B1F_MapEvents:: @ 85368E0
-	map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/events/AbandonedShip_Underwater1.inc
deleted file mode 100644
index a92bed422..000000000
--- a/data/maps/events/AbandonedShip_Underwater1.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-AbandonedShip_Underwater1_MapWarps: @ 8536958
-	warp_def 3, 7, 3, 0, ABANDONED_SHIP_UNDERWATER_2
-	warp_def 4, 7, 3, 0, ABANDONED_SHIP_UNDERWATER_2
-
-AbandonedShip_Underwater1_MapEvents:: @ 8536968
-	map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/events/AbandonedShip_Underwater2.inc
deleted file mode 100644
index de84626f3..000000000
--- a/data/maps/events/AbandonedShip_Underwater2.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-AbandonedShip_Underwater2_MapWarps: @ 8536AB0
-	warp_def 3, 1, 3, 0, ABANDONED_SHIP_UNDERWATER_1
-
-AbandonedShip_Underwater2_MapEvents:: @ 8536AB8
-	map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/AlteringCave.inc b/data/maps/events/AlteringCave.inc
deleted file mode 100644
index 296076932..000000000
--- a/data/maps/events/AlteringCave.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-AlteringCave_MapWarps: @ 8537894
-	warp_def 18, 22, 0, 0, ROUTE_103
-
-AlteringCave_MapEvents:: @ 853789C
-	map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc
deleted file mode 100644
index a0bde74e3..000000000
--- a/data/maps/events/AncientTomb.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-AncientTomb_EventObjects: @ 8536CDC
-	object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937, 0, 0
-
-AncientTomb_MapWarps: @ 8536CF4
-	warp_def 8, 29, 3, 0, ROUTE_120
-	warp_def 8, 20, 0, 2, ANCIENT_TOMB
-	warp_def 8, 11, 3, 1, ANCIENT_TOMB
-
-AncientTomb_MapBGEvents: @ 8536D0C
-	bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_239033
-	bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_239050
-	bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_239050
-
-AncientTomb_MapEvents:: @ 8536D30
-	map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents
-
diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc
deleted file mode 100644
index d5b9f17d6..000000000
--- a/data/maps/events/AquaHideout_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-AquaHideout_1F_EventObjects: @ 8535304
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821, 0, 0
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822, 0, 0
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 4, 3, 50, 93, 0, 1, 3, AquaHideout_1F_EventScript_2334F8, 924, 0, 0
-
-AquaHideout_1F_MapWarps: @ 853534C
-	warp_def 13, 27, 1, 6, LILYCOVE_CITY
-	warp_def 14, 27, 1, 6, LILYCOVE_CITY
-	warp_def 22, 1, 3, 0, AQUA_HIDEOUT_B1F
-
-AquaHideout_1F_MapEvents:: @ 8535364
-	map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc
deleted file mode 100644
index c1b2f36b7..000000000
--- a/data/maps/events/AquaHideout_B1F.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-AquaHideout_B1F_EventObjects: @ 8535378
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924, 0, 0
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071, 0, 0
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291358, 1124, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291365, 1132, 0, 0
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_233A38, 978, 0, 0
-	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 28, 21, 3, 7, 17, 0, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924, 0, 0
-
-AquaHideout_B1F_MapWarps: @ 8535450
-	warp_def 29, 1, 3, 2, AQUA_HIDEOUT_1F
-	warp_def 18, 1, 3, 0, AQUA_HIDEOUT_B2F
-	warp_def 12, 1, 3, 1, AQUA_HIDEOUT_B2F
-	warp_def 3, 3, 3, 2, AQUA_HIDEOUT_B2F
-	warp_def 31, 4, 3, 7, AQUA_HIDEOUT_B1F
-	warp_def 27, 4, 3, 8, AQUA_HIDEOUT_B1F
-	warp_def 20, 4, 3, 10, AQUA_HIDEOUT_B1F
-	warp_def 27, 12, 3, 4, AQUA_HIDEOUT_B1F
-	warp_def 3, 15, 3, 5, AQUA_HIDEOUT_B1F
-	warp_def 3, 20, 3, 12, AQUA_HIDEOUT_B1F
-	warp_def 32, 19, 3, 6, AQUA_HIDEOUT_B1F
-	warp_def 23, 10, 3, 22, AQUA_HIDEOUT_B1F
-	warp_def 45, 3, 3, 9, AQUA_HIDEOUT_B1F
-	warp_def 42, 5, 3, 18, AQUA_HIDEOUT_B1F
-	warp_def 45, 5, 3, 12, AQUA_HIDEOUT_B1F
-	warp_def 48, 5, 3, 16, AQUA_HIDEOUT_B1F
-	warp_def 42, 9, 3, 15, AQUA_HIDEOUT_B1F
-	warp_def 45, 9, 3, 20, AQUA_HIDEOUT_B1F
-	warp_def 48, 9, 3, 13, AQUA_HIDEOUT_B1F
-	warp_def 42, 13, 3, 24, AQUA_HIDEOUT_B1F
-	warp_def 45, 13, 3, 17, AQUA_HIDEOUT_B1F
-	warp_def 48, 13, 3, 12, AQUA_HIDEOUT_B1F
-	warp_def 42, 17, 3, 11, AQUA_HIDEOUT_B1F
-	warp_def 45, 17, 3, 17, AQUA_HIDEOUT_B1F
-	warp_def 48, 17, 3, 19, AQUA_HIDEOUT_B1F
-
-AquaHideout_B1F_MapEvents:: @ 8535518
-	map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc
deleted file mode 100644
index 54ef390fd..000000000
--- a/data/maps/events/AquaHideout_B2F.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-AquaHideout_B2F_EventObjects: @ 853552C
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924, 0, 0
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 10, 3, 45, 52, 0, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943, 0, 0
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 7, 5, 3, 10, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924, 0, 0
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 5, 3, 9, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924, 0, 0
-
-AquaHideout_B2F_MapWarps: @ 85355BC
-	warp_def 18, 1, 3, 1, AQUA_HIDEOUT_B1F
-	warp_def 12, 1, 3, 2, AQUA_HIDEOUT_B1F
-	warp_def 3, 3, 3, 3, AQUA_HIDEOUT_B1F
-	warp_def 31, 8, 3, 5, AQUA_HIDEOUT_B2F
-	warp_def 8, 8, 3, 8, AQUA_HIDEOUT_B2F
-	warp_def 5, 8, 3, 3, AQUA_HIDEOUT_B2F
-	warp_def 18, 13, 3, 7, AQUA_HIDEOUT_B2F
-	warp_def 12, 13, 3, 6, AQUA_HIDEOUT_B2F
-	warp_def 31, 17, 3, 4, AQUA_HIDEOUT_B2F
-	warp_def 32, 20, 3, 4, AQUA_HIDEOUT_B1F
-
-AquaHideout_B2F_MapCoordEvents: @ 853560C
-	coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5
-	coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5
-
-AquaHideout_B2F_MapEvents:: @ 853562C
-	map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/ArtisanCave_1F.inc b/data/maps/events/ArtisanCave_1F.inc
deleted file mode 100644
index e5899ef05..000000000
--- a/data/maps/events/ArtisanCave_1F.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-ArtisanCave_1F_EventObjects: @ 8537774
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163, 0, 0
-
-ArtisanCave_1F_MapWarps: @ 853778C
-	warp_def 10, 17, 0, 13, BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 6, 5, 0, 1, ARTISAN_CAVE_B1F
-
-ArtisanCave_1F_MapEvents:: @ 853779C
-	map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/ArtisanCave_B1F.inc b/data/maps/events/ArtisanCave_B1F.inc
deleted file mode 100644
index af24f4b4a..000000000
--- a/data/maps/events/ArtisanCave_B1F.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-ArtisanCave_B1F_EventObjects: @ 8537708
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 38, 3, 1, 17, 0, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162, 0, 0
-
-ArtisanCave_B1F_MapWarps: @ 8537720
-	warp_def 8, 48, 0, 10, BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 38, 5, 0, 1, ARTISAN_CAVE_1F
-
-ArtisanCave_B1F_MapBGEvents: @ 8537730
-	bg_event 32, 29, 0, 7, 0, ITEM_ZINC, 102, 0
-	bg_event 27, 8, 0, 7, 0, ITEM_CALCIUM, 101, 0
-	bg_event 7, 5, 0, 7, 0, ITEM_PROTEIN, 103, 0
-	bg_event 19, 43, 0, 7, 0, ITEM_IRON, 104, 0
-
-ArtisanCave_B1F_MapEvents:: @ 8537760
-	map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents
-
diff --git a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc
deleted file mode 100644
index 029a59b41..000000000
--- a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 4, 5, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 5, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 0, 15, 6, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 6, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4
-	map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc b/data/maps/events/BattleFrontier_BattleArenaCorridor.inc
deleted file mode 100644
index 657f912e3..000000000
--- a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 9, 12, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8
-	map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleArenaLobby.inc b/data/maps/events/BattleFrontier_BattleArenaLobby.inc
deleted file mode 100644
index 3add19881..000000000
--- a/data/maps/events/BattleFrontier_BattleArenaLobby.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 2, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 0, 14, 11, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 0, 14, 12, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 10, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0, 0, 0
-
-BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C
-	warp_def 7, 12, 3, 1, BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894
-	bg_event 5, 9, 3, 1, 0, BattleFrontier_BattleArenaLobby_EventScript_256092
-	bg_event 1, 7, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560CA
-
-BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC
-	map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents
-
diff --git a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc
deleted file mode 100644
index 595d14b60..000000000
--- a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4
-	object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 5, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 7, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 9, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 11, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 16, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 16, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 0, 8, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 0, 13, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 9, 4, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 14, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 6, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
-	map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc
deleted file mode 100644
index 9b3f387b1..000000000
--- a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 23, 5, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164
-	warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_BattleDomeCorridor_MapEvents:: @ 853C174
-	map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleDomeLobby.inc b/data/maps/events/BattleFrontier_BattleDomeLobby.inc
deleted file mode 100644
index 59605010f..000000000
--- a/data/maps/events/BattleFrontier_BattleDomeLobby.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 14, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 18, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_TEALA, 0, 0, 17, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0, 0, 0
-
-BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8
-	warp_def 11, 16, 0, 1, BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 12, 16, 0, 1, BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108
-	bg_event 4, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D52
-	bg_event 7, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D84
-	bg_event 18, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D6B
-	bg_event 15, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E34
-
-BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138
-	map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents
-
diff --git a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc
deleted file mode 100644
index 82da39a63..000000000
--- a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 2, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0
-	warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_BattleDomePreBattleRoom_MapEvents:: @ 853C1B0
-	map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc
deleted file mode 100644
index 48fd10c07..000000000
--- a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, 255, 0, 0, 5, 11, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C
-	map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc
deleted file mode 100644
index 8d514f8a0..000000000
--- a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 13, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 6, 10, 0, 1, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0, 0, 0
-
-BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68
-	warp_def 9, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 10, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78
-	bg_event 2, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587E1
-	bg_event 11, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587FA
-	bg_event 9, 4, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258839
-
-BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C
-	map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents
-
diff --git a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc
deleted file mode 100644
index e1a0529fd..000000000
--- a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 12, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8
-	map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc
deleted file mode 100644
index b5fc13838..000000000
--- a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
-	object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 1, 4, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574
-	warp_def 0, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
-	warp_def 1, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
-
-BattleFrontier_BattlePalaceBattleRoom_MapEvents:: @ 853C584
-	map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc
deleted file mode 100644
index 2b6f7f251..000000000
--- a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 12, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 0, 12, 6, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 0, 15, 5, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 9, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 13, 9, 0, 1, 16, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 3, 10, 0, 2, 33, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8
-	warp_def 8, 13, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
-	warp_def 9, 13, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
-	warp_def 6, 3, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
-	warp_def 10, 3, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
-
-BattleFrontier_BattlePalaceCorridor_MapEvents:: @ 853C4E8
-	map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc
deleted file mode 100644
index 318ac3c49..000000000
--- a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 8, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 24, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 18, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 0, 2, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 19, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0, 0, 0
-
-BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0
-	warp_def 12, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 13, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 5, 4, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
-
-BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8
-	bg_event 2, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC50
-	bg_event 16, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC69
-	bg_event 10, 4, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6
-
-BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C
-	map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents
-
diff --git a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc b/data/maps/events/BattleFrontier_BattlePikeCorridor.inc
deleted file mode 100644
index 1960c0d63..000000000
--- a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54
-	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 6, 6, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C
-	map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattlePikeLobby.inc b/data/maps/events/BattleFrontier_BattlePikeLobby.inc
deleted file mode 100644
index 6def28528..000000000
--- a/data/maps/events/BattleFrontier_BattlePikeLobby.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 5, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 0, 5, 3, 9, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0, 0, 0
-
-BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10
-	warp_def 5, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 4, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 6, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28
-	bg_event 8, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BA80
-	bg_event 1, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAC6
-
-BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40
-	map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents
-
diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc
deleted file mode 100644
index 03e0a15e4..000000000
--- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54
-	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TRADER, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0, 0, 0
-
-BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
-	coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
-	coord_event 3, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
-	coord_event 3, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
-	coord_event 4, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
-	coord_event 5, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
-	coord_event 4, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
-	coord_event 5, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
-
-BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4
-	map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc
deleted file mode 100644
index 69c213606..000000000
--- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08
-	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 2, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20
-	map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc
deleted file mode 100644
index f2bca38c1..000000000
--- a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80
-	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0, 0, 0
-
-BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
-	coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E
-	coord_event 6, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59
-	coord_event 10, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64
-	coord_event 5, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
-	coord_event 6, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
-	coord_event 6, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
-	coord_event 5, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
-	coord_event 7, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
-	coord_event 7, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
-
-BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40
-	map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc
deleted file mode 100644
index 63e7f2acd..000000000
--- a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 0, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 14, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 9, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_TEALA, 0, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 0, 12, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0, 0, 0
-
-BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0
-	warp_def 7, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 6, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 8, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: @ 853D108
-	map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc
deleted file mode 100644
index 7d531b54b..000000000
--- a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 0, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC
-	map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc
deleted file mode 100644
index fccb4abff..000000000
--- a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598
-	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 7, 12, 4, 8, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 14, 13, 4, 9, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 2, 15, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 16, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0, 0, 0
-
-BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8
-	warp_def 7, 17, 4, 3, BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600
-	bg_event 5, 12, 0, 1, 0, BattleFrontier_BattlePyramidLobby_EventScript_250D42
-	bg_event 1, 12, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E95
-
-BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618
-	map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents
-
diff --git a/data/maps/events/BattleFrontier_BattlePyramidTop.inc b/data/maps/events/BattleFrontier_BattlePyramidTop.inc
deleted file mode 100644
index a6ca1adea..000000000
--- a/data/maps/events/BattleFrontier_BattlePyramidTop.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0
-	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 17, 11, 6, 8, 17, 0, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 0, 17, 7, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0
-	coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256
-
-BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800
-	map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc
deleted file mode 100644
index af9677524..000000000
--- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
-	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818
-	warp_def 5, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
-	warp_def 6, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
-
-BattleFrontier_BattleTowerBattleRoom_MapEvents:: @ 853B828
-	map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc
deleted file mode 100644
index 2d8dcaa07..000000000
--- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
-	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
-	object_event 5, 255, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, 254, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054
-	map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor.inc
deleted file mode 100644
index a363801f0..000000000
--- a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC
-	map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc
deleted file mode 100644
index c2f1e30bf..000000000
--- a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50
-	object_event 1, 255, 0, 0, 1, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, 254, 0, 0, 14, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0
-	map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleTowerElevator.inc b/data/maps/events/BattleFrontier_BattleTowerElevator.inc
deleted file mode 100644
index a4dbc6afa..000000000
--- a/data/maps/events/BattleFrontier_BattleTowerElevator.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_BattleTowerElevator_MapEvents:: @ 853B790
-	map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleTowerLobby.inc b/data/maps/events/BattleFrontier_BattleTowerLobby.inc
deleted file mode 100644
index 2faa6a413..000000000
--- a/data/maps/events/BattleFrontier_BattleTowerLobby.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 17, 8, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 15, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918, 0, 0
-	object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 0, 1, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701, 0, 0
-	object_event 7, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_TEALA, 0, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0, 0, 0
-
-BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710
-	warp_def 12, 9, 3, 0, BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 13, 9, 3, 0, BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 6, 1, 0, 0, BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM
-
-BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728
-	bg_event 4, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFC7
-	bg_event 8, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFE0
-	bg_event 12, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFF9
-	bg_event 16, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23F012
-	bg_event 2, 1, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23F4BE
-
-BattleFrontier_BattleTowerLobby_MapEvents:: @ 853B764
-	map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents
-
diff --git a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc
deleted file mode 100644
index 3d2bb6127..000000000
--- a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 2, 10, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 17, 11, 3, 14, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 10, 11, 3, 7, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 13, 10, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716, 0, 0
-	object_event 8, 246, 0, 0, 15, 13, 3, 15, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864, 0, 0
-	object_event 9, 247, 0, 0, 4, 12, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865, 0, 0
-
-BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C
-	map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_Lounge1.inc b/data/maps/events/BattleFrontier_Lounge1.inc
deleted file mode 100644
index b00838290..000000000
--- a/data/maps/events/BattleFrontier_Lounge1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-BattleFrontier_Lounge1_EventObjects: @ 853CFB4
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 0, 6, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 7, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 4, 0, 2, 18, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0, 0, 0
-
-BattleFrontier_Lounge1_MapWarps: @ 853CFFC
-	warp_def 4, 9, 0, 5, BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_Lounge1_MapEvents:: @ 853D004
-	map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_Lounge2.inc b/data/maps/events/BattleFrontier_Lounge2.inc
deleted file mode 100644
index 0370b2a18..000000000
--- a/data/maps/events/BattleFrontier_Lounge2.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_Lounge2_EventObjects: @ 853D11C
-	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 4, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0, 0, 0
-
-BattleFrontier_Lounge2_MapWarps: @ 853D194
-	warp_def 1, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 2, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_Lounge2_MapEvents:: @ 853D1A4
-	map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_Lounge3.inc b/data/maps/events/BattleFrontier_Lounge3.inc
deleted file mode 100644
index 6349cd381..000000000
--- a/data/maps/events/BattleFrontier_Lounge3.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-BattleFrontier_Lounge3_EventObjects: @ 853D1B8
-	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 6, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 6, 0, 2, 48, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0, 0, 0
-
-BattleFrontier_Lounge3_MapWarps: @ 853D230
-	warp_def 4, 9, 0, 9, BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_Lounge3_MapEvents:: @ 853D238
-	map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_Lounge4.inc b/data/maps/events/BattleFrontier_Lounge4.inc
deleted file mode 100644
index 2076facee..000000000
--- a/data/maps/events/BattleFrontier_Lounge4.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-BattleFrontier_Lounge4_EventObjects: @ 853D24C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 4, 4, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_COOK, 0, 0, 6, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 5, 0, 10, 18, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0, 0, 0
-
-BattleFrontier_Lounge4_MapWarps: @ 853D294
-	warp_def 4, 9, 0, 6, BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_Lounge4_MapEvents:: @ 853D29C
-	map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_Lounge5.inc b/data/maps/events/BattleFrontier_Lounge5.inc
deleted file mode 100644
index a8e5f97f5..000000000
--- a/data/maps/events/BattleFrontier_Lounge5.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-BattleFrontier_Lounge5_EventObjects: @ 853D2EC
-	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 12, 4, 4, 9, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 0, 4, 3, 10, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 11, 7, 0, 1, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0, 0, 0
-
-BattleFrontier_Lounge5_MapWarps: @ 853D34C
-	warp_def 1, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 2, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_Lounge5_MapEvents:: @ 853D35C
-	map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_Lounge6.inc b/data/maps/events/BattleFrontier_Lounge6.inc
deleted file mode 100644
index be0db4f08..000000000
--- a/data/maps/events/BattleFrontier_Lounge6.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-BattleFrontier_Lounge6_EventObjects: @ 853D370
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0, 0, 0
-
-BattleFrontier_Lounge6_MapWarps: @ 853D388
-	warp_def 4, 9, 0, 8, BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_Lounge6_MapEvents:: @ 853D390
-	map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_Lounge7.inc b/data/maps/events/BattleFrontier_Lounge7.inc
deleted file mode 100644
index b4e6cc5eb..000000000
--- a/data/maps/events/BattleFrontier_Lounge7.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattleFrontier_Lounge7_EventObjects: @ 853D3A4
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 0, 7, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 8, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0, 0, 0
-
-BattleFrontier_Lounge7_MapWarps: @ 853D404
-	warp_def 4, 9, 0, 7, BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_Lounge7_MapEvents:: @ 853D40C
-	map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_Lounge8.inc b/data/maps/events/BattleFrontier_Lounge8.inc
deleted file mode 100644
index 99aa3333c..000000000
--- a/data/maps/events/BattleFrontier_Lounge8.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-BattleFrontier_Lounge8_EventObjects: @ 853D4BC
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 5, 0, 2, 34, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 7, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0, 0, 0
-
-BattleFrontier_Lounge8_MapWarps: @ 853D504
-	warp_def 4, 9, 0, 10, BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_Lounge8_MapEvents:: @ 853D50C
-	map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_Lounge9.inc b/data/maps/events/BattleFrontier_Lounge9.inc
deleted file mode 100644
index 7c478fabe..000000000
--- a/data/maps/events/BattleFrontier_Lounge9.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_Lounge9_EventObjects: @ 853D520
-	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 3, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleFrontier_Lounge9_MapWarps: @ 853D538
-	warp_def 1, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 2, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_Lounge9_MapEvents:: @ 853D548
-	map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_Mart.inc b/data/maps/events/BattleFrontier_Mart.inc
deleted file mode 100644
index 969b54855..000000000
--- a/data/maps/events/BattleFrontier_Mart.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-BattleFrontier_Mart_EventObjects: @ 853D68C
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0, 0, 0
-
-BattleFrontier_Mart_MapWarps: @ 853D6EC
-	warp_def 3, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 4, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_Mart_MapEvents:: @ 853D6FC
-	map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_OutsideEast.inc b/data/maps/events/BattleFrontier_OutsideEast.inc
deleted file mode 100644
index 3d7c53493..000000000
--- a/data/maps/events/BattleFrontier_OutsideEast.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-BattleFrontier_OutsideEast_EventObjects: @ 853BB10
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 20, 17, 0, 27, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 42, 15, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 54, 16, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_COOK, 0, 0, 41, 56, 3, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 46, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 34, 41, 0, 28, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 0, 45, 47, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 59, 35, 0, 26, 97, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 18, 40, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 0, 17, 40, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 40, 56, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 0, 54, 62, 3, 8, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842, 0, 0
-	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 0, 42, 34, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 0, 51, 53, 3, 2, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 62, 18, 0, 46, 98, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 21, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0, 0, 0
-	object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 10, 21, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0, 0, 0
-	object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 16, 30, 0, 2, 35, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0, 0, 0
-	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0, 0, 0
-	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 0, 54, 31, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0, 0, 0
-	object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 54, 32, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0, 0, 0
-	object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 58, 55, 3, 17, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0, 0, 0
-	object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 48, 41, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0, 0, 0
-	object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 14, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0, 0, 0
-
-BattleFrontier_OutsideEast_MapWarps: @ 853BD80
-	warp_def 16, 14, 0, 0, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
-	warp_def 39, 29, 0, 0, BATTLE_FRONTIER_BATTLE_ARENA_LOBBY
-	warp_def 45, 56, 0, 0, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
-	warp_def 58, 14, 0, 0, BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY
-	warp_def 35, 12, 3, 0, BATTLE_FRONTIER_RANKING_HALL
-	warp_def 4, 44, 0, 0, BATTLE_FRONTIER_LOUNGE_1
-	warp_def 10, 28, 0, 0, BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER
-	warp_def 22, 51, 0, 0, BATTLE_FRONTIER_LOUNGE_5
-	warp_def 5, 8, 0, 0, BATTLE_FRONTIER_LOUNGE_6
-	warp_def 65, 31, 0, 0, BATTLE_FRONTIER_LOUNGE_3
-	warp_def 14, 51, 0, 0, BATTLE_FRONTIER_LOUNGE_8
-	warp_def 21, 45, 0, 0, BATTLE_FRONTIER_LOUNGE_9
-	warp_def 3, 51, 0, 0, BATTLE_FRONTIER_POKEMON_CENTER_1F
-	warp_def 28, 7, 0, 0, ARTISAN_CAVE_1F
-
-BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0
-	bg_event 13, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C43
-	bg_event 43, 56, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C4C
-	bg_event 36, 34, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C55
-	bg_event 62, 15, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C5E
-	bg_event 7, 29, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DD7
-	bg_event 32, 13, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DCE
-	bg_event 4, 51, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_271E73
-	bg_event 5, 51, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_271E73
-
-BattleFrontier_OutsideEast_MapEvents:: @ 853BE50
-	map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents
-
diff --git a/data/maps/events/BattleFrontier_OutsideWest.inc b/data/maps/events/BattleFrontier_OutsideWest.inc
deleted file mode 100644
index 7923af813..000000000
--- a/data/maps/events/BattleFrontier_OutsideWest.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-BattleFrontier_OutsideWest_EventObjects: @ 853B350
-	object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 0, 26, 38, 0, 2, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 20, 70, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 19, 68, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 27, 30, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 33, 41, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 28, 43, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 17, 20, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 13, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 0, 23, 47, 0, 15, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 0, 38, 27, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 45, 18, 0, 3, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 0, 9, 47, 0, 15, 33, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_LASS, 0, 0, 35, 5, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 0, 11, 66, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 31, 31, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 42, 48, 0, 18, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0, 0, 0
-	object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 38, 22, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0, 0, 0
-	object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 9, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0, 0, 0
-	object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 0, 12, 10, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0, 0, 0
-	object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 10, 0, 23, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0, 0, 0
-	object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 0, 8, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0, 0, 0
-	object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 26, 0, 24, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0, 0, 0
-
-BattleFrontier_OutsideWest_MapWarps: @ 853B590
-	warp_def 42, 27, 0, 0, BATTLE_FRONTIER_BATTLE_PIKE_LOBBY
-	warp_def 19, 17, 0, 0, BATTLE_FRONTIER_BATTLE_DOME_LOBBY
-	warp_def 11, 38, 0, 0, BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY
-	warp_def 45, 44, 0, 0, BATTLE_FRONTIER_LOUNGE_2
-	warp_def 51, 51, 0, 0, BATTLE_FRONTIER_MART
-	warp_def 44, 5, 0, 0, BATTLE_FRONTIER_SCOTTS_HOUSE
-	warp_def 53, 44, 0, 0, BATTLE_FRONTIER_LOUNGE_4
-	warp_def 5, 20, 0, 0, BATTLE_FRONTIER_LOUNGE_7
-	warp_def 26, 65, 0, 0, BATTLE_FRONTIER_RECEPTION_GATE
-	warp_def 26, 61, 0, 1, BATTLE_FRONTIER_RECEPTION_GATE
-	warp_def 39, 55, 0, 0, ARTISAN_CAVE_B1F
-
-BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8
-	bg_event 15, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4E2
-	bg_event 45, 30, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4F4
-	bg_event 16, 43, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4EB
-	bg_event 52, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A
-	bg_event 53, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A
-
-BattleFrontier_OutsideWest_MapEvents:: @ 853B624
-	map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents
-
diff --git a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc
deleted file mode 100644
index 262744ce1..000000000
--- a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0, 0, 0
-
-BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4
-	warp_def 7, 8, 3, 12, BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 6, 8, 3, 12, BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 1, 6, 4, 0, BATTLE_FRONTIER_POKEMON_CENTER_2F
-
-BattleFrontier_PokemonCenter_1F_MapEvents:: @ 853D5EC
-	map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc
deleted file mode 100644
index f9d9d408a..000000000
--- a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-
-BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660
-	warp_def 1, 6, 4, 2, BATTLE_FRONTIER_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-BattleFrontier_PokemonCenter_2F_MapEvents:: @ 853D678
-	map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_RankingHall.inc b/data/maps/events/BattleFrontier_RankingHall.inc
deleted file mode 100644
index 81058b042..000000000
--- a/data/maps/events/BattleFrontier_RankingHall.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-BattleFrontier_RankingHall_EventObjects: @ 853CEB8
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 24, 13, 3, 8, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 0, 44, 11, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0, 0, 0
-
-BattleFrontier_RankingHall_MapWarps: @ 853CF00
-	warp_def 26, 14, 3, 4, BATTLE_FRONTIER_OUTSIDE_EAST
-	warp_def 27, 14, 3, 4, BATTLE_FRONTIER_OUTSIDE_EAST
-
-BattleFrontier_RankingHall_MapBGEvents: @ 853CF10
-	bg_event 26, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4AA
-	bg_event 23, 8, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4B6
-	bg_event 26, 5, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4C2
-	bg_event 29, 8, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4CE
-	bg_event 42, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4DA
-	bg_event 46, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4E6
-	bg_event 10, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4F2
-	bg_event 8, 7, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4FE
-	bg_event 6, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E50A
-	bg_event 44, 7, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E516
-	bg_event 16, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E538
-	bg_event 36, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E541
-
-BattleFrontier_RankingHall_MapEvents:: @ 853CFA0
-	map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents
-
diff --git a/data/maps/events/BattleFrontier_ReceptionGate.inc b/data/maps/events/BattleFrontier_ReceptionGate.inc
deleted file mode 100644
index 8984c44a0..000000000
--- a/data/maps/events/BattleFrontier_ReceptionGate.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_ReceptionGate_EventObjects: @ 853D420
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 8, 11, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 0, 4, 5, 3, 8, 17, 0, 0, 0, 0x0, 836, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0, 0, 0
-
-BattleFrontier_ReceptionGate_MapWarps: @ 853D498
-	warp_def 4, 13, 0, 8, BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 4, 1, 0, 9, BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_ReceptionGate_MapEvents:: @ 853D4A8
-	map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_ScottsHouse.inc b/data/maps/events/BattleFrontier_ScottsHouse.inc
deleted file mode 100644
index 4ea329ab9..000000000
--- a/data/maps/events/BattleFrontier_ScottsHouse.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0
-	object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0, 0, 0
-
-BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8
-	warp_def 2, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 3, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_ScottsHouse_MapEvents:: @ 853D2D8
-	map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare01.inc b/data/maps/events/BattlePyramidSquare01.inc
deleted file mode 100644
index 0226b4fdb..000000000
--- a/data/maps/events/BattlePyramidSquare01.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare01_EventObjects: @ 853A460
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 3, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare01_MapEvents:: @ 853A508
-	map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/events/BattlePyramidSquare02.inc
deleted file mode 100644
index 8b14a4a47..000000000
--- a/data/maps/events/BattlePyramidSquare02.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare02_EventObjects: @ 853A51C
-	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare02_MapEvents:: @ 853A5C4
-	map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare03.inc b/data/maps/events/BattlePyramidSquare03.inc
deleted file mode 100644
index 4b7713426..000000000
--- a/data/maps/events/BattlePyramidSquare03.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare03_EventObjects: @ 853A5D8
-	object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 1, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare03_MapEvents:: @ 853A680
-	map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare04.inc b/data/maps/events/BattlePyramidSquare04.inc
deleted file mode 100644
index dd35fcc43..000000000
--- a/data/maps/events/BattlePyramidSquare04.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare04_EventObjects: @ 853A694
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 2, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare04_MapEvents:: @ 853A73C
-	map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare05.inc b/data/maps/events/BattlePyramidSquare05.inc
deleted file mode 100644
index 766ee7626..000000000
--- a/data/maps/events/BattlePyramidSquare05.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare05_EventObjects: @ 853A750
-	object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 4, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare05_MapEvents:: @ 853A7F8
-	map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare06.inc b/data/maps/events/BattlePyramidSquare06.inc
deleted file mode 100644
index 64ab2e226..000000000
--- a/data/maps/events/BattlePyramidSquare06.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare06_EventObjects: @ 853A80C
-	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 5, 2, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 5, 5, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare06_MapEvents:: @ 853A8B4
-	map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare07.inc b/data/maps/events/BattlePyramidSquare07.inc
deleted file mode 100644
index a3a0734f1..000000000
--- a/data/maps/events/BattlePyramidSquare07.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare07_EventObjects: @ 853A8C8
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 0, 6, 4, 10, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 0, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare07_MapEvents:: @ 853A970
-	map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare08.inc b/data/maps/events/BattlePyramidSquare08.inc
deleted file mode 100644
index dfcfdb451..000000000
--- a/data/maps/events/BattlePyramidSquare08.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare08_EventObjects: @ 853A984
-	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 2, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 2, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare08_MapEvents:: @ 853AA2C
-	map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare09.inc b/data/maps/events/BattlePyramidSquare09.inc
deleted file mode 100644
index dc4ab38ee..000000000
--- a/data/maps/events/BattlePyramidSquare09.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare09_EventObjects: @ 853AA40
-	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 0, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare09_MapEvents:: @ 853AAE8
-	map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare10.inc b/data/maps/events/BattlePyramidSquare10.inc
deleted file mode 100644
index 9e87c6b06..000000000
--- a/data/maps/events/BattlePyramidSquare10.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare10_EventObjects: @ 853AAFC
-	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 3, 4, 10, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 5, 4, 9, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare10_MapEvents:: @ 853ABA4
-	map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare11.inc b/data/maps/events/BattlePyramidSquare11.inc
deleted file mode 100644
index b0ce15fb5..000000000
--- a/data/maps/events/BattlePyramidSquare11.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare11_EventObjects: @ 853ABB8
-	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 2, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 6, 4, 14, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 4, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 7, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare11_MapEvents:: @ 853AC60
-	map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare12.inc b/data/maps/events/BattlePyramidSquare12.inc
deleted file mode 100644
index 08783200f..000000000
--- a/data/maps/events/BattlePyramidSquare12.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare12_EventObjects: @ 853AC74
-	object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 7, 5, 4, 9, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 0, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 3, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare12_MapEvents:: @ 853AD1C
-	map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare13.inc b/data/maps/events/BattlePyramidSquare13.inc
deleted file mode 100644
index a930160cb..000000000
--- a/data/maps/events/BattlePyramidSquare13.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare13_EventObjects: @ 853AD30
-	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare13_MapEvents:: @ 853ADD8
-	map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare14.inc b/data/maps/events/BattlePyramidSquare14.inc
deleted file mode 100644
index a81c9b5e0..000000000
--- a/data/maps/events/BattlePyramidSquare14.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare14_EventObjects: @ 853ADEC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 1, 4, 17, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 4, 16, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare14_MapEvents:: @ 853AE94
-	map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare15.inc b/data/maps/events/BattlePyramidSquare15.inc
deleted file mode 100644
index fe0d085bd..000000000
--- a/data/maps/events/BattlePyramidSquare15.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare15_EventObjects: @ 853AEA8
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare15_MapEvents:: @ 853AF50
-	map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare16.inc b/data/maps/events/BattlePyramidSquare16.inc
deleted file mode 100644
index 11abe791d..000000000
--- a/data/maps/events/BattlePyramidSquare16.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare16_EventObjects: @ 853AF64
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 6, 4, 16, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 0, 0, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 7, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-
-BattlePyramidSquare16_MapEvents:: @ 853B00C
-	map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BirthIsland_Exterior.inc b/data/maps/events/BirthIsland_Exterior.inc
deleted file mode 100644
index 1d6238e8f..000000000
--- a/data/maps/events/BirthIsland_Exterior.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BirthIsland_Exterior_EventObjects: @ 853D7DC
-	object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 0, 15, 12, 3, 8, 17, 0, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764, 0, 0
-	object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 0, 15, 3, 0, 8, 17, 0, 0, 0, 0x0, 763, 0, 0
-
-BirthIsland_Exterior_MapWarps: @ 853D80C
-	warp_def 15, 24, 0, 0, BIRTH_ISLAND_HARBOR
-
-BirthIsland_Exterior_MapEvents:: @ 853D814
-	map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BirthIsland_Harbor.inc b/data/maps/events/BirthIsland_Harbor.inc
deleted file mode 100644
index bb2d6036d..000000000
--- a/data/maps/events/BirthIsland_Harbor.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BirthIsland_Harbor_EventObjects: @ 853D828
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-BirthIsland_Harbor_MapWarps: @ 853D858
-	warp_def 8, 2, 0, 0, BIRTH_ISLAND_EXTERIOR
-
-BirthIsland_Harbor_MapEvents:: @ 853D860
-	map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/events/CaveOfOrigin_1F.inc
deleted file mode 100644
index 8dfdb78d0..000000000
--- a/data/maps/events/CaveOfOrigin_1F.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-CaveOfOrigin_1F_MapWarps: @ 8535D40
-	warp_def 11, 17, 3, 1, CAVE_OF_ORIGIN_ENTRANCE
-	warp_def 14, 5, 3, 0, CAVE_OF_ORIGIN_B1F
-
-CaveOfOrigin_1F_MapEvents:: @ 8535D50
-	map_events 0x0, CaveOfOrigin_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc
deleted file mode 100644
index 148bb22a6..000000000
--- a/data/maps/events/CaveOfOrigin_B1F.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-CaveOfOrigin_B1F_EventObjects: @ 8535DD0
-	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 9, 13, 3, 7, 17, 0, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820, 0, 0
-
-CaveOfOrigin_B1F_MapWarps: @ 8535DE8
-	warp_def 9, 3, 3, 1, CAVE_OF_ORIGIN_1F
-
-CaveOfOrigin_B1F_MapEvents:: @ 8535DF0
-	map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/events/CaveOfOrigin_Entrance.inc
deleted file mode 100644
index 96946936b..000000000
--- a/data/maps/events/CaveOfOrigin_Entrance.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-CaveOfOrigin_Entrance_MapWarps: @ 8535D1C
-	warp_def 9, 20, 3, 3, SOOTOPOLIS_CITY
-	warp_def 9, 5, 3, 0, CAVE_OF_ORIGIN_1F
-
-CaveOfOrigin_Entrance_MapEvents:: @ 8535D2C
-	map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc
deleted file mode 100644
index f60a5e1a2..000000000
--- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64
-	warp_def 13, 5, 3, 1, CAVE_OF_ORIGIN_1F
-	warp_def 5, 11, 3, 0, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_2
-
-CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74
-	map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc
deleted file mode 100644
index 256b6179e..000000000
--- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88
-	warp_def 5, 10, 3, 1, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_1
-	warp_def 8, 14, 3, 0, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_3
-
-CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98
-	map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc
deleted file mode 100644
index 87a99e5d2..000000000
--- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC
-	warp_def 7, 14, 3, 1, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_2
-	warp_def 12, 6, 3, 0, CAVE_OF_ORIGIN_B1F
-
-CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: @ 8535DBC
-	map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc
deleted file mode 100644
index 2253dec67..000000000
--- a/data/maps/events/DesertRuins.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-DesertRuins_EventObjects: @ 8534354
-	object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935, 0, 0
-
-DesertRuins_MapWarps: @ 853436C
-	warp_def 8, 29, 3, 1, ROUTE_111
-	warp_def 8, 20, 0, 2, DESERT_RUINS
-	warp_def 8, 11, 3, 1, DESERT_RUINS
-
-DesertRuins_MapBGEvents: @ 8534384
-	bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_22D9DB
-	bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8
-	bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8
-
-DesertRuins_MapEvents:: @ 85343A8
-	map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents
-
diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/events/DesertUnderpass.inc
deleted file mode 100644
index deb440ff9..000000000
--- a/data/maps/events/DesertUnderpass.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-DesertUnderpass_EventObjects: @ 85376D4
-	object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 0, 132, 10, 0, 8, 17, 0, 0, 0, DesertUnderpass_EventScript_23AF41, 874, 0, 0
-
-DesertUnderpass_MapWarps: @ 85376EC
-	warp_def 10, 12, 0, 2, ROUTE_114_FOSSIL_MANIACS_TUNNEL
-
-DesertUnderpass_MapEvents:: @ 85376F4
-	map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc
deleted file mode 100644
index 8bb897125..000000000
--- a/data/maps/events/DewfordTown.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-DewfordTown_EventObjects: @ 8527964
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 9, 3, 9, 16, 0, 0, 3, DewfordTown_EventScript_1E9511, 740, 0, 0
-	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0, 0, 0
-
-DewfordTown_MapWarps: @ 85279DC
-	warp_def 3, 3, 0, 0, DEWFORD_TOWN_HALL
-	warp_def 2, 10, 0, 0, DEWFORD_TOWN_POKEMON_CENTER_1F
-	warp_def 8, 17, 0, 0, DEWFORD_TOWN_GYM
-	warp_def 17, 14, 0, 0, DEWFORD_TOWN_HOUSE_1
-	warp_def 8, 8, 0, 0, DEWFORD_TOWN_HOUSE_2
-
-DewfordTown_MapBGEvents: @ 8527A04
-	bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_1E95BA
-	bg_event 11, 16, 0, 0, 0, DewfordTown_EventScript_1E95C3
-	bg_event 4, 10, 0, 1, 0, DewfordTown_EventScript_271E73
-	bg_event 3, 10, 0, 1, 0, DewfordTown_EventScript_271E73
-	bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_1E95CC
-
-DewfordTown_MapEvents:: @ 8527A40
-	map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents
-
diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc
deleted file mode 100644
index 8d7a8e460..000000000
--- a/data/maps/events/DewfordTown_Gym.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-DewfordTown_Gym_EventObjects: @ 852DB34
-	object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 0, 4, 3, 0, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 18, 0, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 3, 3, 8, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 12, 25, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 8, 1, 10, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 0, 16, 9, 3, 8, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 0, 14, 12, 1, 10, 17, 0, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0, 0, 0
-
-DewfordTown_Gym_MapWarps: @ 852DBF4
-	warp_def 5, 27, 0, 2, DEWFORD_TOWN
-	warp_def 6, 27, 0, 2, DEWFORD_TOWN
-
-DewfordTown_Gym_MapBGEvents: @ 852DC04
-	bg_event 4, 23, 3, 1, 0, DewfordTown_Gym_EventScript_1FC9A2
-	bg_event 7, 23, 3, 1, 0, DewfordTown_Gym_EventScript_1FC9B2
-	bg_event 4, 24, 0, 1, 0, DewfordTown_Gym_EventScript_1FC9A2
-	bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_1FC9B2
-
-DewfordTown_Gym_MapEvents:: @ 852DC34
-	map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents
-
diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc
deleted file mode 100644
index c4b6600ec..000000000
--- a/data/maps/events/DewfordTown_Hall.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-DewfordTown_Hall_EventObjects: @ 852DC48
-	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940, 0, 0
-
-DewfordTown_Hall_MapWarps: @ 852DD20
-	warp_def 5, 8, 0, 0, DEWFORD_TOWN
-	warp_def 6, 8, 0, 0, DEWFORD_TOWN
-
-DewfordTown_Hall_MapBGEvents: @ 852DD30
-	bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD590
-	bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD5A0
-
-DewfordTown_Hall_MapEvents:: @ 852DD48
-	map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents
-
diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc
deleted file mode 100644
index 72b63dff3..000000000
--- a/data/maps/events/DewfordTown_House1.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-DewfordTown_House1_EventObjects: @ 852D9C8
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 2, 3, 8, 19, 0, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0, 0, 0
-
-DewfordTown_House1_MapWarps: @ 852DA10
-	warp_def 3, 7, 0, 3, DEWFORD_TOWN
-	warp_def 4, 7, 0, 3, DEWFORD_TOWN
-
-DewfordTown_House1_MapEvents:: @ 852DA20
-	map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc
deleted file mode 100644
index 901046cbc..000000000
--- a/data/maps/events/DewfordTown_House2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-DewfordTown_House2_EventObjects: @ 852DD5C
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0, 0, 0
-
-DewfordTown_House2_MapWarps: @ 852DD8C
-	warp_def 3, 8, 0, 4, DEWFORD_TOWN
-	warp_def 4, 8, 0, 4, DEWFORD_TOWN
-
-DewfordTown_House2_MapEvents:: @ 852DD9C
-	map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc
deleted file mode 100644
index f61966b88..000000000
--- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 0, 5, 18, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0, 0, 0
-
-DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C
-	warp_def 7, 8, 3, 1, DEWFORD_TOWN
-	warp_def 6, 8, 3, 1, DEWFORD_TOWN
-	warp_def 1, 6, 4, 0, DEWFORD_TOWN_POKEMON_CENTER_2F
-
-DewfordTown_PokemonCenter_1F_MapEvents:: @ 852DA94
-	map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/events/DewfordTown_PokemonCenter_2F.inc
deleted file mode 100644
index 7098e6ed8..000000000
--- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-
-DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08
-	warp_def 1, 6, 4, 2, DEWFORD_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-DewfordTown_PokemonCenter_2F_MapEvents:: @ 852DB20
-	map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/events/DoubleBattleColosseum.inc
deleted file mode 100644
index d1d4f0fef..000000000
--- a/data/maps/events/DoubleBattleColosseum.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DoubleBattleColosseum_MapWarps: @ 8539E88
-	warp_def 5, 8, 3, 127, NONE
-	warp_def 6, 8, 3, 127, NONE
-	warp_def 7, 8, 3, 127, NONE
-	warp_def 8, 8, 3, 127, NONE
-
-DoubleBattleColosseum_MapCoordEvents: @ 8539EA8
-	coord_event 3, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277388
-	coord_event 3, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773BE
-	coord_event 10, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773A3
-	coord_event 10, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773D9
-
-DoubleBattleColosseum_MapEvents:: @ 8539EE8
-	map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/events/EverGrandeCity.inc
deleted file mode 100644
index fb471b4ff..000000000
--- a/data/maps/events/EverGrandeCity.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-EverGrandeCity_MapWarps: @ 8527588
-	warp_def 18, 5, 0, 0, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
-	warp_def 27, 48, 0, 0, EVER_GRANDE_CITY_POKEMON_CENTER_1F
-	warp_def 18, 41, 0, 0, VICTORY_ROAD_1F
-	warp_def 18, 27, 0, 1, VICTORY_ROAD_1F
-
-EverGrandeCity_MapCoordEvents: @ 85275A8
-	coord_event 17, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 16, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 18, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 19, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 20, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 21, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 22, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 23, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 24, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 25, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
-	coord_event 26, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46
-
-EverGrandeCity_MapBGEvents: @ 8527658
-	bg_event 19, 43, 5, 0, 0, EverGrandeCity_EventScript_1E7D2B
-	bg_event 29, 48, 0, 1, 0, EverGrandeCity_EventScript_271E73
-	bg_event 18, 52, 5, 0, 0, EverGrandeCity_EventScript_1E7D34
-	bg_event 23, 15, 0, 0, 0, EverGrandeCity_EventScript_1E7D3D
-	bg_event 28, 48, 0, 1, 0, EverGrandeCity_EventScript_271E73
-
-EverGrandeCity_MapEvents:: @ 8527694
-	map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents
-
diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc
deleted file mode 100644
index 269645dc6..000000000
--- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700
-	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 920, 0, 0
-	object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921, 0, 0
-
-EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748
-	warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_HALL_4
-	warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_OF_FAME
-
-EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758
-	map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc
deleted file mode 100644
index 761e321d6..000000000
--- a/data/maps/events/EverGrandeCity_DrakesRoom.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4
-	object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0, 0, 0
-
-EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC
-	warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_3
-	warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_4
-
-EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC
-	map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc
deleted file mode 100644
index a8632b8c1..000000000
--- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688
-	object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0, 0, 0
-
-EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0
-	warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_2
-	warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_3
-
-EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0
-	map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/EverGrandeCity_Hall1.inc b/data/maps/events/EverGrandeCity_Hall1.inc
deleted file mode 100644
index 8f9e791a8..000000000
--- a/data/maps/events/EverGrandeCity_Hall1.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_Hall1_MapWarps: @ 853376C
-	warp_def 5, 12, 3, 1, EVER_GRANDE_CITY_SIDNEYS_ROOM
-	warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_PHOEBES_ROOM
-	warp_def 4, 12, 3, 1, EVER_GRANDE_CITY_SIDNEYS_ROOM
-	warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_SIDNEYS_ROOM
-
-EverGrandeCity_Hall1_MapEvents:: @ 853378C
-	map_events 0x0, EverGrandeCity_Hall1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/EverGrandeCity_Hall2.inc b/data/maps/events/EverGrandeCity_Hall2.inc
deleted file mode 100644
index c9426ceea..000000000
--- a/data/maps/events/EverGrandeCity_Hall2.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_Hall2_MapWarps: @ 85337A0
-	warp_def 5, 12, 3, 1, EVER_GRANDE_CITY_PHOEBES_ROOM
-	warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_GLACIAS_ROOM
-	warp_def 4, 12, 3, 1, EVER_GRANDE_CITY_PHOEBES_ROOM
-	warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_PHOEBES_ROOM
-
-EverGrandeCity_Hall2_MapEvents:: @ 85337C0
-	map_events 0x0, EverGrandeCity_Hall2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/EverGrandeCity_Hall3.inc b/data/maps/events/EverGrandeCity_Hall3.inc
deleted file mode 100644
index 68f506d00..000000000
--- a/data/maps/events/EverGrandeCity_Hall3.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_Hall3_MapWarps: @ 85337D4
-	warp_def 5, 12, 3, 1, EVER_GRANDE_CITY_GLACIAS_ROOM
-	warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_DRAKES_ROOM
-	warp_def 4, 12, 3, 1, EVER_GRANDE_CITY_GLACIAS_ROOM
-	warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_GLACIAS_ROOM
-
-EverGrandeCity_Hall3_MapEvents:: @ 85337F4
-	map_events 0x0, EverGrandeCity_Hall3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/EverGrandeCity_Hall4.inc b/data/maps/events/EverGrandeCity_Hall4.inc
deleted file mode 100644
index 4e7c4f7e6..000000000
--- a/data/maps/events/EverGrandeCity_Hall4.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-EverGrandeCity_Hall4_MapWarps: @ 8533808
-	warp_def 5, 33, 3, 1, EVER_GRANDE_CITY_DRAKES_ROOM
-	warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_CHAMPIONS_ROOM
-
-EverGrandeCity_Hall4_MapEvents:: @ 8533818
-	map_events 0x0, EverGrandeCity_Hall4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/EverGrandeCity_Hall5.inc b/data/maps/events/EverGrandeCity_Hall5.inc
deleted file mode 100644
index 69fa9a629..000000000
--- a/data/maps/events/EverGrandeCity_Hall5.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_Hall5_MapWarps: @ 853382C
-	warp_def 5, 12, 3, 2, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
-	warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_SIDNEYS_ROOM
-	warp_def 4, 12, 3, 2, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
-	warp_def 6, 12, 3, 2, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
-
-EverGrandeCity_Hall5_MapEvents:: @ 853384C
-	map_events 0x0, EverGrandeCity_Hall5_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc
deleted file mode 100644
index 0d75ef553..000000000
--- a/data/maps/events/EverGrandeCity_HallOfFame.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_HallOfFame_EventObjects: @ 85338FC
-	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-EverGrandeCity_HallOfFame_MapWarps: @ 8533914
-	warp_def 7, 11, 3, 1, EVER_GRANDE_CITY_CHAMPIONS_ROOM
-
-EverGrandeCity_HallOfFame_MapEvents:: @ 853391C
-	map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc
deleted file mode 100644
index dd09ad4a1..000000000
--- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C
-	object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0, 0, 0
-
-EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664
-	warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_1
-	warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_2
-
-EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674
-	map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
deleted file mode 100644
index a758c4d73..000000000
--- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793, 0, 0
-
-EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990
-	warp_def 7, 8, 3, 1, EVER_GRANDE_CITY
-	warp_def 6, 8, 3, 1, EVER_GRANDE_CITY
-	warp_def 1, 6, 4, 0, EVER_GRANDE_CITY_POKEMON_CENTER_2F
-
-EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 85339A8
-	map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
deleted file mode 100644
index bbedf59d2..000000000
--- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-
-EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C
-	warp_def 1, 6, 4, 2, EVER_GRANDE_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 8533A34
-	map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc
deleted file mode 100644
index a19984ea2..000000000
--- a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0
-
-EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0
-	warp_def 9, 11, 3, 0, EVER_GRANDE_CITY
-	warp_def 10, 11, 3, 0, EVER_GRANDE_CITY
-	warp_def 9, 1, 3, 0, EVER_GRANDE_CITY_HALL_5
-	warp_def 10, 1, 3, 0, EVER_GRANDE_CITY_HALL_5
-	warp_def 1, 7, 4, 0, EVER_GRANDE_CITY_POKEMON_LEAGUE_2F
-
-EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8
-	map_events EverGrandeCity_PokemonLeague_1F_EventObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc
deleted file mode 100644
index 6b85a2fb0..000000000
--- a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702, 0, 0
-
-EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8
-	warp_def 1, 6, 4, 4, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-EverGrandeCity_PokemonLeague_2F_MapEvents:: @ 8533AC0
-	map_events EverGrandeCity_PokemonLeague_2F_EventObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc
deleted file mode 100644
index 93d9a879e..000000000
--- a/data/maps/events/EverGrandeCity_SidneysRoom.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-EverGrandeCity_SidneysRoom_EventObjects: @ 8533610
-	object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0, 0, 0
-
-EverGrandeCity_SidneysRoom_MapWarps: @ 8533628
-	warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_5
-	warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_1
-
-EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638
-	map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc
deleted file mode 100644
index e9fb7579c..000000000
--- a/data/maps/events/FallarborTown.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-FallarborTown_EventObjects: @ 8527BE0
-	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 8, 11, 3, 8, 16, 0, 0, 0, FallarborTown_EventScript_1EB22B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 11, 15, 3, 3, 17, 0, 0, 0, FallarborTown_EventScript_1EB234, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907, 0, 0
-
-FallarborTown_MapWarps: @ 8527C40
-	warp_def 15, 15, 0, 0, FALLARBOR_TOWN_MART
-	warp_def 8, 7, 0, 0, FALLARBOR_TOWN_BATTLE_TENT_LOBBY
-	warp_def 14, 7, 0, 0, FALLARBOR_TOWN_POKEMON_CENTER_1F
-	warp_def 6, 17, 0, 0, FALLARBOR_TOWN_HOUSE_1
-	warp_def 1, 6, 0, 0, FALLARBOR_TOWN_HOUSE_2
-
-FallarborTown_MapBGEvents: @ 8527C68
-	bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_271E6A
-	bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_271E73
-	bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_1EB250
-	bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_271E73
-	bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_1EB259
-	bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_271E6A
-	bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_1EB262
-	bg_event 2, 15, 3, 7, 0, ITEM_NUGGET, 28, 0
-
-FallarborTown_MapEvents:: @ 8527CC8
-	map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
-
diff --git a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc b/data/maps/events/FallarborTown_BattleTentBattleRoom.inc
deleted file mode 100644
index 7c5842ab8..000000000
--- a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444
-	object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C
-	map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/FallarborTown_BattleTentCorridor.inc b/data/maps/events/FallarborTown_BattleTentCorridor.inc
deleted file mode 100644
index 35bca7b85..000000000
--- a/data/maps/events/FallarborTown_BattleTentCorridor.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-FallarborTown_BattleTentCorridor_EventObjects: @ 852E418
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-FallarborTown_BattleTentCorridor_MapEvents:: @ 852E430
-	map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/FallarborTown_BattleTentLobby.inc b/data/maps/events/FallarborTown_BattleTentLobby.inc
deleted file mode 100644
index e261f185f..000000000
--- a/data/maps/events/FallarborTown_BattleTentLobby.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-FallarborTown_BattleTentLobby_EventObjects: @ 852E370
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 12, 6, 3, 3, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 10, 9, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 0, 7, 3, 10, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767, 0, 0
-
-FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8
-	warp_def 6, 9, 0, 1, FALLARBOR_TOWN
-	warp_def 7, 9, 0, 1, FALLARBOR_TOWN
-
-FallarborTown_BattleTentLobby_MapBGEvents: @ 852E3F8
-	bg_event 4, 5, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20024F
-
-FallarborTown_BattleTentLobby_MapEvents:: @ 852E404
-	map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents
-
diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc
deleted file mode 100644
index b3975685c..000000000
--- a/data/maps/events/FallarborTown_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-FallarborTown_House1_EventObjects: @ 852E5B8
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FallarborTown_House1_EventScript_200F13, 928, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0, 0, 0
-
-FallarborTown_House1_MapWarps: @ 852E5E8
-	warp_def 3, 8, 0, 3, FALLARBOR_TOWN
-	warp_def 4, 8, 0, 3, FALLARBOR_TOWN
-
-FallarborTown_House1_MapEvents:: @ 852E5F8
-	map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc
deleted file mode 100644
index d809bf493..000000000
--- a/data/maps/events/FallarborTown_House2.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-FallarborTown_House2_EventObjects: @ 852E60C
-	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0, 0, 0
-
-FallarborTown_House2_MapWarps: @ 852E624
-	warp_def 3, 7, 0, 4, FALLARBOR_TOWN
-	warp_def 4, 7, 0, 4, FALLARBOR_TOWN
-
-FallarborTown_House2_MapEvents:: @ 852E634
-	map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc
deleted file mode 100644
index 762db16f9..000000000
--- a/data/maps/events/FallarborTown_Mart.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FallarborTown_Mart_EventObjects: @ 852E2D4
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 0, 2, 5, 3, 1, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0, 0, 0
-
-FallarborTown_Mart_MapWarps: @ 852E34C
-	warp_def 3, 7, 0, 0, FALLARBOR_TOWN
-	warp_def 4, 7, 0, 0, FALLARBOR_TOWN
-
-FallarborTown_Mart_MapEvents:: @ 852E35C
-	map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc
deleted file mode 100644
index e6c91a736..000000000
--- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871, 0, 0
-
-FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500
-	warp_def 7, 8, 3, 2, FALLARBOR_TOWN
-	warp_def 6, 8, 3, 2, FALLARBOR_TOWN
-	warp_def 1, 6, 4, 0, FALLARBOR_TOWN_POKEMON_CENTER_2F
-
-FallarborTown_PokemonCenter_1F_MapEvents:: @ 852E518
-	map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/events/FallarborTown_PokemonCenter_2F.inc
deleted file mode 100644
index 6ddb7e9c9..000000000
--- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-
-FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C
-	warp_def 1, 6, 4, 2, FALLARBOR_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-FallarborTown_PokemonCenter_2F_MapEvents:: @ 852E5A4
-	map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FarawayIsland_Entrance.inc b/data/maps/events/FarawayIsland_Entrance.inc
deleted file mode 100644
index 27d98189e..000000000
--- a/data/maps/events/FarawayIsland_Entrance.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-FarawayIsland_Entrance_EventObjects: @ 853D710
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 39, 3, 7, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-FarawayIsland_Entrance_MapWarps: @ 853D740
-	warp_def 22, 7, 3, 0, FARAWAY_ISLAND_INTERIOR
-	warp_def 23, 7, 3, 1, FARAWAY_ISLAND_INTERIOR
-
-FarawayIsland_Entrance_MapCoordEvents: @ 853D750
-	coord_event 9, 18, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C98
-	coord_event 10, 20, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C9D
-	coord_event 22, 9, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C98
-
-FarawayIsland_Entrance_MapBGEvents: @ 853D780
-	bg_event 3, 32, 0, 1, 0, FarawayIsland_Entrance_EventScript_267CF1
-
-FarawayIsland_Entrance_MapEvents:: @ 853D78C
-	map_events FarawayIsland_Entrance_EventObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents
-
diff --git a/data/maps/events/FarawayIsland_Interior.inc b/data/maps/events/FarawayIsland_Interior.inc
deleted file mode 100644
index d74eb9d8f..000000000
--- a/data/maps/events/FarawayIsland_Interior.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-FarawayIsland_Interior_EventObjects: @ 853D7A0
-	object_event 1, EVENT_OBJ_GFX_MEW, 0, 0, 13, 17, 3, 60, 255, 0, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718, 0, 0
-
-FarawayIsland_Interior_MapWarps: @ 853D7B8
-	warp_def 12, 19, 0, 0, FARAWAY_ISLAND_ENTRANCE
-	warp_def 13, 19, 0, 1, FARAWAY_ISLAND_ENTRANCE
-
-FarawayIsland_Interior_MapEvents:: @ 853D7C8
-	map_events FarawayIsland_Interior_EventObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc
deleted file mode 100644
index 3b68b1292..000000000
--- a/data/maps/events/FieryPath.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-FieryPath_EventObjects: @ 8534C80
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_29119E, 1091, 0, 0
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17, 0, 0
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18, 0, 0
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19, 0, 0
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22, 0, 0
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 32, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_291191, 1111, 0, 0
-
-FieryPath_MapWarps: @ 8534D40
-	warp_def 26, 36, 3, 4, ROUTE_112
-	warp_def 26, 4, 3, 5, ROUTE_112
-
-FieryPath_MapEvents:: @ 8534D50
-	map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc
deleted file mode 100644
index 517d32d53..000000000
--- a/data/maps/events/FortreeCity.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-FortreeCity_EventObjects: @ 8526B9C
-	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 32, 16, 3, 2, 17, 0, 0, 0, FortreeCity_EventScript_1E25DE, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 32, 10, 3, 3, 16, 0, 0, 0, FortreeCity_EventScript_1E25BF, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 25, 8, 3, 76, 17, 0, 0, 0, FortreeCity_EventScript_1E2614, 969, 0, 0
-
-FortreeCity_MapWarps: @ 8526C44
-	warp_def 5, 6, 0, 0, FORTREE_CITY_POKEMON_CENTER_1F
-	warp_def 10, 3, 0, 0, FORTREE_CITY_HOUSE_1
-	warp_def 22, 11, 0, 0, FORTREE_CITY_GYM
-	warp_def 4, 14, 0, 0, FORTREE_CITY_MART
-	warp_def 17, 3, 0, 0, FORTREE_CITY_HOUSE_2
-	warp_def 25, 3, 0, 0, FORTREE_CITY_HOUSE_3
-	warp_def 32, 2, 0, 0, FORTREE_CITY_HOUSE_4
-	warp_def 12, 13, 0, 0, FORTREE_CITY_HOUSE_5
-	warp_def 37, 13, 0, 0, FORTREE_CITY_DECORATION_SHOP
-
-FortreeCity_MapBGEvents: @ 8526C8C
-	bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_1E2602
-	bg_event 7, 6, 0, 1, 0, FortreeCity_EventScript_271E73
-	bg_event 5, 14, 0, 1, 0, FortreeCity_EventScript_271E6A
-	bg_event 26, 10, 0, 0, 0, FortreeCity_EventScript_1E260B
-	bg_event 6, 6, 0, 1, 0, FortreeCity_EventScript_271E73
-	bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_271E6A
-
-FortreeCity_MapEvents:: @ 8526CD4
-	map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents
-
diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc
deleted file mode 100644
index 6b7e0f39d..000000000
--- a/data/maps/events/FortreeCity_DecorationShop.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-FortreeCity_DecorationShop_EventObjects: @ 85310B0
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0, 0, 0
-
-FortreeCity_DecorationShop_MapWarps: @ 8531110
-	warp_def 3, 5, 0, 8, FORTREE_CITY
-	warp_def 4, 5, 0, 8, FORTREE_CITY
-
-FortreeCity_DecorationShop_MapEvents:: @ 8531120
-	map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc
deleted file mode 100644
index a06882772..000000000
--- a/data/maps/events/FortreeCity_Gym.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-FortreeCity_Gym_EventObjects: @ 8530C98
-	object_event 1, EVENT_OBJ_GFX_WINONA, 0, 0, 15, 2, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 14, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 10, 10, 3, 9, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 5, 17, 3, 9, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 9, 8, 3, 8, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 15, 21, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 23, 3, 10, 17, 0, 1, 1, FortreeCity_Gym_EventScript_216704, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 10, 3, 7, 17, 0, 1, 3, FortreeCity_Gym_EventScript_21671B, 0, 0, 0
-
-FortreeCity_Gym_MapWarps: @ 8530D58
-	warp_def 15, 24, 0, 2, FORTREE_CITY
-	warp_def 16, 24, 0, 2, FORTREE_CITY
-
-FortreeCity_Gym_MapBGEvents: @ 8530D68
-	bg_event 14, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216751
-	bg_event 17, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216761
-
-FortreeCity_Gym_MapEvents:: @ 8530D80
-	map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents
-
diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc
deleted file mode 100644
index abaae2d40..000000000
--- a/data/maps/events/FortreeCity_House1.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-FortreeCity_House1_EventObjects: @ 8530C2C
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, FortreeCity_House1_EventScript_21635F, 0, 0, 0
-
-FortreeCity_House1_MapWarps: @ 8530C74
-	warp_def 3, 5, 0, 1, FORTREE_CITY
-	warp_def 4, 5, 0, 1, FORTREE_CITY
-
-FortreeCity_House1_MapEvents:: @ 8530C84
-	map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc
deleted file mode 100644
index 513097503..000000000
--- a/data/maps/events/FortreeCity_House2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-FortreeCity_House2_EventObjects: @ 8530F30
-	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0, 0, 0
-
-FortreeCity_House2_MapWarps: @ 8530F60
-	warp_def 3, 5, 0, 4, FORTREE_CITY
-	warp_def 4, 5, 0, 4, FORTREE_CITY
-
-FortreeCity_House2_MapEvents:: @ 8530F70
-	map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc
deleted file mode 100644
index 1b788cbe2..000000000
--- a/data/maps/events/FortreeCity_House3.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-FortreeCity_House3_EventObjects: @ 8530F84
-	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House3_EventScript_217AF1, 0, 0, 0
-
-FortreeCity_House3_MapWarps: @ 8530FB4
-	warp_def 3, 5, 0, 5, FORTREE_CITY
-	warp_def 4, 5, 0, 5, FORTREE_CITY
-
-FortreeCity_House3_MapEvents:: @ 8530FC4
-	map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc
deleted file mode 100644
index a4050a5f6..000000000
--- a/data/maps/events/FortreeCity_House4.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-FortreeCity_House4_EventObjects: @ 8530FD8
-	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House4_EventScript_217C81, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933, 0, 0
-
-FortreeCity_House4_MapWarps: @ 8531020
-	warp_def 3, 5, 0, 6, FORTREE_CITY
-	warp_def 4, 5, 0, 6, FORTREE_CITY
-
-FortreeCity_House4_MapEvents:: @ 8531030
-	map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc
deleted file mode 100644
index b6bf34354..000000000
--- a/data/maps/events/FortreeCity_House5.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-FortreeCity_House5_EventObjects: @ 8531044
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0, 0, 0
-
-FortreeCity_House5_MapWarps: @ 853108C
-	warp_def 3, 5, 0, 7, FORTREE_CITY
-	warp_def 4, 5, 0, 7, FORTREE_CITY
-
-FortreeCity_House5_MapEvents:: @ 853109C
-	map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc
deleted file mode 100644
index df4877663..000000000
--- a/data/maps/events/FortreeCity_Mart.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-FortreeCity_Mart_EventObjects: @ 8530EAC
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 8, 5, 3, 2, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0, 0, 0
-
-FortreeCity_Mart_MapWarps: @ 8530F0C
-	warp_def 3, 7, 0, 3, FORTREE_CITY
-	warp_def 4, 7, 0, 3, FORTREE_CITY
-
-FortreeCity_Mart_MapEvents:: @ 8530F1C
-	map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc
deleted file mode 100644
index b6b8cfdce..000000000
--- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0, 0, 0
-
-FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4
-	warp_def 7, 8, 3, 0, FORTREE_CITY
-	warp_def 6, 8, 3, 0, FORTREE_CITY
-	warp_def 1, 6, 4, 0, FORTREE_CITY_POKEMON_CENTER_2F
-
-FortreeCity_PokemonCenter_1F_MapEvents:: @ 8530E0C
-	map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/events/FortreeCity_PokemonCenter_2F.inc
deleted file mode 100644
index c8f2356c4..000000000
--- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-
-FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80
-	warp_def 1, 6, 4, 2, FORTREE_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-FortreeCity_PokemonCenter_2F_MapEvents:: @ 8530E98
-	map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc
deleted file mode 100644
index ed546c8df..000000000
--- a/data/maps/events/GraniteCave_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-GraniteCave_1F_EventObjects: @ 85343BC
-	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050, 0, 0
-
-GraniteCave_1F_MapWarps: @ 85343EC
-	warp_def 37, 12, 3, 0, ROUTE_106
-	warp_def 35, 3, 3, 0, GRANITE_CAVE_B1F
-	warp_def 17, 11, 3, 1, GRANITE_CAVE_B1F
-	warp_def 5, 10, 3, 0, GRANITE_CAVE_STEVENS_ROOM
-
-GraniteCave_1F_MapEvents:: @ 853440C
-	map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc
deleted file mode 100644
index 7f4e67f33..000000000
--- a/data/maps/events/GraniteCave_B1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-GraniteCave_B1F_EventObjects: @ 8534420
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051, 0, 0
-
-GraniteCave_B1F_MapWarps: @ 8534438
-	warp_def 25, 13, 3, 1, GRANITE_CAVE_1F
-	warp_def 4, 21, 3, 2, GRANITE_CAVE_1F
-	warp_def 29, 13, 3, 0, GRANITE_CAVE_B2F
-	warp_def 28, 21, 3, 1, GRANITE_CAVE_B2F
-	warp_def 8, 5, 3, 2, GRANITE_CAVE_B2F
-	warp_def 12, 3, 3, 3, GRANITE_CAVE_B2F
-	warp_def 29, 2, 3, 4, GRANITE_CAVE_B2F
-
-GraniteCave_B1F_MapEvents:: @ 8534470
-	map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc
deleted file mode 100644
index 7c484e9a9..000000000
--- a/data/maps/events/GraniteCave_B2F.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-GraniteCave_B2F_EventObjects: @ 8534484
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 16, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 7, 12, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 21, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23, 0, 0
-
-GraniteCave_B2F_MapWarps: @ 853455C
-	warp_def 29, 13, 3, 2, GRANITE_CAVE_B1F
-	warp_def 28, 21, 3, 3, GRANITE_CAVE_B1F
-	warp_def 8, 5, 3, 4, GRANITE_CAVE_B1F
-	warp_def 12, 3, 3, 5, GRANITE_CAVE_B1F
-	warp_def 29, 2, 3, 6, GRANITE_CAVE_B1F
-
-GraniteCave_B2F_MapBGEvents: @ 8534584
-	bg_event 28, 6, 3, 7, 0, ITEM_EVERSTONE, 48, 0
-	bg_event 15, 11, 3, 7, 0, ITEM_EVERSTONE, 49, 0
-
-GraniteCave_B2F_MapEvents:: @ 853459C
-	map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents
-
diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc
deleted file mode 100644
index 65b343202..000000000
--- a/data/maps/events/GraniteCave_StevensRoom.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-GraniteCave_StevensRoom_EventObjects: @ 85345B0
-	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833, 0, 0
-
-GraniteCave_StevensRoom_MapWarps: @ 85345C8
-	warp_def 7, 3, 3, 3, GRANITE_CAVE_1F
-
-GraniteCave_StevensRoom_MapEvents:: @ 85345D0
-	map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc
deleted file mode 100644
index 4cf23e63d..000000000
--- a/data/maps/events/InsideOfTruck.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-InsideOfTruck_EventObjects: @ 853A078
-	object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0
-
-InsideOfTruck_MapWarps: @ 853A0C0
-	warp_def 4, 1, 0, 127, NONE
-	warp_def 4, 2, 0, 127, NONE
-	warp_def 4, 3, 0, 127, NONE
-
-InsideOfTruck_MapCoordEvents: @ 853A0D8
-	coord_event 3, 1, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04
-	coord_event 3, 2, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04
-	coord_event 3, 3, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04
-
-InsideOfTruck_MapBGEvents: @ 853A108
-	bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
-	bg_event 3, 4, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
-	bg_event 2, 3, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
-	bg_event 0, 1, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
-	bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
-
-InsideOfTruck_MapEvents:: @ 853A144
-	map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents
-
diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc
deleted file mode 100644
index da1f94173..000000000
--- a/data/maps/events/IslandCave.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-IslandCave_EventObjects: @ 8536C74
-	object_event 1, EVENT_OBJ_GFX_REGICE, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936, 0, 0
-
-IslandCave_MapWarps: @ 8536C8C
-	warp_def 8, 29, 3, 0, ROUTE_105
-	warp_def 8, 20, 0, 2, ISLAND_CAVE
-	warp_def 8, 11, 3, 1, ISLAND_CAVE
-
-IslandCave_MapBGEvents: @ 8536CA4
-	bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_238EEF
-	bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_238F1D
-	bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_238F1D
-
-IslandCave_MapEvents:: @ 8536CC8
-	map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents
-
diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc
deleted file mode 100644
index 5d970924d..000000000
--- a/data/maps/events/JaggedPass.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-JaggedPass_EventObjects: @ 8534AE4
-	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 8, 3, 10, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 0, 16, 35, 3, 14, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070, 0, 0
-	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 9, 21, 3, 16, 17, 0, 1, 3, JaggedPass_EventScript_23079C, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 19, 3, 7, 17, 0, 0, 0, JaggedPass_EventScript_230718, 847, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 0, 14, 25, 3, 10, 17, 0, 1, 3, JaggedPass_EventScript_230871, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 18, 25, 3, 9, 17, 0, 1, 3, JaggedPass_EventScript_23085A, 0, 0, 0
-
-JaggedPass_MapWarps: @ 8534B8C
-	warp_def 14, 40, 3, 2, ROUTE_112
-	warp_def 15, 40, 3, 3, ROUTE_112
-	warp_def 13, 5, 3, 2, MT_CHIMNEY
-	warp_def 14, 5, 3, 3, MT_CHIMNEY
-	warp_def 16, 18, 0, 0, MAGMA_HIDEOUT_1F
-
-JaggedPass_MapCoordEvents: @ 8534BB4
-	coord_event 13, 15, 3, 0, 2, 0, 0, 0x0
-	coord_event 21, 12, 3, 0, 8, 0, 0, 0x0
-	coord_event 14, 15, 3, 0, 2, 0, 0, 0x0
-	coord_event 18, 17, 3, 0, 2, 0, 0, 0x0
-	coord_event 22, 19, 3, 0, 2, 0, 0, 0x0
-	coord_event 21, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
-	coord_event 22, 20, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
-	coord_event 21, 20, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
-	coord_event 14, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
-	coord_event 13, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
-
-JaggedPass_MapBGEvents: @ 8534C54
-	bg_event 8, 10, 3, 7, 0, ITEM_FULL_HEAL, 77, 0
-	bg_event 7, 29, 3, 7, 0, ITEM_GREAT_BALL, 76, 0
-
-JaggedPass_MapEvents:: @ 8534C6C
-	map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents
-
diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc
deleted file mode 100644
index 658056768..000000000
--- a/data/maps/events/LavaridgeTown.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-LavaridgeTown_EventObjects: @ 8527A54
-	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 10, 13, 3, 3, 32, 0, 0, 0, LavaridgeTown_EventScript_1EA720, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, 930, 0, 0
-	object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 0, 12, 15, 0, 8, 0, 0, 0, 0, 0x0, 929, 0, 0
-	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 7, 3, 8, 17, 0, 0, 0, LavaridgeTown_EventScript_1EA744, 0, 0, 0
-
-LavaridgeTown_MapWarps: @ 8527B2C
-	warp_def 12, 15, 0, 0, LAVARIDGE_TOWN_HERB_SHOP
-	warp_def 5, 15, 0, 0, LAVARIDGE_TOWN_GYM_1F
-	warp_def 15, 5, 0, 0, LAVARIDGE_TOWN_MART
-	warp_def 9, 6, 0, 0, LAVARIDGE_TOWN_POKEMON_CENTER_1F
-	warp_def 16, 15, 0, 0, LAVARIDGE_TOWN_HOUSE
-	warp_def 9, 2, 3, 3, LAVARIDGE_TOWN_POKEMON_CENTER_1F
-
-LavaridgeTown_MapCoordEvents: @ 8527B5C
-	coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA6FA
-
-LavaridgeTown_MapBGEvents: @ 8527B6C
-	bg_event 14, 16, 0, 0, 0, LavaridgeTown_EventScript_1EA7B7
-	bg_event 7, 15, 0, 0, 0, LavaridgeTown_EventScript_1EA7AE
-	bg_event 17, 5, 0, 1, 0, LavaridgeTown_EventScript_271E6A
-	bg_event 13, 8, 0, 0, 0, LavaridgeTown_EventScript_1EA7A5
-	bg_event 10, 6, 0, 1, 0, LavaridgeTown_EventScript_271E73
-	bg_event 16, 5, 0, 1, 0, LavaridgeTown_EventScript_271E6A
-	bg_event 11, 6, 0, 1, 0, LavaridgeTown_EventScript_271E73
-	bg_event 4, 5, 3, 7, 0, ITEM_ICE_HEAL, 0, 0
-
-LavaridgeTown_MapEvents:: @ 8527BCC
-	map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents
-
diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc
deleted file mode 100644
index 501cab67f..000000000
--- a/data/maps/events/LavaridgeTown_Gym_1F.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C
-	object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 0, 13, 9, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 14, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 2, 15, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 10, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0, 0, 0
-
-LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC
-	warp_def 13, 18, 3, 1, LAVARIDGE_TOWN
-	warp_def 14, 18, 3, 1, LAVARIDGE_TOWN
-	warp_def 10, 18, 3, 0, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 8, 9, 3, 2, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 4, 18, 3, 4, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 5, 14, 3, 3, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 0, 17, 3, 1, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 5, 9, 3, 5, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 2, 15, 3, 6, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 3, 14, 3, 7, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 1, 14, 3, 8, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 0, 10, 3, 9, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 3, 10, 3, 10, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 0, 6, 3, 11, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 3, 6, 3, 12, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 5, 6, 3, 13, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 2, 3, 3, 14, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 5, 2, 3, 15, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 7, 2, 3, 16, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 8, 6, 3, 17, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 10, 6, 3, 18, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 4, 16, 0, 20, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 12, 3, 3, 19, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 14, 6, 3, 21, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 13, 17, 3, 22, LAVARIDGE_TOWN_GYM_B1F
-	warp_def 12, 12, 3, 23, LAVARIDGE_TOWN_GYM_B1F
-
-LavaridgeTown_Gym_1F_MapBGEvents: @ 852DF7C
-	bg_event 10, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE98B
-	bg_event 16, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE99B
-
-LavaridgeTown_Gym_1F_MapEvents:: @ 852DF94
-	map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents
-
diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/events/LavaridgeTown_Gym_B1F.inc
deleted file mode 100644
index af1f166ce..000000000
--- a/data/maps/events/LavaridgeTown_Gym_B1F.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8
-	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 18, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 6, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 0, 13, 17, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 16, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0, 0, 0
-
-LavaridgeTown_Gym_B1F_MapWarps: @ 852E008
-	warp_def 10, 18, 3, 2, LAVARIDGE_TOWN_GYM_1F
-	warp_def 0, 17, 3, 6, LAVARIDGE_TOWN_GYM_1F
-	warp_def 8, 9, 3, 3, LAVARIDGE_TOWN_GYM_1F
-	warp_def 5, 14, 3, 5, LAVARIDGE_TOWN_GYM_1F
-	warp_def 4, 18, 3, 4, LAVARIDGE_TOWN_GYM_1F
-	warp_def 5, 9, 3, 7, LAVARIDGE_TOWN_GYM_1F
-	warp_def 2, 15, 3, 8, LAVARIDGE_TOWN_GYM_1F
-	warp_def 3, 14, 3, 9, LAVARIDGE_TOWN_GYM_1F
-	warp_def 1, 14, 3, 10, LAVARIDGE_TOWN_GYM_1F
-	warp_def 0, 10, 3, 11, LAVARIDGE_TOWN_GYM_1F
-	warp_def 3, 10, 3, 12, LAVARIDGE_TOWN_GYM_1F
-	warp_def 0, 6, 3, 13, LAVARIDGE_TOWN_GYM_1F
-	warp_def 3, 6, 3, 14, LAVARIDGE_TOWN_GYM_1F
-	warp_def 5, 6, 3, 15, LAVARIDGE_TOWN_GYM_1F
-	warp_def 2, 3, 3, 16, LAVARIDGE_TOWN_GYM_1F
-	warp_def 5, 2, 3, 17, LAVARIDGE_TOWN_GYM_1F
-	warp_def 7, 2, 3, 18, LAVARIDGE_TOWN_GYM_1F
-	warp_def 8, 6, 3, 19, LAVARIDGE_TOWN_GYM_1F
-	warp_def 10, 6, 3, 20, LAVARIDGE_TOWN_GYM_1F
-	warp_def 12, 3, 3, 22, LAVARIDGE_TOWN_GYM_1F
-	warp_def 4, 16, 3, 21, LAVARIDGE_TOWN_GYM_1F
-	warp_def 14, 6, 3, 23, LAVARIDGE_TOWN_GYM_1F
-	warp_def 13, 17, 3, 24, LAVARIDGE_TOWN_GYM_1F
-	warp_def 12, 12, 3, 25, LAVARIDGE_TOWN_GYM_1F
-
-LavaridgeTown_Gym_B1F_MapEvents:: @ 852E0C8
-	map_events LavaridgeTown_Gym_B1F_EventObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc
deleted file mode 100644
index 9fa4c6376..000000000
--- a/data/maps/events/LavaridgeTown_HerbShop.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-LavaridgeTown_HerbShop_EventObjects: @ 852DDB0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 7, 5, 3, 1, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 3, 5, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0, 0, 0
-
-LavaridgeTown_HerbShop_MapWarps: @ 852DDF8
-	warp_def 3, 7, 0, 0, LAVARIDGE_TOWN
-	warp_def 4, 7, 0, 0, LAVARIDGE_TOWN
-
-LavaridgeTown_HerbShop_MapEvents:: @ 852DE08
-	map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc
deleted file mode 100644
index 669728b66..000000000
--- a/data/maps/events/LavaridgeTown_House.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-LavaridgeTown_House_EventObjects: @ 852E0DC
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 4, 3, 2, 17, 0, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0, 0, 0
-
-LavaridgeTown_House_MapWarps: @ 852E124
-	warp_def 3, 7, 0, 4, LAVARIDGE_TOWN
-	warp_def 4, 7, 0, 4, LAVARIDGE_TOWN
-
-LavaridgeTown_House_MapEvents:: @ 852E134
-	map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc
deleted file mode 100644
index 5230cead9..000000000
--- a/data/maps/events/LavaridgeTown_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-LavaridgeTown_Mart_EventObjects: @ 852E148
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0, 0, 0
-
-LavaridgeTown_Mart_MapWarps: @ 852E190
-	warp_def 3, 7, 0, 2, LAVARIDGE_TOWN
-	warp_def 4, 7, 0, 2, LAVARIDGE_TOWN
-
-LavaridgeTown_Mart_MapEvents:: @ 852E1A0
-	map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
deleted file mode 100644
index 8ebf9f16a..000000000
--- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0, 0, 0
-
-LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214
-	warp_def 7, 8, 3, 3, LAVARIDGE_TOWN
-	warp_def 6, 8, 3, 3, LAVARIDGE_TOWN
-	warp_def 1, 6, 4, 0, LAVARIDGE_TOWN_POKEMON_CENTER_2F
-	warp_def 2, 1, 0, 5, LAVARIDGE_TOWN
-
-LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 852E234
-	map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
deleted file mode 100644
index 53fc2b2cc..000000000
--- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-
-LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8
-	warp_def 1, 6, 4, 2, LAVARIDGE_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 852E2C0
-	map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc
deleted file mode 100644
index c7578bec3..000000000
--- a/data/maps/events/LilycoveCity.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-LilycoveCity_EventObjects: @ 8526CE8
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 32, 20, 3, 3, 16, 0, 0, 0, LilycoveCity_EventScript_1E2C53, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 15, 18, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C2B, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 21, 15, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C4A, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 35, 27, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C72, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852, 0, 0
-	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042, 0, 0
-	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852, 0, 0
-	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852, 0, 0
-	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852, 0, 0
-	object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852, 0, 0
-	object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 50, 7, 5, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2BD8, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 0, 27, 7, 5, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2DDE, 971, 0, 0
-	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 16, 23, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E302D, 0, 0, 0
-	object_event 19, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 41, 25, 3, 9, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CEE, 0, 0, 0
-	object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 0, 40, 25, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CDD, 0, 0, 0
-	object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 0, 16, 34, 3, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CCB, 0, 0, 0
-	object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 16, 35, 3, 7, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CD4, 0, 0, 0
-
-LilycoveCity_MapWarps: @ 8526EF8
-	warp_def 27, 6, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_1F
-	warp_def 37, 24, 0, 0, LILYCOVE_CITY_COVE_LILY_MOTEL_1F
-	warp_def 24, 14, 0, 0, LILYCOVE_CITY_POKEMON_CENTER_1F
-	warp_def 11, 5, 0, 0, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
-	warp_def 23, 24, 0, 0, LILYCOVE_CITY_CONTEST_LOBBY
-	warp_def 39, 14, 0, 1, LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB
-	warp_def 70, 5, 1, 0, AQUA_HIDEOUT_1F
-	warp_def 36, 6, 0, 0, LILYCOVE_CITY_MOVE_DELETERS_HOUSE
-	warp_def 42, 6, 0, 0, LILYCOVE_CITY_HOUSE_1
-	warp_def 55, 15, 0, 0, LILYCOVE_CITY_HOUSE_2
-	warp_def 11, 22, 0, 0, LILYCOVE_CITY_HOUSE_3
-	warp_def 12, 14, 0, 0, LILYCOVE_CITY_HOUSE_4
-	warp_def 12, 32, 0, 0, LILYCOVE_CITY_HARBOR
-	warp_def 12, 5, 0, 1, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
-
-LilycoveCity_MapBGEvents: @ 8526F68
-	bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_1E2D1A
-	bg_event 25, 14, 0, 1, 0, LilycoveCity_EventScript_271E73
-	bg_event 29, 7, 0, 0, 0, LilycoveCity_EventScript_1E2D6B
-	bg_event 26, 14, 0, 1, 0, LilycoveCity_EventScript_271E73
-	bg_event 6, 15, 0, 0, 0, LilycoveCity_EventScript_1E2CFF
-	bg_event 29, 24, 0, 0, 0, LilycoveCity_EventScript_1E2D08
-	bg_event 35, 24, 0, 0, 0, LilycoveCity_EventScript_1E2D11
-	bg_event 6, 30, 3, 0, 0, LilycoveCity_EventScript_1E2D44
-	bg_event 36, 14, 0, 0, 0, LilycoveCity_EventScript_1E2D62
-	bg_event 34, 6, 0, 0, 0, LilycoveCity_EventScript_1E2D74
-	bg_event 36, 31, 3, 7, 0, ITEM_HEART_SCALE, 27, 0
-	bg_event 61, 7, 0, 7, 0, ITEM_PP_UP, 43, 0
-	bg_event 64, 31, 0, 7, 0, ITEM_POKE_BALL, 75, 0
-
-LilycoveCity_MapEvents:: @ 8527004
-	map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents
-
diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc
deleted file mode 100644
index c450b0cd3..000000000
--- a/data/maps/events/LilycoveCity_ContestHall.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-LilycoveCity_ContestHall_EventObjects: @ 8531850
-	object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 0, 30, 30, 3, 2, 68, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 11, 7, 3, 2, 51, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 40, 8, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0, 0, 0
-	object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0, 0, 0
-	object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0, 0, 0
-	object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0, 0, 0
-	object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0, 0, 0
-	object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0, 0, 0
-	object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0, 0, 0
-	object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0, 0, 0
-	object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0, 0, 0
-	object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0, 0, 0
-	object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0, 0, 0
-	object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0, 0, 0
-	object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0, 0, 0
-	object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0, 0, 0
-	object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 0, 23, 26, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0, 0, 0
-
-LilycoveCity_ContestHall_MapWarps: @ 8531B50
-	warp_def 19, 32, 0, 2, LILYCOVE_CITY_CONTEST_LOBBY
-	warp_def 30, 32, 0, 3, LILYCOVE_CITY_CONTEST_LOBBY
-	warp_def 20, 32, 0, 2, LILYCOVE_CITY_CONTEST_LOBBY
-	warp_def 31, 32, 0, 3, LILYCOVE_CITY_CONTEST_LOBBY
-
-LilycoveCity_ContestHall_MapBGEvents: @ 8531B70
-	bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B733
-	bg_event 39, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B73C
-	bg_event 11, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B745
-	bg_event 15, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B745
-	bg_event 23, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B733
-	bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B73C
-
-LilycoveCity_ContestHall_MapEvents:: @ 8531BB8
-	map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents
-
diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc
deleted file mode 100644
index c6e900a18..000000000
--- a/data/maps/events/LilycoveCity_ContestLobby.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-LilycoveCity_ContestLobby_EventObjects: @ 8531534
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 15, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 26, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 0, 9, 1, 0, 1, 0, 0, 0, 0, 0x0, 774, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 18, 8, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 0, 4, 9, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 13, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 0, 23, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 0, 21, 1, 0, 8, 0, 0, 0, 0, 0x0, 895, 0, 0
-	object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 0, 8, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 7, 3, 3, 16, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 22, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 5, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873, 0, 0
-	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 0, 24, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 0, 27, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832, 0, 0
-	object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 0, 28, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832, 0, 0
-	object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 28, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832, 0, 0
-	object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 0, 26, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832, 0, 0
-	object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 27, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832, 0, 0
-	object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832, 0, 0
-	object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 26, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832, 0, 0
-	object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 9, 10, 3, 10, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0, 0, 0
-
-LilycoveCity_ContestLobby_MapWarps: @ 853178C
-	warp_def 14, 11, 0, 4, LILYCOVE_CITY
-	warp_def 15, 11, 0, 4, LILYCOVE_CITY
-	warp_def 9, 1, 0, 0, LILYCOVE_CITY_CONTEST_HALL
-	warp_def 21, 1, 0, 1, LILYCOVE_CITY_CONTEST_HALL
-
-LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC
-	bg_event 23, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_294055
-	bg_event 23, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293E1E
-	bg_event 23, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A753
-	bg_event 25, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A75A
-	bg_event 27, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A761
-	bg_event 30, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A77A
-	bg_event 3, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A73E
-	bg_event 5, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A745
-	bg_event 7, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A74C
-	bg_event 27, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293C3E
-	bg_event 27, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293D4D
-	bg_event 18, 3, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A784
-
-LilycoveCity_ContestLobby_MapEvents:: @ 853183C
-	map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents
-
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
deleted file mode 100644
index d3e5374ff..000000000
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0, 0, 0
-
-LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C
-	warp_def 5, 8, 0, 1, LILYCOVE_CITY
-	warp_def 6, 8, 0, 1, LILYCOVE_CITY
-	warp_def 2, 1, 0, 0, LILYCOVE_CITY_COVE_LILY_MOTEL_2F
-
-LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: @ 8531164
-	coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211
-
-LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 8531174
-	map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
deleted file mode 100644
index 60016ffbf..000000000
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925, 0, 0
-	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 0, 7, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925, 0, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 4, 4, 3, 9, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925, 0, 0
-	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787, 0, 0
-
-LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230
-	warp_def 2, 1, 0, 2, LILYCOVE_CITY_COVE_LILY_MOTEL_1F
-
-LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8531238
-	map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
deleted file mode 100644
index d9d6b469e..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0, 0, 0
-
-LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8
-	warp_def 1, 5, 3, 127, NONE
-	warp_def 2, 5, 3, 127, NONE
-
-LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 85324D8
-	map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
deleted file mode 100644
index 7a234183d..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C
-	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 0, 6, 1, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0, 0, 0
-
-LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C
-	warp_def 13, 3, 0, 2, LILYCOVE_CITY_DEPARTMENT_STORE_5F
-
-LilycoveCity_DepartmentStoreRooftop_MapBGEvents: @ 8532484
-	bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295
-	bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295
-
-LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 853249C
-	map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents
-
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
deleted file mode 100644
index ad7d79ac5..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 2, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0, 0, 0
-
-LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C
-	warp_def 8, 7, 0, 0, LILYCOVE_CITY
-	warp_def 9, 7, 0, 0, LILYCOVE_CITY
-	warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_2F
-	warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
-
-LilycoveCity_DepartmentStore_1F_MapBGEvents: @ 853213C
-	bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F85D
-
-LilycoveCity_DepartmentStore_1F_MapEvents:: @ 8532148
-	map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents
-
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
deleted file mode 100644
index 29169a491..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C
-	object_event 1, EVENT_OBJ_GFX_COOK, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0, 0, 0
-
-LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4
-	warp_def 16, 1, 0, 2, LILYCOVE_CITY_DEPARTMENT_STORE_1F
-	warp_def 13, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_3F
-	warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
-
-LilycoveCity_DepartmentStore_2F_MapEvents:: @ 85321EC
-	map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
deleted file mode 100644
index ff372e132..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200
-	object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 7, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0, 0, 0
-
-LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278
-	warp_def 13, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_2F
-	warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_4F
-	warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
-
-LilycoveCity_DepartmentStore_3F_MapEvents:: @ 8532290
-	map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
deleted file mode 100644
index ba97f6a98..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4
-	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 0, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0, 0, 0
-
-LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C
-	warp_def 16, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_3F
-	warp_def 13, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_5F
-	warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
-
-LilycoveCity_DepartmentStore_4F_MapEvents:: @ 8532334
-	map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
deleted file mode 100644
index 85a6e871a..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348
-	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 7, 3, 17, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 9, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0, 0, 0
-
-LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0
-	warp_def 13, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_4F
-	warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
-	warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP
-
-LilycoveCity_DepartmentStore_5F_MapEvents:: @ 8532408
-	map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc
deleted file mode 100644
index d12e31646..000000000
--- a/data/maps/events/LilycoveCity_Harbor.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_Harbor_EventObjects: @ 8531E1C
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 861, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 3, 13, 3, 2, 17, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, 909, 0, 0
-	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 10, 3, 8, 17, 0, 0, 0, 0x0, 748, 0, 0
-
-LilycoveCity_Harbor_MapWarps: @ 8531E94
-	warp_def 11, 14, 0, 12, LILYCOVE_CITY
-	warp_def 12, 14, 0, 12, LILYCOVE_CITY
-
-LilycoveCity_Harbor_MapEvents:: @ 8531EA4
-	map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc
deleted file mode 100644
index f4bef7d8b..000000000
--- a/data/maps/events/LilycoveCity_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-LilycoveCity_House1_EventObjects: @ 8531EF4
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0, 0, 0
-
-LilycoveCity_House1_MapWarps: @ 8531F24
-	warp_def 3, 8, 0, 8, LILYCOVE_CITY
-	warp_def 4, 8, 0, 8, LILYCOVE_CITY
-
-LilycoveCity_House1_MapEvents:: @ 8531F34
-	map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc
deleted file mode 100644
index 36f9f50b2..000000000
--- a/data/maps/events/LilycoveCity_House2.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-LilycoveCity_House2_EventObjects: @ 8531F48
-	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0, 0, 0
-
-LilycoveCity_House2_MapWarps: @ 8531F60
-	warp_def 2, 7, 0, 9, LILYCOVE_CITY
-	warp_def 3, 7, 0, 9, LILYCOVE_CITY
-
-LilycoveCity_House2_MapEvents:: @ 8531F70
-	map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc
deleted file mode 100644
index f7b2e561b..000000000
--- a/data/maps/events/LilycoveCity_House3.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_House3_EventObjects: @ 8531F84
-	object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 0, 2, 5, 3, 7, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0, 0, 0
-
-LilycoveCity_House3_MapWarps: @ 8532014
-	warp_def 3, 7, 0, 10, LILYCOVE_CITY
-	warp_def 4, 7, 0, 10, LILYCOVE_CITY
-
-LilycoveCity_House3_MapEvents:: @ 8532024
-	map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc
deleted file mode 100644
index ebf845f91..000000000
--- a/data/maps/events/LilycoveCity_House4.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-LilycoveCity_House4_EventObjects: @ 8532038
-	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0, 0, 0
-
-LilycoveCity_House4_MapWarps: @ 8532068
-	warp_def 3, 8, 0, 11, LILYCOVE_CITY
-	warp_def 4, 8, 0, 11, LILYCOVE_CITY
-
-LilycoveCity_House4_MapEvents:: @ 8532078
-	map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
deleted file mode 100644
index 297db7979..000000000
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776, 0, 0
-	object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779, 0, 0
-	object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 2, 3, 2, 34, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780, 0, 0
-	object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778, 0, 0
-
-LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C
-	warp_def 9, 13, 0, 3, LILYCOVE_CITY
-	warp_def 10, 13, 0, 13, LILYCOVE_CITY
-	warp_def 16, 1, 0, 0, LILYCOVE_CITY_LILYCOVE_MUSEUM_2F
-
-LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354
-	bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD
-	bg_event 2, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD
-	bg_event 5, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1
-	bg_event 6, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1
-	bg_event 9, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4
-	bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6
-	bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6
-	bg_event 15, 12, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA
-	bg_event 11, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4
-	bg_event 6, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8
-	bg_event 17, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
-	bg_event 19, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF
-	bg_event 20, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF
-	bg_event 18, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
-	bg_event 18, 11, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3
-	bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
-
-LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 8531414
-	map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents
-
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
deleted file mode 100644
index 3e85e20a1..000000000
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428
-	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 19, 10, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 14, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780, 0, 0
-
-LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488
-	warp_def 13, 1, 0, 2, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
-
-LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490
-	bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B
-	bg_event 15, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B
-	bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E
-	bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E
-	bg_event 10, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219951
-	bg_event 11, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219951
-	bg_event 19, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219964
-	bg_event 18, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219964
-	bg_event 6, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219977
-	bg_event 7, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219977
-	bg_event 11, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA
-	bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA
-
-LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8531520
-	map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents
-
diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
deleted file mode 100644
index 3f89c8aa9..000000000
--- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0, 0, 0
-
-LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0
-	warp_def 3, 7, 0, 7, LILYCOVE_CITY
-	warp_def 4, 7, 0, 7, LILYCOVE_CITY
-
-LilycoveCity_MoveDeletersHouse_MapEvents:: @ 8531EE0
-	map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
deleted file mode 100644
index 741866843..000000000
--- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_TRADER, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993, 0, 0
-
-LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44
-	warp_def 7, 8, 3, 2, LILYCOVE_CITY
-	warp_def 6, 8, 3, 2, LILYCOVE_CITY
-	warp_def 1, 6, 4, 0, LILYCOVE_CITY_POKEMON_CENTER_2F
-
-LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8531C5C
-	map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
deleted file mode 100644
index b8bd67368..000000000
--- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-
-LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0
-	warp_def 1, 6, 4, 2, LILYCOVE_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8531CE8
-	map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
deleted file mode 100644
index 427d8bc42..000000000
--- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20
-	object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790, 0, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792, 0, 0
-	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 0, 11, 5, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730, 0, 0
-
-LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8
-	warp_def 6, 13, 0, 5, LILYCOVE_CITY
-	warp_def 5, 13, 0, 5, LILYCOVE_CITY
-
-LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8531E08
-	map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/events/LilycoveCity_UnusedMart.inc
deleted file mode 100644
index 9affe49bd..000000000
--- a/data/maps/events/LilycoveCity_UnusedMart.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-LilycoveCity_UnusedMart_MapWarps: @ 8531CFC
-	warp_def 3, 7, 0, 0, LILYCOVE_CITY
-	warp_def 4, 7, 0, 0, LILYCOVE_CITY
-
-LilycoveCity_UnusedMart_MapEvents:: @ 8531D0C
-	map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc
deleted file mode 100644
index 641c1bdd1..000000000
--- a/data/maps/events/LinkContestRoom1.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-LinkContestRoom1_EventObjects: @ 8539EFC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, 246, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, 247, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, 248, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 10, 249, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 11, 250, 0, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86, 0, 0
-	object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-LinkContestRoom1_MapEvents:: @ 853A064
diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc
deleted file mode 100644
index 7a2ed7c9f..000000000
--- a/data/maps/events/LittlerootTown.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-LittlerootTown_EventObjects: @ 85276A8
-	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 16, 10, 3, 2, 33, 0, 0, 0, LittlerootTown_EventScript_1E8034, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 13, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E8022, 868, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 14, 17, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E802B, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MOM, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752, 0, 0
-	object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, 761, 0, 0
-	object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, 762, 0, 0
-	object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 10, 3, 7, 17, 0, 0, 0, 0x0, 794, 0, 0
-	object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 14, 10, 3, 7, 17, 0, 0, 0, 0x0, 795, 0, 0
-
-LittlerootTown_MapWarps: @ 8527768
-	warp_def 14, 8, 0, 1, LITTLEROOT_TOWN_MAYS_HOUSE_1F
-	warp_def 5, 8, 0, 1, LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
-	warp_def 7, 16, 0, 0, LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB
-
-LittlerootTown_MapCoordEvents: @ 8527780
-	coord_event 10, 1, 3, 0, VAR_0x4050, 0, 0, LittlerootTown_EventScript_1E8091
-	coord_event 11, 1, 3, 0, VAR_0x4050, 0, 0, LittlerootTown_EventScript_1E80EF
-	coord_event 11, 1, 3, 0, VAR_0x4050, 1, 0, LittlerootTown_EventScript_1E811F
-	coord_event 8, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81F9
-	coord_event 9, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E8205
-	coord_event 10, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81E1
-	coord_event 11, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81ED
-	coord_event 10, 2, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81BB
-	coord_event 11, 2, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81CE
-
-LittlerootTown_MapBGEvents: @ 8527810
-	bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_1E8151
-	bg_event 6, 17, 0, 0, 0, LittlerootTown_EventScript_1E815A
-	bg_event 7, 8, 3, 0, 0, LittlerootTown_EventScript_1E8163
-	bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_1E818F
-
-LittlerootTown_MapEvents:: @ 8527840
-	map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents
-
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
deleted file mode 100644
index f97d49985..000000000
--- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C
-	object_event 1, EVENT_OBJ_GFX_MOM, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758, 0, 0
-	object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755, 0, 0
-	object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784, 0, 0
-	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 9, 17, 0, 0, 0, 0x0, 734, 0, 0
-	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735, 0, 0
-	object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, 0x0, 745, 0, 0
-
-LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134
-	warp_def 9, 8, 0, 1, LITTLEROOT_TOWN
-	warp_def 8, 8, 0, 1, LITTLEROOT_TOWN
-	warp_def 8, 2, 0, 0, LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
-
-LittlerootTown_BrendansHouse_1F_MapCoordEvents: @ 852D14C
-	coord_event 8, 8, 0, 0, VAR_0x4092, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3
-	coord_event 7, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78BE
-	coord_event 8, 4, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78CA
-	coord_event 9, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6
-
-LittlerootTown_BrendansHouse_1F_MapEvents:: @ 852D18C
-	map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
deleted file mode 100644
index d7733b800..000000000
--- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0
-	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, EVENT_OBJ_GFX_MOM, 0, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0
-	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817, 0, 0
-	object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 0, 5, 5, 3, 1, 17, 0, 0, 0, 0x0, 815, 0, 0
-
-LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320
-	warp_def 7, 1, 0, 2, LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
-
-LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328
-	bg_event 0, 1, 0, 1, 0, gUnknown_081F860D
-	bg_event 1, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8656
-	bg_event 5, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_292781
-	bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F865F
-
-LittlerootTown_BrendansHouse_2F_MapEvents:: @ 852D358
-	map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents
-
diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
deleted file mode 100644
index ccee2d442..000000000
--- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C
-	object_event 1, EVENT_OBJ_GFX_MOM, 0, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759, 0, 0
-	object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754, 0, 0
-	object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785, 0, 0
-	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, 0x0, 734, 0, 0
-	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736, 0, 0
-	object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 746, 0, 0
-
-LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414
-	warp_def 1, 8, 0, 0, LITTLEROOT_TOWN
-	warp_def 2, 8, 0, 0, LITTLEROOT_TOWN
-	warp_def 2, 2, 0, 0, LITTLEROOT_TOWN_MAYS_HOUSE_2F
-
-LittlerootTown_MaysHouse_1F_MapCoordEvents: @ 852D42C
-	coord_event 2, 8, 0, 0, VAR_0x4092, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C
-	coord_event 1, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A67
-	coord_event 2, 4, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A73
-	coord_event 3, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F
-
-LittlerootTown_MaysHouse_1F_MapEvents:: @ 852D46C
-	map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
deleted file mode 100644
index 40d0f45dc..000000000
--- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480
-	object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 1, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, EVENT_OBJ_GFX_MOM, 0, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0
-	object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 0, 3, 4, 4, 8, 17, 0, 0, 0, 0x0, 849, 0, 0
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818, 0, 0
-
-LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600
-	warp_def 1, 1, 0, 2, LITTLEROOT_TOWN_MAYS_HOUSE_1F
-
-LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608
-	bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F865F
-	bg_event 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F8656
-	bg_event 3, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_29278D
-	bg_event 8, 1, 0, 0, 0, gUnknown_081F9553
-
-LittlerootTown_MaysHouse_2F_MapEvents:: @ 852D638
-	map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents
-
diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
deleted file mode 100644
index 7930d0f63..000000000
--- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 8, 3, 2, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721, 0, 0
-	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838, 0, 0
-
-LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC
-	warp_def 6, 12, 0, 2, LITTLEROOT_TOWN
-	warp_def 7, 12, 0, 2, LITTLEROOT_TOWN
-
-LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC
-	bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3
-	bg_event 11, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3
-	bg_event 7, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD
-	bg_event 8, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD
-	bg_event 1, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
-	bg_event 0, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
-	bg_event 1, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
-	bg_event 2, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
-	bg_event 3, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
-	bg_event 4, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
-	bg_event 3, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
-	bg_event 1, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
-	bg_event 1, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
-	bg_event 11, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
-	bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
-
-LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 852D7A0
-	map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents
-
diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc
deleted file mode 100644
index d590a6c98..000000000
--- a/data/maps/events/MagmaHideout_1F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MagmaHideout_1F_EventObjects: @ 85371CC
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 4, 5, 0, 10, 17, 0, 1, 2, MagmaHideout_1F_EventScript_23988C, 857, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 20, 0, 1, 17, 0, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 20, 3, 9, 17, 0, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857, 0, 0
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17, 0, 0
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19, 0, 0
-
-MagmaHideout_1F_MapWarps: @ 853725C
-	warp_def 10, 34, 3, 4, JAGGED_PASS
-	warp_def 25, 34, 3, 1, MAGMA_HIDEOUT_2F_1R
-	warp_def 31, 3, 0, 1, MAGMA_HIDEOUT_2F_2R
-	warp_def 20, 22, 0, 0, MAGMA_HIDEOUT_2F_3R
-
-MagmaHideout_1F_MapEvents:: @ 853727C
-	map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MagmaHideout_2F_1R.inc b/data/maps/events/MagmaHideout_2F_1R.inc
deleted file mode 100644
index eb2cca275..000000000
--- a/data/maps/events/MagmaHideout_2F_1R.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-MagmaHideout_2F_1R_EventObjects: @ 8537290
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 18, 19, 3, 51, 69, 0, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 14, 3, 46, 103, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 8, 3, 10, 17, 0, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 11, 3, 7, 17, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857, 0, 0
-
-MagmaHideout_2F_1R_MapWarps: @ 85372F0
-	warp_def 11, 23, 0, 0, MAGMA_HIDEOUT_2F_2R
-	warp_def 8, 2, 0, 1, MAGMA_HIDEOUT_1F
-	warp_def 17, 33, 3, 2, MAGMA_HIDEOUT_3F_1R
-
-MagmaHideout_2F_1R_MapEvents:: @ 8537308
-	map_events MagmaHideout_2F_1R_EventObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MagmaHideout_2F_2R.inc b/data/maps/events/MagmaHideout_2F_2R.inc
deleted file mode 100644
index 7d8fb6808..000000000
--- a/data/maps/events/MagmaHideout_2F_2R.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_2F_2R_EventObjects: @ 853731C
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 29, 8, 3, 9, 17, 0, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 25, 11, 3, 10, 17, 0, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 21, 7, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 9, 3, 8, 17, 0, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 7, 13, 3, 10, 17, 0, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165, 0, 0
-
-MagmaHideout_2F_2R_MapWarps: @ 85373AC
-	warp_def 10, 22, 3, 0, MAGMA_HIDEOUT_2F_1R
-	warp_def 36, 4, 0, 2, MAGMA_HIDEOUT_1F
-
-MagmaHideout_2F_2R_MapEvents:: @ 85373BC
-	map_events MagmaHideout_2F_2R_EventObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MagmaHideout_2F_3R.inc b/data/maps/events/MagmaHideout_2F_3R.inc
deleted file mode 100644
index 3795ef568..000000000
--- a/data/maps/events/MagmaHideout_2F_3R.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-MagmaHideout_2F_3R_MapWarps: @ 85375B0
-	warp_def 16, 1, 0, 3, MAGMA_HIDEOUT_1F
-	warp_def 16, 13, 0, 0, MAGMA_HIDEOUT_3F_3R
-
-MagmaHideout_2F_3R_MapEvents:: @ 85375C0
-	map_events 0x0, MagmaHideout_2F_3R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MagmaHideout_3F_1R.inc b/data/maps/events/MagmaHideout_3F_1R.inc
deleted file mode 100644
index 4d95b38c0..000000000
--- a/data/maps/events/MagmaHideout_3F_1R.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-MagmaHideout_3F_1R_EventObjects: @ 85373D0
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 2, 7, 4, 10, 17, 0, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 21, 21, 0, 9, 17, 0, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 16, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166, 0, 0
-
-MagmaHideout_3F_1R_MapWarps: @ 8537418
-	warp_def 7, 21, 0, 0, MAGMA_HIDEOUT_4F
-	warp_def 21, 9, 0, 0, MAGMA_HIDEOUT_3F_2R
-	warp_def 23, 3, 0, 2, MAGMA_HIDEOUT_2F_1R
-
-MagmaHideout_3F_1R_MapEvents:: @ 8537430
-	map_events MagmaHideout_3F_1R_EventObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MagmaHideout_3F_2R.inc b/data/maps/events/MagmaHideout_3F_2R.inc
deleted file mode 100644
index f653cb151..000000000
--- a/data/maps/events/MagmaHideout_3F_2R.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MagmaHideout_3F_2R_EventObjects: @ 8537444
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 3, 0, 17, 17, 0, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 9, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167, 0, 0
-
-MagmaHideout_3F_2R_MapWarps: @ 8537474
-	warp_def 12, 15, 0, 1, MAGMA_HIDEOUT_3F_1R
-
-MagmaHideout_3F_2R_MapEvents:: @ 853747C
-	map_events MagmaHideout_3F_2R_EventObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MagmaHideout_3F_3R.inc b/data/maps/events/MagmaHideout_3F_3R.inc
deleted file mode 100644
index b662de7d9..000000000
--- a/data/maps/events/MagmaHideout_3F_3R.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MagmaHideout_3F_3R_EventObjects: @ 8537574
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 19, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059, 0, 0
-
-MagmaHideout_3F_3R_MapWarps: @ 853758C
-	warp_def 16, 1, 0, 1, MAGMA_HIDEOUT_2F_3R
-	warp_def 16, 21, 0, 1, MAGMA_HIDEOUT_4F
-
-MagmaHideout_3F_3R_MapEvents:: @ 853759C
-	map_events MagmaHideout_3F_3R_EventObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MagmaHideout_4F.inc b/data/maps/events/MagmaHideout_4F.inc
deleted file mode 100644
index 221775788..000000000
--- a/data/maps/events/MagmaHideout_4F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MagmaHideout_4F_EventObjects: @ 8537490
-	object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 0, 16, 17, 0, 8, 17, 0, 0, 0, 0x0, 853, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 31, 22, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 13, 0, 9, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 13, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 4, 0, 8, 17, 0, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 0, 16, 21, 0, 7, 17, 0, 0, 0, MagmaHideout_4F_EventScript_23A560, 857, 0, 0
-	object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 0, 16, 17, 3, 8, 17, 0, 0, 0, 0x0, 850, 0, 0
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 0, 1, 17, 0, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168, 0, 0
-
-MagmaHideout_4F_MapWarps: @ 8537550
-	warp_def 46, 7, 0, 0, MAGMA_HIDEOUT_3F_1R
-	warp_def 20, 21, 0, 1, MAGMA_HIDEOUT_3F_3R
-
-MagmaHideout_4F_MapEvents:: @ 8537560
-	map_events MagmaHideout_4F_EventObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MarineCave_End.inc b/data/maps/events/MarineCave_End.inc
deleted file mode 100644
index b9f6bb020..000000000
--- a/data/maps/events/MarineCave_End.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MarineCave_End_EventObjects: @ 85377E8
-	object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 0, 9, 22, 1, 8, 17, 0, 0, 0, 0x0, 782, 0, 0
-
-MarineCave_End_MapWarps: @ 8537800
-	warp_def 20, 4, 0, 0, MARINE_CAVE_ENTRANCE
-
-MarineCave_End_MapCoordEvents: @ 8537808
-	coord_event 9, 26, 3, 0, VAR_TEMP_1, 1, 0, MarineCave_End_EventScript_23B01B
-
-MarineCave_End_MapEvents:: @ 8537818
-	map_events MarineCave_End_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/MarineCave_Entrance.inc b/data/maps/events/MarineCave_Entrance.inc
deleted file mode 100644
index e00290acb..000000000
--- a/data/maps/events/MarineCave_Entrance.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-MarineCave_Entrance_MapWarps: @ 85377CC
-	warp_def 14, 1, 3, 0, MARINE_CAVE_END
-
-MarineCave_Entrance_MapEvents:: @ 85377D4
-	map_events 0x0, MarineCave_Entrance_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc
deleted file mode 100644
index 6d89267c6..000000000
--- a/data/maps/events/MauvilleCity.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-MauvilleCity_EventObjects: @ 852662C
-	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 29, 16, 3, 5, 17, 0, 0, 0, MauvilleCity_EventScript_1DF3B3, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_WALLY, 0, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804, 0, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805, 0, 0
-	object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912, 0, 0
-	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 28, 19, 3, 1, 17, 0, 0, 0, MauvilleCity_EventScript_2910CE, 1116, 0, 0
-	object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 13, 7, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765, 0, 0
-
-MauvilleCity_MapWarps: @ 8526734
-	warp_def 8, 5, 0, 0, MAUVILLE_CITY_GYM
-	warp_def 22, 5, 0, 0, MAUVILLE_CITY_POKEMON_CENTER_1F
-	warp_def 35, 5, 0, 0, MAUVILLE_CITY_BIKE_SHOP
-	warp_def 23, 14, 0, 0, MAUVILLE_CITY_MART
-	warp_def 32, 14, 0, 0, MAUVILLE_CITY_HOUSE_1
-	warp_def 8, 13, 0, 0, MAUVILLE_CITY_GAME_CORNER
-	warp_def 19, 14, 0, 0, MAUVILLE_CITY_HOUSE_2
-
-MauvilleCity_MapBGEvents: @ 852676C
-	bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_271E73
-	bg_event 11, 6, 3, 0, 0, MauvilleCity_EventScript_1DF3E0
-	bg_event 24, 14, 0, 1, 0, MauvilleCity_EventScript_271E6A
-	bg_event 25, 14, 0, 1, 0, MauvilleCity_EventScript_271E6A
-	bg_event 24, 5, 0, 1, 0, MauvilleCity_EventScript_271E73
-	bg_event 19, 7, 0, 0, 0, MauvilleCity_EventScript_1DF3D7
-	bg_event 33, 6, 0, 0, 0, MauvilleCity_EventScript_1DF3E9
-	bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_1DF3F2
-
-MauvilleCity_MapEvents:: @ 85267CC
-	map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents
-
diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc
deleted file mode 100644
index 0252834f4..000000000
--- a/data/maps/events/MauvilleCity_BikeShop.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_BikeShop_EventObjects: @ 852FE80
-	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 6, 3, 2, 17, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0, 0, 0
-
-MauvilleCity_BikeShop_MapWarps: @ 852FEB0
-	warp_def 3, 8, 0, 2, MAUVILLE_CITY
-	warp_def 4, 8, 0, 2, MAUVILLE_CITY
-
-MauvilleCity_BikeShop_MapBGEvents: @ 852FEC0
-	bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED3A
-	bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EDAE
-
-MauvilleCity_BikeShop_MapEvents:: @ 852FED8
-	map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents
-
diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc
deleted file mode 100644
index 57e34caad..000000000
--- a/data/maps/events/MauvilleCity_GameCorner.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-MauvilleCity_GameCorner_EventObjects: @ 852FF28
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_COOK, 0, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 0, 13, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 7, 3, 10, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 0, 9, 8, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 6, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0, 0, 0
-
-MauvilleCity_GameCorner_MapWarps: @ 8530048
-	warp_def 11, 10, 3, 5, MAUVILLE_CITY
-	warp_def 12, 10, 3, 5, MAUVILLE_CITY
-
-MauvilleCity_GameCorner_MapBGEvents: @ 8530058
-	bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2102D6
-	bg_event 2, 8, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2102F6
-	bg_event 2, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_210316
-	bg_event 3, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210336
-	bg_event 3, 8, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210356
-	bg_event 3, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210376
-	bg_event 7, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_210396
-	bg_event 7, 7, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2103B6
-	bg_event 7, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2103D6
-	bg_event 8, 6, 0, 4, 0, MauvilleCity_GameCorner_EventScript_2103F6
-	bg_event 8, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210416
-	bg_event 8, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210436
-	bg_event 14, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
-	bg_event 15, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
-	bg_event 14, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
-	bg_event 15, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
-	bg_event 14, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
-	bg_event 15, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
-	bg_event 18, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
-	bg_event 19, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
-	bg_event 18, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
-	bg_event 19, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
-	bg_event 18, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
-	bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
-
-MauvilleCity_GameCorner_MapEvents:: @ 8530178
-	map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents
-
diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc
deleted file mode 100644
index c493d4b8b..000000000
--- a/data/maps/events/MauvilleCity_Gym.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-MauvilleCity_Gym_EventObjects: @ 852FD5C
-	object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 0, 5, 2, 0, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 8, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 1, 16, 0, 7, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 5, 10, 0, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 13, 0, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 7, 20, 0, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 0, 7, 10, 3, 7, 17, 0, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0, 0, 0
-
-MauvilleCity_Gym_MapWarps: @ 852FE04
-	warp_def 4, 20, 0, 0, MAUVILLE_CITY
-	warp_def 5, 20, 0, 0, MAUVILLE_CITY
-
-MauvilleCity_Gym_MapCoordEvents: @ 852FE14
-	coord_event 4, 12, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E01E
-	coord_event 3, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E043
-	coord_event 0, 15, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20DFF9
-	coord_event 8, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E068
-
-MauvilleCity_Gym_MapBGEvents: @ 852FE54
-	bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_20E14B
-	bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_20E15B
-
-MauvilleCity_Gym_MapEvents:: @ 852FE6C
-	map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents
-
diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc
deleted file mode 100644
index 1a1f241b5..000000000
--- a/data/maps/events/MauvilleCity_House1.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MauvilleCity_House1_EventObjects: @ 852FEEC
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0, 0, 0
-
-MauvilleCity_House1_MapWarps: @ 852FF04
-	warp_def 3, 7, 0, 4, MAUVILLE_CITY
-	warp_def 4, 7, 0, 4, MAUVILLE_CITY
-
-MauvilleCity_House1_MapEvents:: @ 852FF14
-	map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc
deleted file mode 100644
index a51483770..000000000
--- a/data/maps/events/MauvilleCity_House2.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MauvilleCity_House2_EventObjects: @ 853018C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0, 0, 0
-
-MauvilleCity_House2_MapWarps: @ 85301A4
-	warp_def 3, 8, 0, 6, MAUVILLE_CITY
-	warp_def 4, 8, 0, 6, MAUVILLE_CITY
-
-MauvilleCity_House2_MapEvents:: @ 85301B4
-	map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc
deleted file mode 100644
index 866c0c311..000000000
--- a/data/maps/events/MauvilleCity_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MauvilleCity_Mart_EventObjects: @ 8530310
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0, 0, 0
-
-MauvilleCity_Mart_MapWarps: @ 8530358
-	warp_def 3, 7, 0, 3, MAUVILLE_CITY
-	warp_def 4, 7, 0, 3, MAUVILLE_CITY
-
-MauvilleCity_Mart_MapEvents:: @ 8530368
-	map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
deleted file mode 100644
index b8b7ed7d6..000000000
--- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 4, 3, 3, 16, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 2, 8, 3, 1, 17, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0, 0, 0
-
-MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240
-	warp_def 7, 8, 3, 1, MAUVILLE_CITY
-	warp_def 6, 8, 3, 1, MAUVILLE_CITY
-	warp_def 1, 6, 4, 0, MAUVILLE_CITY_POKEMON_CENTER_2F
-
-MauvilleCity_PokemonCenter_1F_MapEvents:: @ 8530258
-	map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
deleted file mode 100644
index 9e8de4b75..000000000
--- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0, 0, 0
-
-MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4
-	warp_def 1, 6, 4, 2, MAUVILLE_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-MauvilleCity_PokemonCenter_2F_MapEvents:: @ 85302FC
-	map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc
deleted file mode 100644
index 76eb4f6dd..000000000
--- a/data/maps/events/MeteorFalls_1F_1R.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-MeteorFalls_1F_1R_EventObjects: @ 8533F74
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, 939, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, 939, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0
-	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, 938, 0, 0
-	object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942, 0, 0
-
-MeteorFalls_1F_1R_MapWarps: @ 8534064
-	warp_def 27, 18, 4, 0, ROUTE_114
-	warp_def 6, 39, 3, 0, ROUTE_115
-	warp_def 10, 3, 3, 0, METEOR_FALLS_1F_2R
-	warp_def 5, 4, 3, 4, METEOR_FALLS_B1F_1R
-	warp_def 26, 28, 3, 5, METEOR_FALLS_B1F_1R
-	warp_def 4, 2, 0, 0, METEOR_FALLS_STEVENS_CAVE
-
-MeteorFalls_1F_1R_MapCoordEvents: @ 8534094
-	coord_event 14, 18, 4, 0, VAR_0x40BF, 0, 0, MeteorFalls_1F_1R_EventScript_22BD5F
-
-MeteorFalls_1F_1R_MapBGEvents: @ 85340A4
-	bg_event 9, 58, 0, 0, 0, 0x0
-
-MeteorFalls_1F_1R_MapEvents:: @ 85340B0
-	map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents
-
diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc
deleted file mode 100644
index 1a85565fa..000000000
--- a/data/maps/events/MeteorFalls_1F_2R.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MeteorFalls_1F_2R_EventObjects: @ 85340C4
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0, 0, 0
-
-MeteorFalls_1F_2R_MapWarps: @ 853410C
-	warp_def 10, 29, 3, 2, METEOR_FALLS_1F_1R
-	warp_def 4, 14, 3, 0, METEOR_FALLS_B1F_1R
-	warp_def 7, 20, 3, 1, METEOR_FALLS_B1F_1R
-	warp_def 21, 23, 3, 2, METEOR_FALLS_B1F_1R
-
-MeteorFalls_1F_2R_MapBGEvents: @ 853412C
-	bg_event 9, 58, 0, 0, 0, 0x0
-
-MeteorFalls_1F_2R_MapEvents:: @ 8534138
-	map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents
-
diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/events/MeteorFalls_B1F_1R.inc
deleted file mode 100644
index 410dd90c0..000000000
--- a/data/maps/events/MeteorFalls_B1F_1R.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MeteorFalls_B1F_1R_MapWarps: @ 853414C
-	warp_def 5, 6, 4, 1, METEOR_FALLS_1F_2R
-	warp_def 7, 11, 5, 2, METEOR_FALLS_1F_2R
-	warp_def 18, 15, 4, 3, METEOR_FALLS_1F_2R
-	warp_def 17, 3, 3, 0, METEOR_FALLS_B1F_2R
-	warp_def 3, 23, 5, 3, METEOR_FALLS_1F_1R
-	warp_def 20, 36, 3, 4, METEOR_FALLS_1F_1R
-
-MeteorFalls_B1F_1R_MapEvents:: @ 853417C
-	map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc
deleted file mode 100644
index 454946506..000000000
--- a/data/maps/events/MeteorFalls_B1F_2R.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-MeteorFalls_B1F_2R_EventObjects: @ 8534190
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 3, 1, 17, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080, 0, 0
-
-MeteorFalls_B1F_2R_MapWarps: @ 85341A8
-	warp_def 5, 15, 3, 3, METEOR_FALLS_B1F_1R
-
-MeteorFalls_B1F_2R_MapEvents:: @ 85341B0
-	map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MeteorFalls_StevensCave.inc b/data/maps/events/MeteorFalls_StevensCave.inc
deleted file mode 100644
index e66dda119..000000000
--- a/data/maps/events/MeteorFalls_StevensCave.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-MeteorFalls_StevensCave_EventObjects: @ 85378B0
-	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 19, 3, 3, 7, 17, 0, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0, 0, 0
-
-MeteorFalls_StevensCave_MapWarps: @ 85378C8
-	warp_def 10, 29, 3, 5, METEOR_FALLS_1F_1R
-
-MeteorFalls_StevensCave_MapEvents:: @ 85378D0
-	map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MirageTower_1F.inc b/data/maps/events/MirageTower_1F.inc
deleted file mode 100644
index 5bf9568bb..000000000
--- a/data/maps/events/MirageTower_1F.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-MirageTower_1F_MapWarps: @ 85375D4
-	warp_def 10, 14, 3, 3, ROUTE_111
-	warp_def 15, 2, 3, 1, MIRAGE_TOWER_2F
-
-MirageTower_1F_MapEvents:: @ 85375E4
-	map_events 0x0, MirageTower_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MirageTower_2F.inc b/data/maps/events/MirageTower_2F.inc
deleted file mode 100644
index 07814433a..000000000
--- a/data/maps/events/MirageTower_2F.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-MirageTower_2F_MapWarps: @ 85375F8
-	warp_def 18, 12, 3, 0, MIRAGE_TOWER_3F
-	warp_def 15, 2, 3, 1, MIRAGE_TOWER_1F
-
-MirageTower_2F_MapEvents:: @ 8537608
-	map_events 0x0, MirageTower_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MirageTower_3F.inc b/data/maps/events/MirageTower_3F.inc
deleted file mode 100644
index fe6a0f73f..000000000
--- a/data/maps/events/MirageTower_3F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MirageTower_3F_EventObjects: @ 853761C
-	object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 7, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 17, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 8, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 18, 0, 0
-
-MirageTower_3F_MapWarps: @ 853764C
-	warp_def 18, 12, 3, 0, MIRAGE_TOWER_2F
-	warp_def 2, 4, 0, 0, MIRAGE_TOWER_4F
-
-MirageTower_3F_MapEvents:: @ 853765C
-	map_events MirageTower_3F_EventObjects, MirageTower_3F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MirageTower_4F.inc b/data/maps/events/MirageTower_4F.inc
deleted file mode 100644
index 4d07ff4c3..000000000
--- a/data/maps/events/MirageTower_4F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MirageTower_4F_EventObjects: @ 8537670
-	object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 0, 5, 4, 4, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD48, 963, 0, 0
-	object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD89, 964, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, MirageTower_4F_EventScript_2907A6, 17, 0, 0
-
-MirageTower_4F_MapWarps: @ 85376B8
-	warp_def 1, 4, 3, 1, MIRAGE_TOWER_3F
-
-MirageTower_4F_MapEvents:: @ 85376C0
-	map_events MirageTower_4F_EventObjects, MirageTower_4F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc
deleted file mode 100644
index a5dfb9df9..000000000
--- a/data/maps/events/MossdeepCity.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-MossdeepCity_EventObjects: @ 8527018
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 38, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AD1, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 32, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AB2, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 21, 5, 3, 16, 0, 0, 0, MossdeepCity_EventScript_1E4AF0, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043, 0, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 56, 21, 7, 10, 17, 0, 0, 0, MossdeepCity_EventScript_1E4B0B, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 0, 23, 13, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4C26, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 23, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 24, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 25, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 26, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 0, 45, 25, 5, 9, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 19, 25, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_2C81EE, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788, 0, 0
-	object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 31, 29, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_1E4C7C, 0, 0, 0
-
-MossdeepCity_MapWarps: @ 85271B0
-	warp_def 28, 9, 0, 0, MOSSDEEP_CITY_HOUSE_1
-	warp_def 38, 9, 0, 0, MOSSDEEP_CITY_GYM
-	warp_def 28, 16, 0, 0, MOSSDEEP_CITY_POKEMON_CENTER_1F
-	warp_def 67, 25, 0, 0, MOSSDEEP_CITY_HOUSE_2
-	warp_def 37, 18, 0, 0, MOSSDEEP_CITY_MART
-	warp_def 49, 6, 0, 0, MOSSDEEP_CITY_HOUSE_3
-	warp_def 19, 10, 0, 0, MOSSDEEP_CITY_STEVENS_HOUSE
-	warp_def 18, 16, 0, 1, MOSSDEEP_CITY_HOUSE_4
-	warp_def 64, 15, 0, 0, MOSSDEEP_CITY_SPACE_CENTER_1F
-	warp_def 36, 24, 0, 0, MOSSDEEP_CITY_GAME_CORNER_1F
-
-MossdeepCity_MapCoordEvents: @ 8527200
-	coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38
-	coord_event 26, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38
-	coord_event 32, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38
-	coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38
-	coord_event 42, 21, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
-	coord_event 41, 22, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
-	coord_event 41, 23, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
-	coord_event 41, 24, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
-	coord_event 40, 25, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
-	coord_event 40, 26, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
-
-MossdeepCity_MapBGEvents: @ 85272A0
-	bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_1E4B26
-	bg_event 34, 9, 0, 0, 0, MossdeepCity_EventScript_1E4B1D
-	bg_event 29, 16, 0, 1, 0, MossdeepCity_EventScript_271E73
-	bg_event 38, 18, 0, 1, 0, MossdeepCity_EventScript_271E6A
-	bg_event 66, 16, 0, 0, 0, MossdeepCity_EventScript_1E4B2F
-	bg_event 30, 16, 0, 1, 0, MossdeepCity_EventScript_271E73
-	bg_event 39, 18, 0, 1, 0, MossdeepCity_EventScript_271E6A
-	bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_1E4B14
-
-MossdeepCity_MapEvents:: @ 8527300
-	map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents
-
diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc
deleted file mode 100644
index cbcb8b76f..000000000
--- a/data/maps/events/MossdeepCity_GameCorner_1F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0, 0, 0
-
-MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70
-	warp_def 5, 9, 0, 9, MOSSDEEP_CITY
-	warp_def 6, 9, 0, 9, MOSSDEEP_CITY
-	warp_def 2, 0, 0, 0, MOSSDEEP_CITY_GAME_CORNER_B1F
-
-MossdeepCity_GameCorner_1F_MapBGEvents: @ 8532F88
-	bg_event 3, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B5D
-	bg_event 0, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E9D
-	bg_event 1, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E96
-
-MossdeepCity_GameCorner_1F_MapEvents:: @ 8532FAC
-	map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents
-
diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc
deleted file mode 100644
index a043926a7..000000000
--- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0
-	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8
-	warp_def 3, 1, 0, 2, MOSSDEEP_CITY_GAME_CORNER_1F
-
-MossdeepCity_GameCorner_B1F_MapEvents:: @ 8532FE0
-	map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc
deleted file mode 100644
index 2a152d8f6..000000000
--- a/data/maps/events/MossdeepCity_Gym.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-MossdeepCity_Gym_EventObjects: @ 85324EC
-	object_event 1, EVENT_OBJ_GFX_TATE, 0, 0, 23, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 30, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 5, 20, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 4, 29, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_LASS, 0, 0, 4, 23, 0, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 9, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 6, 3, 0, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 0, 5, 33, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_LIZA, 0, 0, 24, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 2, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 1, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 21, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 7, 9, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 8, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 7, 5, 3, 10, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0, 0, 0
-	object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 33, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 22, 25, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0, 0, 0
-	object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 26, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 27, EVENT_OBJ_GFX_LASS, 0, 0, 25, 25, 0, 9, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0, 0, 0
-	object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 22, 23, 3, 8, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0, 0, 0
-	object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 22, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 25, 22, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0, 0, 0
-	object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 25, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-MossdeepCity_Gym_MapWarps: @ 853284C
-	warp_def 6, 35, 3, 1, MOSSDEEP_CITY
-	warp_def 7, 35, 3, 1, MOSSDEEP_CITY
-	warp_def 3, 28, 0, 3, MOSSDEEP_CITY_GYM
-	warp_def 1, 23, 3, 2, MOSSDEEP_CITY_GYM
-	warp_def 7, 18, 0, 5, MOSSDEEP_CITY_GYM
-	warp_def 8, 12, 0, 4, MOSSDEEP_CITY_GYM
-	warp_def 9, 18, 0, 7, MOSSDEEP_CITY_GYM
-	warp_def 23, 20, 0, 6, MOSSDEEP_CITY_GYM
-	warp_def 1, 33, 3, 9, MOSSDEEP_CITY_GYM
-	warp_def 20, 24, 0, 8, MOSSDEEP_CITY_GYM
-	warp_def 11, 3, 0, 11, MOSSDEEP_CITY_GYM
-	warp_def 11, 35, 3, 10, MOSSDEEP_CITY_GYM
-	warp_def 13, 32, 0, 13, MOSSDEEP_CITY_GYM
-	warp_def 21, 10, 0, 12, MOSSDEEP_CITY_GYM
-
-MossdeepCity_Gym_MapCoordEvents: @ 85328BC
-	coord_event 2, 21, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C67
-	coord_event 8, 10, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C7D
-	coord_event 6, 7, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C7D
-	coord_event 15, 34, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C93
-	coord_event 23, 24, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CA9
-	coord_event 23, 21, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CA9
-	coord_event 8, 6, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CBF
-	coord_event 21, 6, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220AF1
-	coord_event 3, 30, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C67
-
-MossdeepCity_Gym_MapBGEvents: @ 853294C
-	bg_event 4, 34, 0, 1, 0, MossdeepCity_Gym_EventScript_220C33
-	bg_event 8, 34, 0, 1, 0, MossdeepCity_Gym_EventScript_220C43
-
-MossdeepCity_Gym_MapEvents:: @ 8532964
-	map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents
-
diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc
deleted file mode 100644
index bddde5c81..000000000
--- a/data/maps/events/MossdeepCity_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MossdeepCity_House1_EventObjects: @ 8532978
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 3, 3, 3, 17, 0, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0, 0, 0
-
-MossdeepCity_House1_MapWarps: @ 85329A8
-	warp_def 3, 7, 0, 0, MOSSDEEP_CITY
-	warp_def 4, 7, 0, 0, MOSSDEEP_CITY
-
-MossdeepCity_House1_MapEvents:: @ 85329B8
-	map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc
deleted file mode 100644
index e8e120c77..000000000
--- a/data/maps/events/MossdeepCity_House2.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MossdeepCity_House2_EventObjects: @ 85329CC
-	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934, 0, 0
-
-MossdeepCity_House2_MapWarps: @ 8532A14
-	warp_def 3, 8, 0, 3, MOSSDEEP_CITY
-	warp_def 4, 8, 0, 3, MOSSDEEP_CITY
-
-MossdeepCity_House2_MapEvents:: @ 8532A24
-	map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc
deleted file mode 100644
index 5fec469e8..000000000
--- a/data/maps/events/MossdeepCity_House3.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MossdeepCity_House3_EventObjects: @ 8532BD4
-	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0, 0, 0
-
-MossdeepCity_House3_MapWarps: @ 8532BEC
-	warp_def 3, 7, 0, 5, MOSSDEEP_CITY
-	warp_def 4, 7, 0, 5, MOSSDEEP_CITY
-
-MossdeepCity_House3_MapEvents:: @ 8532BFC
-	map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc
deleted file mode 100644
index 923bbe86d..000000000
--- a/data/maps/events/MossdeepCity_House4.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MossdeepCity_House4_EventObjects: @ 8532CAC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 0, 2, 4, 3, 1, 17, 0, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0, 0, 0
-
-MossdeepCity_House4_MapWarps: @ 8532CF4
-	warp_def 4, 7, 0, 7, MOSSDEEP_CITY
-	warp_def 3, 7, 0, 7, MOSSDEEP_CITY
-
-MossdeepCity_House4_MapEvents:: @ 8532D04
-	map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc
deleted file mode 100644
index c8bbd0a41..000000000
--- a/data/maps/events/MossdeepCity_Mart.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-MossdeepCity_Mart_EventObjects: @ 8532B50
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 8, 3, 3, 3, 16, 0, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, MossdeepCity_Mart_EventScript_222408, 0, 0, 0
-
-MossdeepCity_Mart_MapWarps: @ 8532BB0
-	warp_def 3, 7, 0, 4, MOSSDEEP_CITY
-	warp_def 4, 7, 0, 4, MOSSDEEP_CITY
-
-MossdeepCity_Mart_MapEvents:: @ 8532BC0
-	map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
deleted file mode 100644
index 17052105d..000000000
--- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0, 0, 0
-
-MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80
-	warp_def 7, 8, 3, 2, MOSSDEEP_CITY
-	warp_def 6, 8, 3, 2, MOSSDEEP_CITY
-	warp_def 1, 6, 4, 0, MOSSDEEP_CITY_POKEMON_CENTER_2F
-
-MossdeepCity_PokemonCenter_1F_MapEvents:: @ 8532A98
-	map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
deleted file mode 100644
index 13a189b51..000000000
--- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 7, 3, 5, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0, 0, 0
-
-MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24
-	warp_def 1, 6, 4, 2, MOSSDEEP_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-MossdeepCity_PokemonCenter_2F_MapEvents:: @ 8532B3C
-	map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
deleted file mode 100644
index 8352fe02c..000000000
--- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 14, 7, 3, 3, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 12, 9, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756, 0, 0
-	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 11, 6, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756, 0, 0
-	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 10, 2, 3, 8, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756, 0, 0
-	object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 2, 3, 8, 17, 0, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756, 0, 0
-	object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 5, 0, 76, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737, 0, 0
-	object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753, 0, 0
-
-MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20
-	warp_def 7, 9, 0, 8, MOSSDEEP_CITY
-	warp_def 8, 9, 0, 8, MOSSDEEP_CITY
-	warp_def 13, 1, 0, 0, MOSSDEEP_CITY_SPACE_CENTER_2F
-
-MossdeepCity_SpaceCenter_1F_MapEvents:: @ 8532E38
-	map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
deleted file mode 100644
index ac3bc8c7a..000000000
--- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C
-	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 0, 1, 8, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 2, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 3, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862, 0, 0
-	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 2, 3, 9, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862, 0, 0
-	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 0, 8, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862, 0, 0
-	object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862, 0, 0
-
-MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24
-	warp_def 13, 1, 0, 2, MOSSDEEP_CITY_SPACE_CENTER_1F
-
-MossdeepCity_SpaceCenter_2F_MapEvents:: @ 8532F2C
-	map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc
deleted file mode 100644
index 4d9658312..000000000
--- a/data/maps/events/MossdeepCity_StevensHouse.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-MossdeepCity_StevensHouse_EventObjects: @ 8532C10
-	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 3, 1, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968, 0, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727, 0, 0
-
-MossdeepCity_StevensHouse_MapWarps: @ 8532C58
-	warp_def 3, 7, 0, 6, MOSSDEEP_CITY
-	warp_def 4, 7, 0, 6, MOSSDEEP_CITY
-
-MossdeepCity_StevensHouse_MapBGEvents: @ 8532C68
-	bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222909
-	bg_event 1, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222909
-	bg_event 10, 4, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_222909
-	bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_222909
-
-MossdeepCity_StevensHouse_MapEvents:: @ 8532C98
-	map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents
-
diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc
deleted file mode 100644
index e4eeb764d..000000000
--- a/data/maps/events/MtChimney.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-MtChimney_EventObjects: @ 85347C8
-	object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927, 0, 0
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926, 0, 0
-	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926, 0, 0
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926, 0, 0
-	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994, 0, 0
-	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927, 0, 0
-	object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
-	object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927, 0, 0
-	object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927, 0, 0
-	object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927, 0, 0
-	object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
-	object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
-	object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 9, 16, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927, 0, 0
-	object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
-	object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877, 0, 0
-	object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 7, 3, 70, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877, 0, 0
-	object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 0, 29, 7, 3, 17, 17, 0, 1, 3, MtChimney_EventScript_22F1C3, 877, 0, 0
-	object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 0, 27, 17, 3, 16, 17, 0, 1, 3, MtChimney_EventScript_22F1DA, 877, 0, 0
-	object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 13, 16, 3, 9, 17, 0, 1, 3, MtChimney_EventScript_22F1F1, 927, 0, 0
-	object_event 30, EVENT_OBJ_GFX_HIKER, 0, 0, 7, 7, 3, 10, 17, 0, 1, 6, MtChimney_EventScript_22F208, 877, 0, 0
-
-MtChimney_MapWarps: @ 8534A98
-	warp_def 17, 36, 0, 0, MT_CHIMNEY_CABLE_CAR_STATION
-	warp_def 18, 36, 0, 1, MT_CHIMNEY_CABLE_CAR_STATION
-	warp_def 20, 41, 3, 2, JAGGED_PASS
-	warp_def 21, 41, 3, 3, JAGGED_PASS
-
-MtChimney_MapBGEvents: @ 8534AB8
-	bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_22F0E4
-	bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_22F141
-
-MtChimney_MapEvents:: @ 8534AD0
-	map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents
-
diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc
deleted file mode 100644
index 1c791072c..000000000
--- a/data/maps/events/MtChimney_CableCarStation.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MtChimney_CableCarStation_EventObjects: @ 8533CA8
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-MtChimney_CableCarStation_MapWarps: @ 8533CD8
-	warp_def 6, 11, 0, 0, MT_CHIMNEY
-	warp_def 7, 11, 0, 1, MT_CHIMNEY
-
-MtChimney_CableCarStation_MapEvents:: @ 8533CE8
-	map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc
deleted file mode 100644
index aedb94c2f..000000000
--- a/data/maps/events/MtPyre_1F.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-MtPyre_1F_EventObjects: @ 8534D64
-	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 21, 2, 3, 8, 17, 0, 0, 0, MtPyre_1F_EventScript_230F3F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 17, 8, 3, 7, 17, 0, 0, 0, MtPyre_1F_EventScript_230F78, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 13, 10, 3, 9, 17, 0, 0, 0, MtPyre_1F_EventScript_230F81, 0, 0, 0
-
-MtPyre_1F_MapWarps: @ 8534DAC
-	warp_def 17, 18, 3, 0, ROUTE_122
-	warp_def 3, 6, 3, 0, MT_PYRE_EXTERIOR
-	warp_def 18, 18, 3, 0, ROUTE_122
-	warp_def 4, 6, 3, 0, MT_PYRE_EXTERIOR
-	warp_def 11, 1, 3, 0, MT_PYRE_2F
-	warp_def 20, 9, 3, 4, MT_PYRE_2F
-
-MtPyre_1F_MapEvents:: @ 8534DDC
-	map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc
deleted file mode 100644
index d75442cd6..000000000
--- a/data/maps/events/MtPyre_2F.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-MtPyre_2F_EventObjects: @ 8534DF0
-	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 6, 3, 10, 17, 0, 1, 2, MtPyre_2F_EventScript_231128, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 3, 1, 17, 0, 0, 0, MtPyre_2F_EventScript_2912FD, 1129, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 9, 3, 3, 10, 17, 0, 0, 0, MtPyre_2F_EventScript_231116, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 0, 12, 10, 3, 8, 17, 0, 0, 0, MtPyre_2F_EventScript_23111F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23115A, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 0, 3, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23113F, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 9, 3, 7, 17, 0, 1, 2, MtPyre_2F_EventScript_23118C, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 6, 3, 17, 17, 0, 1, 2, MtPyre_2F_EventScript_231175, 0, 0, 0
-
-MtPyre_2F_MapWarps: @ 8534EB0
-	warp_def 2, 1, 3, 4, MT_PYRE_1F
-	warp_def 10, 1, 3, 0, MT_PYRE_3F
-	warp_def 10, 12, 3, 4, MT_PYRE_3F
-	warp_def 6, 12, 3, 5, MT_PYRE_3F
-	warp_def 11, 9, 3, 5, MT_PYRE_1F
-
-MtPyre_2F_MapEvents:: @ 8534ED8
-	map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc
deleted file mode 100644
index e52cd546b..000000000
--- a/data/maps/events/MtPyre_3F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MtPyre_3F_EventObjects: @ 8534EEC
-	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 4, 3, 18, 17, 0, 1, 4, MtPyre_3F_EventScript_231753, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 11, 4, 3, 17, 17, 0, 1, 4, MtPyre_3F_EventScript_23176A, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 3, 1, 17, 0, 0, 0, MtPyre_3F_EventScript_29130A, 1120, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 14, 17, 0, 1, 4, MtPyre_3F_EventScript_231781, 0, 0, 0
-
-MtPyre_3F_MapWarps: @ 8534F4C
-	warp_def 10, 1, 3, 1, MT_PYRE_2F
-	warp_def 2, 1, 3, 1, MT_PYRE_4F
-	warp_def 9, 10, 3, 4, MT_PYRE_4F
-	warp_def 1, 12, 3, 5, MT_PYRE_4F
-	warp_def 10, 12, 3, 2, MT_PYRE_2F
-	warp_def 6, 12, 3, 3, MT_PYRE_2F
-
-MtPyre_3F_MapEvents:: @ 8534F7C
-	map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc
deleted file mode 100644
index 1804f4615..000000000
--- a/data/maps/events/MtPyre_4F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_4F_EventObjects: @ 8534F90
-	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 7, 3, 24, 17, 0, 1, 2, MtPyre_4F_EventScript_231C6E, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 11, 3, 1, 17, 0, 0, 0, MtPyre_4F_EventScript_291317, 1130, 0, 0
-
-MtPyre_4F_MapWarps: @ 8534FC0
-	warp_def 10, 1, 3, 1, MT_PYRE_5F
-	warp_def 2, 5, 3, 1, MT_PYRE_3F
-	warp_def 12, 10, 3, 3, MT_PYRE_5F
-	warp_def 12, 12, 3, 4, MT_PYRE_5F
-	warp_def 9, 10, 3, 2, MT_PYRE_3F
-	warp_def 2, 12, 3, 3, MT_PYRE_3F
-
-MtPyre_4F_MapEvents:: @ 8534FF0
-	map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc
deleted file mode 100644
index ce7851f62..000000000
--- a/data/maps/events/MtPyre_5F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-MtPyre_5F_EventObjects: @ 8535004
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 7, 3, 17, 17, 0, 1, 2, MtPyre_5F_EventScript_231BC9, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, MtPyre_5F_EventScript_291324, 1052, 0, 0
-
-MtPyre_5F_MapWarps: @ 8535034
-	warp_def 2, 1, 3, 0, MT_PYRE_6F
-	warp_def 10, 5, 3, 0, MT_PYRE_4F
-	warp_def 1, 10, 3, 1, MT_PYRE_6F
-	warp_def 12, 10, 3, 2, MT_PYRE_4F
-	warp_def 12, 12, 3, 3, MT_PYRE_4F
-
-MtPyre_5F_MapEvents:: @ 853505C
-	map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc
deleted file mode 100644
index b271e116c..000000000
--- a/data/maps/events/MtPyre_6F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MtPyre_6F_EventObjects: @ 8535070
-	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 3, 3, 23, 17, 0, 1, 3, MtPyre_6F_EventScript_231D3B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, MtPyre_6F_EventScript_291331, 1089, 0, 0
-	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 10, 3, 3, 24, 17, 0, 1, 3, MtPyre_6F_EventScript_231D9D, 0, 0, 0
-
-MtPyre_6F_MapWarps: @ 85350B8
-	warp_def 2, 1, 3, 0, MT_PYRE_5F
-	warp_def 1, 10, 3, 2, MT_PYRE_5F
-
-MtPyre_6F_MapEvents:: @ 85350C8
-	map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc
deleted file mode 100644
index a45d2ec2e..000000000
--- a/data/maps/events/MtPyre_Exterior.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-MtPyre_Exterior_EventObjects: @ 85350DC
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074, 0, 0
-
-MtPyre_Exterior_MapWarps: @ 853510C
-	warp_def 10, 42, 3, 1, MT_PYRE_1F
-	warp_def 19, 10, 3, 1, MT_PYRE_SUMMIT
-	warp_def 20, 10, 3, 1, MT_PYRE_SUMMIT
-
-MtPyre_Exterior_MapCoordEvents: @ 8535124
-	coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED
-	coord_event 25, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED
-	coord_event 22, 27, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FF2
-	coord_event 23, 28, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FF2
-	coord_event 26, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED
-
-MtPyre_Exterior_MapBGEvents: @ 8535174
-	bg_event 9, 8, 0, 7, 0, ITEM_ULTRA_BALL, 29, 0
-	bg_event 16, 22, 0, 7, 0, ITEM_MAX_ETHER, 78, 0
-
-MtPyre_Exterior_MapEvents:: @ 853518C
-	map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents
-
diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc
deleted file mode 100644
index 696d9ead3..000000000
--- a/data/maps/events/MtPyre_Summit.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-MtPyre_Summit_EventObjects: @ 85351A0
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, 916, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 15, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917, 0, 0
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 18, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917, 0, 0
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917, 0, 0
-	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 25, 11, 3, 9, 17, 0, 1, 3, MtPyre_Summit_EventScript_232442, 917, 0, 0
-	object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 0, 23, 6, 3, 7, 17, 0, 0, 0, 0x0, 856, 0, 0
-
-MtPyre_Summit_MapWarps: @ 8535260
-	warp_def 22, 31, 3, 1, MT_PYRE_EXTERIOR
-	warp_def 23, 31, 3, 1, MT_PYRE_EXTERIOR
-	warp_def 24, 31, 3, 1, MT_PYRE_EXTERIOR
-
-MtPyre_Summit_MapCoordEvents: @ 8535278
-	coord_event 22, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232018
-	coord_event 23, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232024
-	coord_event 24, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232030
-	coord_event 22, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_2321EC
-	coord_event 23, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_2321F8
-	coord_event 24, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_232204
-
-MtPyre_Summit_MapBGEvents: @ 85352D8
-	bg_event 9, 25, 0, 7, 0, ITEM_ZINC, 79, 0
-	bg_event 37, 7, 3, 7, 0, ITEM_RARE_CANDY, 80, 0
-
-MtPyre_Summit_MapEvents:: @ 85352F0
-	map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents
-
diff --git a/data/maps/events/NavelRock_B1F.inc b/data/maps/events/NavelRock_B1F.inc
deleted file mode 100644
index 541b11fca..000000000
--- a/data/maps/events/NavelRock_B1F.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_B1F_MapWarps: @ 853DA94
-	warp_def 4, 3, 3, 0, NAVEL_ROCK_ENTRANCE
-	warp_def 18, 9, 3, 1, NAVEL_ROCK_FORK
-
-NavelRock_B1F_MapEvents:: @ 853DAA4
-	map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Bottom.inc b/data/maps/events/NavelRock_Bottom.inc
deleted file mode 100644
index af7cffea3..000000000
--- a/data/maps/events/NavelRock_Bottom.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-NavelRock_Bottom_EventObjects: @ 853DD50
-	object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 0, 11, 13, 0, 8, 17, 0, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800, 0, 0
-
-NavelRock_Bottom_MapWarps: @ 853DD68
-	warp_def 14, 19, 0, 0, NAVEL_ROCK_DOWN_11
-
-NavelRock_Bottom_MapEvents:: @ 853DD70
-	map_events NavelRock_Bottom_EventObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Down01.inc b/data/maps/events/NavelRock_Down01.inc
deleted file mode 100644
index b644f47ad..000000000
--- a/data/maps/events/NavelRock_Down01.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down01_MapWarps: @ 853DBC4
-	warp_def 3, 3, 3, 2, NAVEL_ROCK_FORK
-	warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_02
-
-NavelRock_Down01_MapEvents:: @ 853DBD4
-	map_events 0x0, NavelRock_Down01_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Down02.inc b/data/maps/events/NavelRock_Down02.inc
deleted file mode 100644
index dfa088f49..000000000
--- a/data/maps/events/NavelRock_Down02.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down02_MapWarps: @ 853DBE8
-	warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_01
-	warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_03
-
-NavelRock_Down02_MapEvents:: @ 853DBF8
-	map_events 0x0, NavelRock_Down02_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Down03.inc b/data/maps/events/NavelRock_Down03.inc
deleted file mode 100644
index 723bc8934..000000000
--- a/data/maps/events/NavelRock_Down03.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down03_MapWarps: @ 853DC0C
-	warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_02
-	warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_04
-
-NavelRock_Down03_MapEvents:: @ 853DC1C
-	map_events 0x0, NavelRock_Down03_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Down04.inc b/data/maps/events/NavelRock_Down04.inc
deleted file mode 100644
index 9f5148611..000000000
--- a/data/maps/events/NavelRock_Down04.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down04_MapWarps: @ 853DC30
-	warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_03
-	warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_05
-
-NavelRock_Down04_MapEvents:: @ 853DC40
-	map_events 0x0, NavelRock_Down04_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Down05.inc b/data/maps/events/NavelRock_Down05.inc
deleted file mode 100644
index df8981e2a..000000000
--- a/data/maps/events/NavelRock_Down05.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down05_MapWarps: @ 853DC54
-	warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_04
-	warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_06
-
-NavelRock_Down05_MapEvents:: @ 853DC64
-	map_events 0x0, NavelRock_Down05_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Down06.inc b/data/maps/events/NavelRock_Down06.inc
deleted file mode 100644
index c32dc9500..000000000
--- a/data/maps/events/NavelRock_Down06.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down06_MapWarps: @ 853DC78
-	warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_05
-	warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_07
-
-NavelRock_Down06_MapEvents:: @ 853DC88
-	map_events 0x0, NavelRock_Down06_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Down07.inc b/data/maps/events/NavelRock_Down07.inc
deleted file mode 100644
index 35191f0ba..000000000
--- a/data/maps/events/NavelRock_Down07.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down07_MapWarps: @ 853DC9C
-	warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_06
-	warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_08
-
-NavelRock_Down07_MapEvents:: @ 853DCAC
-	map_events 0x0, NavelRock_Down07_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Down08.inc b/data/maps/events/NavelRock_Down08.inc
deleted file mode 100644
index a55307cfa..000000000
--- a/data/maps/events/NavelRock_Down08.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down08_MapWarps: @ 853DCC0
-	warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_07
-	warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_09
-
-NavelRock_Down08_MapEvents:: @ 853DCD0
-	map_events 0x0, NavelRock_Down08_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Down09.inc b/data/maps/events/NavelRock_Down09.inc
deleted file mode 100644
index 7816eb358..000000000
--- a/data/maps/events/NavelRock_Down09.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down09_MapWarps: @ 853DCE4
-	warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_08
-	warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_10
-
-NavelRock_Down09_MapEvents:: @ 853DCF4
-	map_events 0x0, NavelRock_Down09_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Down10.inc b/data/maps/events/NavelRock_Down10.inc
deleted file mode 100644
index 20e7ac6cd..000000000
--- a/data/maps/events/NavelRock_Down10.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down10_MapWarps: @ 853DD08
-	warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_09
-	warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_11
-
-NavelRock_Down10_MapEvents:: @ 853DD18
-	map_events 0x0, NavelRock_Down10_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Down11.inc b/data/maps/events/NavelRock_Down11.inc
deleted file mode 100644
index eea34db90..000000000
--- a/data/maps/events/NavelRock_Down11.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Down11_MapWarps: @ 853DD2C
-	warp_def 5, 5, 3, 0, NAVEL_ROCK_BOTTOM
-	warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_10
-
-NavelRock_Down11_MapEvents:: @ 853DD3C
-	map_events 0x0, NavelRock_Down11_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Entrance.inc b/data/maps/events/NavelRock_Entrance.inc
deleted file mode 100644
index 9d470a864..000000000
--- a/data/maps/events/NavelRock_Entrance.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Entrance_MapWarps: @ 853DA70
-	warp_def 10, 5, 3, 0, NAVEL_ROCK_B1F
-	warp_def 10, 26, 3, 1, NAVEL_ROCK_EXTERIOR
-
-NavelRock_Entrance_MapEvents:: @ 853DA80
-	map_events 0x0, NavelRock_Entrance_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Exterior.inc b/data/maps/events/NavelRock_Exterior.inc
deleted file mode 100644
index 57a6d5a6e..000000000
--- a/data/maps/events/NavelRock_Exterior.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Exterior_MapWarps: @ 853DA00
-	warp_def 10, 18, 0, 0, NAVEL_ROCK_HARBOR
-	warp_def 10, 10, 0, 1, NAVEL_ROCK_ENTRANCE
-
-NavelRock_Exterior_MapEvents:: @ 853DA10
-	map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Fork.inc b/data/maps/events/NavelRock_Fork.inc
deleted file mode 100644
index 4e3f5a801..000000000
--- a/data/maps/events/NavelRock_Fork.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-NavelRock_Fork_MapWarps: @ 853DAB8
-	warp_def 4, 6, 3, 0, NAVEL_ROCK_UP_1
-	warp_def 11, 79, 3, 1, NAVEL_ROCK_B1F
-	warp_def 22, 6, 3, 0, NAVEL_ROCK_DOWN_01
-
-NavelRock_Fork_MapEvents:: @ 853DAD0
-	map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Harbor.inc b/data/maps/events/NavelRock_Harbor.inc
deleted file mode 100644
index 21102a474..000000000
--- a/data/maps/events/NavelRock_Harbor.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-NavelRock_Harbor_EventObjects: @ 853DA24
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-NavelRock_Harbor_MapWarps: @ 853DA54
-	warp_def 8, 2, 0, 0, NAVEL_ROCK_EXTERIOR
-
-NavelRock_Harbor_MapEvents:: @ 853DA5C
-	map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Top.inc b/data/maps/events/NavelRock_Top.inc
deleted file mode 100644
index 34e93223f..000000000
--- a/data/maps/events/NavelRock_Top.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Top_EventObjects: @ 853DB74
-	object_event 1, EVENT_OBJ_GFX_HOOH, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 801, 0, 0
-
-NavelRock_Top_MapWarps: @ 853DB8C
-	warp_def 13, 20, 3, 1, NAVEL_ROCK_UP_4
-
-NavelRock_Top_MapCoordEvents: @ 853DB94
-	coord_event 12, 10, 3, 0, VAR_TEMP_1, 0, 0, NavelRock_Top_EventScript_26916F
-
-NavelRock_Top_MapBGEvents: @ 853DBA4
-	bg_event 12, 9, 3, 7, 0, ITEM_SACRED_ASH, 109, 0
-
-NavelRock_Top_MapEvents:: @ 853DBB0
-	map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents
-
diff --git a/data/maps/events/NavelRock_Up1.inc b/data/maps/events/NavelRock_Up1.inc
deleted file mode 100644
index 292278a85..000000000
--- a/data/maps/events/NavelRock_Up1.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Up1_MapWarps: @ 853DAE4
-	warp_def 5, 5, 3, 0, NAVEL_ROCK_FORK
-	warp_def 3, 3, 3, 0, NAVEL_ROCK_UP_2
-
-NavelRock_Up1_MapEvents:: @ 853DAF4
-	map_events 0x0, NavelRock_Up1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Up2.inc b/data/maps/events/NavelRock_Up2.inc
deleted file mode 100644
index 55c4b4315..000000000
--- a/data/maps/events/NavelRock_Up2.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Up2_MapWarps: @ 853DB08
-	warp_def 3, 3, 3, 1, NAVEL_ROCK_UP_1
-	warp_def 5, 5, 3, 0, NAVEL_ROCK_UP_3
-
-NavelRock_Up2_MapEvents:: @ 853DB18
-	map_events 0x0, NavelRock_Up2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Up3.inc b/data/maps/events/NavelRock_Up3.inc
deleted file mode 100644
index c67cc7b17..000000000
--- a/data/maps/events/NavelRock_Up3.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Up3_MapWarps: @ 853DB2C
-	warp_def 5, 5, 3, 1, NAVEL_ROCK_UP_2
-	warp_def 3, 3, 3, 0, NAVEL_ROCK_UP_4
-
-NavelRock_Up3_MapEvents:: @ 853DB3C
-	map_events 0x0, NavelRock_Up3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NavelRock_Up4.inc b/data/maps/events/NavelRock_Up4.inc
deleted file mode 100644
index c1091ae52..000000000
--- a/data/maps/events/NavelRock_Up4.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-NavelRock_Up4_MapWarps: @ 853DB50
-	warp_def 3, 3, 3, 1, NAVEL_ROCK_UP_3
-	warp_def 5, 5, 3, 0, NAVEL_ROCK_TOP
-
-NavelRock_Up4_MapEvents:: @ 853DB60
-	map_events 0x0, NavelRock_Up4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/events/NewMauville_Entrance.inc
deleted file mode 100644
index 876841b6d..000000000
--- a/data/maps/events/NewMauville_Entrance.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-NewMauville_Entrance_MapWarps: @ 8536474
-	warp_def 4, 6, 3, 0, ROUTE_110
-	warp_def 4, 1, 3, 0, NEW_MAUVILLE_INSIDE
-
-NewMauville_Entrance_MapCoordEvents: @ 8536484
-	coord_event 4, 2, 3, 0, VAR_0x40BA, 0, 0, NewMauville_Entrance_EventScript_2372FF
-
-NewMauville_Entrance_MapEvents:: @ 8536494
-	map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc
deleted file mode 100644
index 141fd04d4..000000000
--- a/data/maps/events/NewMauville_Inside.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-NewMauville_Inside_EventObjects: @ 85364A8
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 39, 4, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291206, 1110, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 17, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291213, 1122, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291220, 1123, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 18, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377AF, 974, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377FC, 975, 0, 0
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_237849, 976, 0, 0
-
-NewMauville_Inside_MapWarps: @ 8536568
-	warp_def 32, 33, 3, 1, NEW_MAUVILLE_ENTRANCE
-
-NewMauville_Inside_MapCoordEvents: @ 8536570
-	coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459
-	coord_event 18, 36, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471
-	coord_event 4, 26, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459
-	coord_event 16, 22, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459
-	coord_event 25, 18, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471
-	coord_event 2, 11, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471
-	coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459
-	coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459
-	coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471
-	coord_event 33, 6, 3, 0, VAR_0x40BA, 1, 0, NewMauville_Inside_EventScript_237725
-
-NewMauville_Inside_MapBGEvents: @ 8536610
-	bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F
-	bg_event 32, 3, 3, 0, 0, NewMauville_Inside_EventScript_23778F
-	bg_event 32, 2, 0, 0, 0, NewMauville_Inside_EventScript_23778F
-	bg_event 33, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F
-	bg_event 34, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F
-	bg_event 35, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F
-	bg_event 35, 3, 3, 0, 0, NewMauville_Inside_EventScript_23778F
-	bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_23778F
-
-NewMauville_Inside_MapEvents:: @ 8536670
-	map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents
-
diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc
deleted file mode 100644
index 6278db428..000000000
--- a/data/maps/events/OldaleTown.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-OldaleTown_EventObjects: @ 8527854
-	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 19, 3, 7, 17, 0, 0, 0, OldaleTown_EventScript_1E9070, 979, 0, 0
-
-OldaleTown_MapWarps: @ 85278B4
-	warp_def 5, 7, 0, 0, OLDALE_TOWN_HOUSE_1
-	warp_def 15, 16, 0, 0, OLDALE_TOWN_HOUSE_2
-	warp_def 6, 16, 0, 0, OLDALE_TOWN_POKEMON_CENTER_1F
-	warp_def 14, 6, 0, 0, OLDALE_TOWN_MART
-
-OldaleTown_MapCoordEvents: @ 85278D4
-	coord_event 0, 10, 3, 0, VAR_0x4051, 0, 0, OldaleTown_EventScript_1E903F
-	coord_event 8, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E9086
-	coord_event 9, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E90A6
-	coord_event 10, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E90C6
-
-OldaleTown_MapBGEvents: @ 8527914
-	bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_1E8EEA
-	bg_event 7, 16, 0, 1, 0, OldaleTown_EventScript_271E73
-	bg_event 15, 6, 0, 1, 0, OldaleTown_EventScript_271E6A
-	bg_event 8, 16, 0, 1, 0, OldaleTown_EventScript_271E73
-	bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_271E6A
-
-OldaleTown_MapEvents:: @ 8527950
-	map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents
-
diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc
deleted file mode 100644
index 93ffb8d72..000000000
--- a/data/maps/events/OldaleTown_House1.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-OldaleTown_House1_EventObjects: @ 852D7B4
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0, 0, 0
-
-OldaleTown_House1_MapWarps: @ 852D7CC
-	warp_def 3, 8, 0, 0, OLDALE_TOWN
-	warp_def 4, 8, 0, 0, OLDALE_TOWN
-
-OldaleTown_House1_MapEvents:: @ 852D7DC
-	map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc
deleted file mode 100644
index 474487423..000000000
--- a/data/maps/events/OldaleTown_House2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-OldaleTown_House2_EventObjects: @ 852D7F0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0, 0, 0
-
-OldaleTown_House2_MapWarps: @ 852D820
-	warp_def 3, 7, 0, 1, OLDALE_TOWN
-	warp_def 4, 7, 0, 1, OLDALE_TOWN
-
-OldaleTown_House2_MapEvents:: @ 852D830
-	map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc
deleted file mode 100644
index 57e963cd5..000000000
--- a/data/maps/events/OldaleTown_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-OldaleTown_Mart_EventObjects: @ 852D95C
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 9, 4, 3, 3, 16, 0, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0, 0, 0
-
-OldaleTown_Mart_MapWarps: @ 852D9A4
-	warp_def 3, 7, 0, 3, OLDALE_TOWN
-	warp_def 4, 7, 0, 3, OLDALE_TOWN
-
-OldaleTown_Mart_MapEvents:: @ 852D9B4
-	map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc
deleted file mode 100644
index 65465578b..000000000
--- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 7, 3, 10, 17, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0, 0, 0
-
-OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4
-	warp_def 7, 8, 3, 2, OLDALE_TOWN
-	warp_def 6, 8, 3, 2, OLDALE_TOWN
-	warp_def 1, 6, 4, 0, OLDALE_TOWN_POKEMON_CENTER_2F
-
-OldaleTown_PokemonCenter_1F_MapEvents:: @ 852D8BC
-	map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/events/OldaleTown_PokemonCenter_2F.inc
deleted file mode 100644
index cbf3356a0..000000000
--- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-
-OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930
-	warp_def 1, 6, 4, 2, OLDALE_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-OldaleTown_PokemonCenter_2F_MapEvents:: @ 852D948
-	map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc
deleted file mode 100644
index b0df30af1..000000000
--- a/data/maps/events/PacifidlogTown.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-PacifidlogTown_EventObjects: @ 8527DE8
-	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0, 0, 0
-
-PacifidlogTown_MapWarps: @ 8527E30
-	warp_def 8, 15, 0, 0, PACIFIDLOG_TOWN_POKEMON_CENTER_1F
-	warp_def 16, 13, 0, 0, PACIFIDLOG_TOWN_HOUSE_1
-	warp_def 3, 22, 0, 0, PACIFIDLOG_TOWN_HOUSE_2
-	warp_def 12, 24, 0, 0, PACIFIDLOG_TOWN_HOUSE_3
-	warp_def 2, 12, 0, 0, PACIFIDLOG_TOWN_HOUSE_4
-	warp_def 17, 21, 0, 0, PACIFIDLOG_TOWN_HOUSE_5
-
-PacifidlogTown_MapBGEvents: @ 8527E60
-	bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73
-	bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_1EBADE
-	bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73
-
-PacifidlogTown_MapEvents:: @ 8527E84
-	map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents
-
diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc
deleted file mode 100644
index a60d8eedc..000000000
--- a/data/maps/events/PacifidlogTown_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PacifidlogTown_House1_EventObjects: @ 852EBA0
-	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0, 0, 0
-
-PacifidlogTown_House1_MapWarps: @ 852EBD0
-	warp_def 4, 8, 0, 1, PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 1, PACIFIDLOG_TOWN
-
-PacifidlogTown_House1_MapEvents:: @ 852EBE0
-	map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc
deleted file mode 100644
index 26147f726..000000000
--- a/data/maps/events/PacifidlogTown_House2.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-PacifidlogTown_House2_EventObjects: @ 852EBF4
-	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 3, 5, 3, 8, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203792, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203891, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 0, 1, 7, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0, 0, 0
-
-PacifidlogTown_House2_MapWarps: @ 852EC3C
-	warp_def 4, 8, 0, 2, PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 2, PACIFIDLOG_TOWN
-
-PacifidlogTown_House2_MapEvents:: @ 852EC4C
-	map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc
deleted file mode 100644
index 8f3292936..000000000
--- a/data/maps/events/PacifidlogTown_House3.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PacifidlogTown_House3_EventObjects: @ 852EC60
-	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 17, 0, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0, 0, 0
-
-PacifidlogTown_House3_MapWarps: @ 852EC90
-	warp_def 4, 8, 0, 3, PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 3, PACIFIDLOG_TOWN
-
-PacifidlogTown_House3_MapEvents:: @ 852ECA0
-	map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc
deleted file mode 100644
index 1d88d3be7..000000000
--- a/data/maps/events/PacifidlogTown_House4.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-PacifidlogTown_House4_EventObjects: @ 852ECB4
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 7, 5, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0, 0, 0
-
-PacifidlogTown_House4_MapWarps: @ 852ECFC
-	warp_def 4, 8, 0, 4, PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 4, PACIFIDLOG_TOWN
-
-PacifidlogTown_House4_MapEvents:: @ 852ED0C
-	map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc
deleted file mode 100644
index 51cbaaa39..000000000
--- a/data/maps/events/PacifidlogTown_House5.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PacifidlogTown_House5_EventObjects: @ 852ED20
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0, 0, 0
-
-PacifidlogTown_House5_MapWarps: @ 852ED50
-	warp_def 4, 8, 0, 5, PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 5, PACIFIDLOG_TOWN
-
-PacifidlogTown_House5_MapEvents:: @ 852ED60
-	map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
deleted file mode 100644
index f67b4269e..000000000
--- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0, 0, 0
-
-PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8
-	warp_def 7, 8, 3, 0, PACIFIDLOG_TOWN
-	warp_def 6, 8, 3, 0, PACIFIDLOG_TOWN
-	warp_def 1, 6, 4, 0, PACIFIDLOG_TOWN_POKEMON_CENTER_2F
-
-PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 852EB00
-	map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
deleted file mode 100644
index 26b9cf591..000000000
--- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-
-PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74
-	warp_def 1, 6, 4, 2, PACIFIDLOG_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 852EB8C
-	map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc
deleted file mode 100644
index 171790f56..000000000
--- a/data/maps/events/PetalburgCity.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-PetalburgCity_EventObjects: @ 8525FD0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 16, 18, 3, 2, 17, 0, 0, 0, PetalburgCity_EventScript_1DC3FD, 728, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WALLY, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 726, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 20, 10, 3, 3, 16, 0, 0, 0, PetalburgCity_EventScript_1DC488, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 830, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, 0x0, 995, 0, 0
-
-PetalburgCity_MapWarps: @ 85260A8
-	warp_def 10, 19, 0, 0, PETALBURG_CITY_HOUSE_1
-	warp_def 7, 5, 0, 0, PETALBURG_CITY_WALLYS_HOUSE
-	warp_def 15, 8, 0, 0, PETALBURG_CITY_GYM
-	warp_def 20, 16, 0, 0, PETALBURG_CITY_POKEMON_CENTER_1F
-	warp_def 20, 24, 0, 0, PETALBURG_CITY_HOUSE_2
-	warp_def 25, 12, 0, 0, PETALBURG_CITY_MART
-
-PetalburgCity_MapCoordEvents: @ 85260D8
-	coord_event 8, 10, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC49A
-	coord_event 8, 11, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4A6
-	coord_event 8, 12, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4B2
-	coord_event 8, 13, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4BE
-	coord_event 4, 10, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC691
-	coord_event 4, 11, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6A7
-	coord_event 4, 12, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6BD
-	coord_event 4, 13, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6D3
-
-PetalburgCity_MapBGEvents: @ 8526158
-	bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_1DC476
-	bg_event 26, 12, 0, 1, 0, PetalburgCity_EventScript_271E6A
-	bg_event 21, 16, 0, 1, 0, PetalburgCity_EventScript_271E73
-	bg_event 17, 16, 0, 0, 0, PetalburgCity_EventScript_1DC47F
-	bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_271E73
-	bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_271E6A
-	bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_1DC491
-	bg_event 11, 29, 3, 7, 0, ITEM_RARE_CANDY, 95, 0
-
-PetalburgCity_MapEvents:: @ 85261B8
-	map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents
-
diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc
deleted file mode 100644
index bdd6d2da4..000000000
--- a/data/maps/events/PetalburgCity_Gym.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-PetalburgCity_Gym_EventObjects: @ 852EDC8
-	object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781, 0, 0
-	object_event 10, EVENT_OBJ_GFX_WALLY, 0, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, 866, 0, 0
-	object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 0, 1, 7, 3, 7, 17, 0, 0, 0, 0x0, 824, 0, 0
-
-PetalburgCity_Gym_MapWarps: @ 852EED0
-	warp_def 4, 111, 3, 2, PETALBURG_CITY
-	warp_def 5, 111, 3, 2, PETALBURG_CITY
-	warp_def 1, 105, 3, 3, PETALBURG_CITY_GYM
-	warp_def 7, 85, 3, 2, PETALBURG_CITY_GYM
-	warp_def 6, 85, 3, 2, PETALBURG_CITY_GYM
-	warp_def 7, 105, 3, 6, PETALBURG_CITY_GYM
-	warp_def 1, 98, 3, 5, PETALBURG_CITY_GYM
-	warp_def 2, 98, 3, 5, PETALBURG_CITY_GYM
-	warp_def 1, 79, 3, 10, PETALBURG_CITY_GYM
-	warp_def 7, 79, 3, 12, PETALBURG_CITY_GYM
-	warp_def 7, 46, 3, 8, PETALBURG_CITY_GYM
-	warp_def 6, 46, 3, 8, PETALBURG_CITY_GYM
-	warp_def 1, 59, 3, 9, PETALBURG_CITY_GYM
-	warp_def 2, 59, 3, 9, PETALBURG_CITY_GYM
-	warp_def 1, 92, 3, 16, PETALBURG_CITY_GYM
-	warp_def 7, 92, 3, 18, PETALBURG_CITY_GYM
-	warp_def 7, 59, 3, 14, PETALBURG_CITY_GYM
-	warp_def 6, 59, 3, 14, PETALBURG_CITY_GYM
-	warp_def 1, 72, 3, 15, PETALBURG_CITY_GYM
-	warp_def 2, 72, 3, 15, PETALBURG_CITY_GYM
-	warp_def 7, 40, 3, 24, PETALBURG_CITY_GYM
-	warp_def 1, 53, 3, 26, PETALBURG_CITY_GYM
-	warp_def 7, 53, 3, 28, PETALBURG_CITY_GYM
-	warp_def 1, 66, 3, 30, PETALBURG_CITY_GYM
-	warp_def 1, 20, 3, 20, PETALBURG_CITY_GYM
-	warp_def 2, 20, 3, 20, PETALBURG_CITY_GYM
-	warp_def 7, 20, 3, 21, PETALBURG_CITY_GYM
-	warp_def 6, 20, 3, 21, PETALBURG_CITY_GYM
-	warp_def 1, 33, 3, 22, PETALBURG_CITY_GYM
-	warp_def 2, 33, 3, 22, PETALBURG_CITY_GYM
-	warp_def 7, 33, 3, 23, PETALBURG_CITY_GYM
-	warp_def 6, 33, 3, 23, PETALBURG_CITY_GYM
-	warp_def 7, 14, 3, 34, PETALBURG_CITY_GYM
-	warp_def 1, 27, 3, 36, PETALBURG_CITY_GYM
-	warp_def 1, 7, 3, 32, PETALBURG_CITY_GYM
-	warp_def 2, 7, 3, 32, PETALBURG_CITY_GYM
-	warp_def 7, 7, 3, 33, PETALBURG_CITY_GYM
-	warp_def 6, 7, 3, 33, PETALBURG_CITY_GYM
-
-PetalburgCity_Gym_MapBGEvents: @ 852F000
-	bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_205137
-	bg_event 7, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_205187
-	bg_event 1, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_2051BC
-	bg_event 7, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_2051EF
-	bg_event 1, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_205222
-	bg_event 7, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_205255
-	bg_event 7, 40, 3, 0, 0, PetalburgCity_Gym_EventScript_205288
-	bg_event 1, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_2052BB
-	bg_event 7, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_2052EE
-	bg_event 1, 66, 3, 0, 0, PetalburgCity_Gym_EventScript_205321
-	bg_event 7, 14, 3, 0, 0, PetalburgCity_Gym_EventScript_205354
-	bg_event 1, 27, 3, 0, 0, PetalburgCity_Gym_EventScript_205387
-	bg_event 1, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_20576E
-	bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_20577E
-
-PetalburgCity_Gym_MapEvents:: @ 852F0A8
-	map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents
-
diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc
deleted file mode 100644
index c078d6876..000000000
--- a/data/maps/events/PetalburgCity_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PetalburgCity_House1_EventObjects: @ 852F0BC
-	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 7, 4, 3, 2, 34, 0, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0, 0, 0
-
-PetalburgCity_House1_MapWarps: @ 852F0EC
-	warp_def 3, 8, 0, 0, PETALBURG_CITY
-	warp_def 4, 8, 0, 0, PETALBURG_CITY
-
-PetalburgCity_House1_MapEvents:: @ 852F0FC
-	map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc
deleted file mode 100644
index b6570b5e9..000000000
--- a/data/maps/events/PetalburgCity_House2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PetalburgCity_House2_EventObjects: @ 852F110
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 3, 2, 17, 0, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0, 0, 0
-
-PetalburgCity_House2_MapWarps: @ 852F140
-	warp_def 3, 7, 0, 4, PETALBURG_CITY
-	warp_def 4, 7, 0, 4, PETALBURG_CITY
-
-PetalburgCity_House2_MapEvents:: @ 852F150
-	map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc
deleted file mode 100644
index 0413f795a..000000000
--- a/data/maps/events/PetalburgCity_Mart.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-PetalburgCity_Mart_EventObjects: @ 852F294
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0, 0, 0
-
-PetalburgCity_Mart_MapWarps: @ 852F2F4
-	warp_def 3, 7, 0, 5, PETALBURG_CITY
-	warp_def 4, 7, 0, 5, PETALBURG_CITY
-
-PetalburgCity_Mart_MapEvents:: @ 852F304
-	map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
deleted file mode 100644
index 5c940de5a..000000000
--- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 9, 6, 3, 2, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 4, 3, 1, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0, 0, 0
-
-PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC
-	warp_def 7, 8, 3, 3, PETALBURG_CITY
-	warp_def 6, 8, 3, 3, PETALBURG_CITY
-	warp_def 1, 6, 4, 0, PETALBURG_CITY_POKEMON_CENTER_2F
-
-PetalburgCity_PokemonCenter_1F_MapEvents:: @ 852F1F4
-	map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
deleted file mode 100644
index 99312ac96..000000000
--- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-
-PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268
-	warp_def 1, 6, 4, 2, PETALBURG_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-PetalburgCity_PokemonCenter_2F_MapEvents:: @ 852F280
-	map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc
deleted file mode 100644
index e7107f07a..000000000
--- a/data/maps/events/PetalburgCity_WallysHouse.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PetalburgCity_WallysHouse_EventObjects: @ 852ED74
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0, 0, 0
-
-PetalburgCity_WallysHouse_MapWarps: @ 852EDA4
-	warp_def 3, 7, 0, 1, PETALBURG_CITY
-	warp_def 4, 7, 0, 1, PETALBURG_CITY
-
-PetalburgCity_WallysHouse_MapEvents:: @ 852EDB4
-	map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc
deleted file mode 100644
index bb9b69f35..000000000
--- a/data/maps/events/PetalburgWoods.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-PetalburgWoods_EventObjects: @ 85345E4
-	object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 10, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17, 0, 0
-	object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 11, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18, 0, 0
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, 725, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, 724, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 0, 15, 19, 3, 3, 33, 0, 0, 0, PetalburgWoods_EventScript_22E210, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 0, 30, 34, 3, 2, 18, 0, 0, 0, PetalburgWoods_EventScript_22E219, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 26, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_291129, 1117, 0, 0
-	object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 0, 33, 5, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_22E222, 0, 0, 0
-
-PetalburgWoods_MapWarps: @ 853471C
-	warp_def 14, 5, 0, 2, ROUTE_104
-	warp_def 15, 5, 0, 3, ROUTE_104
-	warp_def 16, 38, 0, 4, ROUTE_104
-	warp_def 17, 38, 0, 5, ROUTE_104
-	warp_def 36, 38, 0, 6, ROUTE_104
-	warp_def 37, 38, 0, 7, ROUTE_104
-
-PetalburgWoods_MapCoordEvents: @ 853474C
-	coord_event 26, 23, 3, 0, VAR_0x4098, 0, 0, PetalburgWoods_EventScript_22DFD7
-	coord_event 27, 23, 3, 0, VAR_0x4098, 0, 0, PetalburgWoods_EventScript_22E079
-
-PetalburgWoods_MapBGEvents: @ 853476C
-	bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_22E25B
-	bg_event 39, 35, 3, 7, 0, ITEM_POTION, 58, 0
-	bg_event 26, 6, 3, 7, 0, ITEM_TINY_MUSHROOM, 59, 0
-	bg_event 40, 29, 3, 7, 0, ITEM_TINY_MUSHROOM, 60, 0
-	bg_event 4, 19, 3, 7, 0, ITEM_POKE_BALL, 61, 0
-	bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_22E264
-
-PetalburgWoods_MapEvents:: @ 85347B4
-	map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents
-
diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc
deleted file mode 100644
index ad9f6625d..000000000
--- a/data/maps/events/RecordCorner.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-RecordCorner_EventObjects: @ 8539DFC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0, 0, 0
-
-RecordCorner_MapWarps: @ 8539E14
-	warp_def 8, 9, 3, 127, NONE
-	warp_def 9, 9, 3, 127, NONE
-	warp_def 11, 9, 3, 127, NONE
-	warp_def 10, 9, 3, 127, NONE
-
-RecordCorner_MapCoordEvents: @ 8539E34
-	coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827741D
-	coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277447
-	coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277432
-	coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827745C
-
-RecordCorner_MapEvents:: @ 8539E74
-	map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc
deleted file mode 100644
index e942526ba..000000000
--- a/data/maps/events/Route101.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-Route101_EventObjects: @ 8527E98
-	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750, 0, 0
-	object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 0, 2, 13, 3, 5, 17, 0, 0, 0, Route101_EventScript_1EBE04, 991, 0, 0
-
-Route101_MapCoordEvents: @ 8527F28
-	coord_event 10, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE
-	coord_event 11, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE
-	coord_event 10, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD4E
-	coord_event 11, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD4E
-	coord_event 6, 16, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
-	coord_event 6, 15, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
-	coord_event 6, 17, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
-	coord_event 6, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
-	coord_event 7, 13, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD7A
-
-Route101_MapBGEvents: @ 8527FB8
-	bg_event 5, 9, 0, 0, 0, Route101_EventScript_1EBE0D
-
-Route101_MapEvents:: @ 8527FC4
-	map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents
-
diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc
deleted file mode 100644
index 8b1551f09..000000000
--- a/data/maps/events/Route102.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-Route102_EventObjects: @ 8527FD8
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 37, 4, 3, 2, 17, 0, 0, 0, Route102_EventScript_1EC0FC, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 19, 4, 3, 8, 17, 0, 1, 3, Route102_EventScript_1EC1E1, 0, 0, 0
-
-Route102_MapBGEvents: @ 85280B0
-	bg_event 17, 2, 0, 0, 0, Route102_EventScript_1EC0F3
-	bg_event 40, 9, 0, 0, 0, Route102_EventScript_1EC0EA
-
-Route102_MapEvents:: @ 85280C8
-	map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents
-
diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc
deleted file mode 100644
index cdd07bab1..000000000
--- a/data/maps/events/Route103.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-Route103_EventObjects: @ 85280DC
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 50, 8, 3, 26, 16, 0, 1, 3, Route103_EventScript_1EC6D1, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 0, 20, 10, 3, 2, 33, 0, 0, 0, Route103_EventScript_1EC5D9, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, Route103_EventScript_272141, 898, 0, 0
-	object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 50, 5, 3, 1, 17, 0, 0, 0, Route103_EventScript_290CE5, 1114, 0, 0
-	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 67, 7, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 18, 0, 0
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 72, 8, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 19, 0, 0
-	object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 67, 5, 3, 8, 17, 0, 1, 2, Route103_EventScript_1EC761, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 0, 67, 9, 3, 7, 17, 0, 1, 2, Route103_EventScript_1EC74A, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 36, 6, 1, 26, 49, 0, 1, 5, Route103_EventScript_1EC78F, 0, 0, 0
-	object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 36, 13, 1, 25, 49, 0, 1, 5, Route103_EventScript_1EC778, 0, 0, 0
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 64, 7, 0, 1, 17, 0, 0, 0, Route103_EventScript_290CF2, 1137, 0, 0
-
-Route103_MapWarps: @ 85282BC
-	warp_def 45, 6, 0, 0, ALTERING_CAVE
-
-Route103_MapBGEvents: @ 85282C4
-	bg_event 11, 9, 0, 0, 0, Route103_EventScript_1EC5EB
-
-Route103_MapEvents:: @ 85282D0
-	map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents
-
diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc
deleted file mode 100644
index 66a9e0edb..000000000
--- a/data/maps/events/Route104.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-Route104_EventObjects: @ 85282E4
-	object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 25, 49, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED006, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 27, 63, 3, 3, 16, 0, 0, 0, Route104_EventScript_1ED045, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 30, 50, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED04E, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_1ED090, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, 742, 0, 0
-	object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, 738, 0, 0
-	object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 34, 6, 3, 12, 0, 0, 0, 8, BerryTreeScript, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 6, 3, 12, 0, 0, 0, 9, BerryTreeScript, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 6, 3, 12, 0, 0, 0, 10, BerryTreeScript, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 22, 41, 3, 12, 0, 0, 0, 11, BerryTreeScript, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 23, 41, 3, 12, 0, 0, 0, 12, BerryTreeScript, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 41, 3, 12, 0, 0, 0, 13, BerryTreeScript, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 37, 8, 3, 9, 17, 0, 0, 0, Route104_EventScript_1ECF8C, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 22, 3, 12, 0, 0, 0, 3, BerryTreeScript, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 23, 3, 12, 0, 0, 0, 4, BerryTreeScript, 0, 0, 0
-	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 24, 3, 12, 0, 0, 0, 75, BerryTreeScript, 0, 0, 0
-	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 25, 3, 12, 0, 0, 0, 76, BerryTreeScript, 0, 0, 0
-	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002, 0, 0
-	object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906, 0, 0
-	object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 27, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED597, 0, 0, 0
-	object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0, 0, 0
-	object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 0, 21, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0, 0, 0
-	object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0, 0, 0
-	object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D0C, 1057, 0, 0
-	object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 18, 67, 3, 46, 101, 0, 1, 2, Route104_EventScript_1ED376, 0, 0, 0
-	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D19, 1115, 0, 0
-	object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_2906BB, 17, 0, 0
-	object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 8, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D26, 1135, 0, 0
-	object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 26, 3, 1, 17, 0, 0, 0, Route104_EventScript_1ED057, 0, 0, 0
-	object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 15, 59, 3, 9, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0, 0, 0
-	object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 0, 17, 50, 0, 1, 17, 0, 0, 0, Route104_EventScript_1ECC9E, 719, 0, 0
-
-Route104_MapWarps: @ 8528614
-	warp_def 17, 50, 0, 0, ROUTE_104_MR_BRINEYS_HOUSE
-	warp_def 5, 18, 0, 0, ROUTE_104_PRETTY_PETAL_FLOWER_SHOP
-	warp_def 10, 30, 3, 0, PETALBURG_WOODS
-	warp_def 11, 30, 3, 1, PETALBURG_WOODS
-	warp_def 10, 38, 3, 2, PETALBURG_WOODS
-	warp_def 11, 38, 3, 3, PETALBURG_WOODS
-	warp_def 32, 42, 3, 4, PETALBURG_WOODS
-	warp_def 33, 42, 3, 5, PETALBURG_WOODS
-
-Route104_MapCoordEvents: @ 8528654
-	coord_event 17, 51, 3, 0, VAR_0x4063, 1, 0, Route104_EventScript_1ECCB3
-
-Route104_MapBGEvents: @ 8528664
-	bg_event 20, 50, 0, 0, 0, Route104_EventScript_1ED018
-	bg_event 27, 66, 0, 0, 0, Route104_EventScript_1ED021
-	bg_event 23, 5, 0, 0, 0, Route104_EventScript_1ED02A
-	bg_event 7, 20, 0, 0, 0, Route104_EventScript_1ED033
-	bg_event 17, 23, 3, 0, 0, Route104_EventScript_1ED03C
-	bg_event 7, 6, 3, 7, 0, ITEM_SUPER_POTION, 44, 0
-	bg_event 3, 9, 3, 7, 0, ITEM_POKE_BALL, 62, 0
-	bg_event 14, 55, 3, 7, 0, ITEM_POTION, 37, 0
-	bg_event 16, 72, 3, 7, 0, ITEM_ANTIDOTE, 85, 0
-	bg_event 16, 64, 3, 7, 0, ITEM_HEART_SCALE, 88, 0
-
-Route104_MapEvents:: @ 85286DC
-	map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents
-
diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc
deleted file mode 100644
index 2088faf16..000000000
--- a/data/maps/events/Route104_MrBrineysHouse.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route104_MrBrineysHouse_EventObjects: @ 8533AD4
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 3, 3, 50, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 0, 6, 3, 3, 8, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881, 0, 0
-
-Route104_MrBrineysHouse_MapWarps: @ 8533B04
-	warp_def 5, 8, 0, 0, ROUTE_104
-	warp_def 6, 8, 0, 0, ROUTE_104
-
-Route104_MrBrineysHouse_MapEvents:: @ 8533B14
-	map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc
deleted file mode 100644
index 2d6d7fe37..000000000
--- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 0, 11, 6, 4, 2, 34, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0, 0, 0
-
-Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70
-	warp_def 2, 8, 0, 1, ROUTE_104
-	warp_def 3, 8, 0, 1, ROUTE_104
-
-Route104_PrettyPetalFlowerShop_MapEvents:: @ 8533B80
-	map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc
deleted file mode 100644
index b7583aabd..000000000
--- a/data/maps/events/Route105.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route105_EventObjects: @ 85286F0
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 19, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_1EE261, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 27, 36, 1, 27, 7, 0, 1, 3, Route105_EventScript_1EE278, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 8, 45, 1, 25, 112, 0, 1, 3, Route105_EventScript_1EE28F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 19, 9, 1, 24, 80, 0, 1, 3, Route105_EventScript_1EE2A6, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_290D33, 1003, 0, 0
-	object_event 6, EVENT_OBJ_GFX_HIKER, 0, 0, 17, 48, 3, 26, 112, 0, 1, 3, Route105_EventScript_1EE24A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 54, 3, 8, 32, 0, 1, 2, Route105_EventScript_1EE2BD, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 58, 3, 7, 32, 0, 1, 4, Route105_EventScript_1EE2D4, 0, 0, 0
-
-Route105_MapWarps: @ 85287B0
-	warp_def 9, 20, 0, 0, ISLAND_CAVE
-
-Route105_MapBGEvents: @ 85287B8
-	bg_event 15, 68, 3, 7, 0, ITEM_HEART_SCALE, 89, 0
-	bg_event 5, 56, 3, 7, 0, ITEM_BIG_PEARL, 111, 0
-
-Route105_MapEvents:: @ 85287D0
-	map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
-
diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc
deleted file mode 100644
index 866a894fa..000000000
--- a/data/maps/events/Route106.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-Route106_EventObjects: @ 85287E4
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004, 0, 0
-
-Route106_MapWarps: @ 852885C
-	warp_def 48, 16, 0, 0, GRANITE_CAVE_1F
-
-Route106_MapBGEvents: @ 8528864
-	bg_event 41, 11, 3, 7, 0, ITEM_POKE_BALL, 63, 0
-	bg_event 53, 12, 0, 7, 0, ITEM_STARDUST, 46, 0
-	bg_event 68, 15, 3, 7, 0, ITEM_HEART_SCALE, 47, 0
-	bg_event 59, 13, 3, 0, 0, Route106_EventScript_1EE48A
-
-Route106_MapEvents:: @ 8528894
-	map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents
-
diff --git a/data/maps/events/Route107.inc b/data/maps/events/Route107.inc
deleted file mode 100644
index 87d734ed4..000000000
--- a/data/maps/events/Route107.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route107_EventObjects: @ 85288A8
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 41, 10, 1, 24, 17, 0, 1, 3, Route107_EventScript_1EE595, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 23, 11, 1, 52, 38, 0, 1, 2, Route107_EventScript_1EE5AC, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 50, 11, 1, 65, 17, 0, 1, 5, Route107_EventScript_1EE625, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 33, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE63C, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 32, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE657, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 50, 5, 1, 64, 17, 0, 1, 5, Route107_EventScript_1EE672, 0, 0, 0
-
-Route107_MapEvents:: @ 8528950
-	map_events Route107_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc
deleted file mode 100644
index 61a4b521a..000000000
--- a/data/maps/events/Route108.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-Route108_EventObjects: @ 8528964
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 52, 13, 1, 45, 51, 0, 1, 3, Route108_EventScript_1EE68A, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 35, 12, 1, 13, 17, 0, 1, 3, Route108_EventScript_1EE6B8, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 41, 5, 3, 10, 17, 0, 1, 1, Route108_EventScript_1EE6E6, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 0, 43, 5, 3, 9, 17, 0, 1, 1, Route108_EventScript_1EE6FD, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 42, 4, 3, 1, 17, 0, 0, 0, Route108_EventScript_290D4D, 1139, 0, 0
-
-Route108_MapWarps: @ 8528A0C
-	warp_def 29, 6, 3, 0, ABANDONED_SHIP_DECK
-
-Route108_MapBGEvents: @ 8528A14
-	bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0
-
-Route108_MapEvents:: @ 8528A20
-	map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents
-
diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc
deleted file mode 100644
index d1e85b36c..000000000
--- a/data/maps/events/Route109.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-Route109_EventObjects: @ 8528A34
-	object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, 744, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_1EE910, 741, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 25, 39, 1, 15, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 0, 15, 17, 4, 8, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 0, 24, 13, 3, 9, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 0, 19, 10, 3, 8, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 0, 22, 7, 3, 80, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_1EE995, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 46, 3, 1, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005, 0, 0
-	object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 21, 56, 0, 9, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 0, 24, 18, 3, 10, 17, 0, 0, 0, Route109_EventScript_1EE99E, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 0, 25, 18, 3, 9, 17, 0, 0, 0, Route109_EventScript_1EE9B5, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 30, 32, 3, 8, 17, 0, 0, 0, Route109_EventScript_1EEA06, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 8, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBBD, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 0, 9, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBA2, 0, 0, 0
-	object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 33, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA0F, 0, 0, 0
-	object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 32, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA18, 0, 0, 0
-	object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 0, 17, 13, 3, 80, 17, 0, 1, 6, Route109_EventScript_1EEBEF, 0, 0, 0
-	object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 0, 27, 7, 3, 79, 17, 0, 1, 4, Route109_EventScript_1EEBD8, 0, 0, 0
-	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_290D67, 1140, 0, 0
-	object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 0, 17, 56, 3, 80, 17, 0, 1, 3, Route109_EventScript_1EEC06, 0, 0, 0
-
-Route109_MapWarps: @ 8528C74
-	warp_def 12, 5, 0, 0, ROUTE_109_SEASHORE_HOUSE
-
-Route109_MapBGEvents: @ 8528C7C
-	bg_event 15, 5, 0, 0, 0, Route109_EventScript_1EEA2B
-	bg_event 29, 10, 3, 0, 0, Route109_EventScript_1EEA34
-	bg_event 16, 23, 3, 7, 0, ITEM_REVIVE, 50, 0
-	bg_event 33, 5, 3, 7, 0, ITEM_HEART_SCALE, 52, 0
-	bg_event 9, 10, 3, 7, 0, ITEM_GREAT_BALL, 51, 0
-	bg_event 28, 20, 3, 7, 0, ITEM_ETHER, 64, 0
-	bg_event 13, 16, 3, 7, 0, ITEM_HEART_SCALE, 90, 0
-	bg_event 8, 42, 3, 7, 0, ITEM_HEART_SCALE, 91, 0
-
-Route109_MapEvents:: @ 8528CDC
-	map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents
-
diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc
deleted file mode 100644
index 7ded7ed23..000000000
--- a/data/maps/events/Route109_SeashoreHouse.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-Route109_SeashoreHouse_EventObjects: @ 853DDE8
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0, 0, 0
-
-Route109_SeashoreHouse_MapWarps: @ 853DE48
-	warp_def 6, 9, 0, 0, ROUTE_109
-	warp_def 7, 9, 0, 0, ROUTE_109
-
-Route109_SeashoreHouse_MapEvents:: @ 853DE58
-	map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc
deleted file mode 100644
index 9dd5649fb..000000000
--- a/data/maps/events/Route110.inc
+++ /dev/null
@@ -1,79 +0,0 @@
-Route110_EventObjects: @ 8528CF0
-	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF338, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 14, 69, 3, 3, 16, 0, 0, 0, Route110_EventScript_1EF326, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 9, 57, 4, 2, 17, 0, 0, 0, Route110_EventScript_1EF314, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 11, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF31D, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 27, 24, 4, 2, 49, 0, 0, 0, Route110_EventScript_1EF30B, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 0, 15, 7, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF302, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 16, 73, 4, 49, 226, 0, 1, 3, Route110_EventScript_1EF529, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 31, 4, 51, 26, 0, 1, 3, Route110_EventScript_1EF4B0, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 30, 31, 4, 9, 17, 0, 1, 4, Route110_EventScript_1EF540, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 16, 55, 4, 45, 68, 0, 1, 3, Route110_EventScript_1EF4C7, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 39, 3, 10, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_LASS, 0, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_1EF409, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 0, 34, 40, 3, 67, 0, 0, 1, 4, Route110_EventScript_1EF420, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_1EF482, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 5, 11, 3, 12, 0, 0, 0, 16, BerryTreeScript, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 6, 11, 3, 12, 0, 0, 0, 17, BerryTreeScript, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 7, 11, 3, 12, 0, 0, 0, 18, BerryTreeScript, 0, 0, 0
-	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D81, 1007, 0, 0
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D74, 1006, 0, 0
-	object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0, 0, 0
-	object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900, 0, 0
-	object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900, 0, 0
-	object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900, 0, 0
-	object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900, 0, 0
-	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 82, 3, 8, 0, 0, 0, 0, 0x0, 900, 0, 0
-	object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 21, 78, 4, 51, 23, 0, 1, 2, Route110_EventScript_1EF499, 0, 0, 0
-	object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, 919, 0, 0
-	object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, 922, 0, 0
-	object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_1EF604, 0, 0, 0
-	object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 76, 3, 9, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0, 0, 0
-	object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 76, 3, 10, 17, 0, 1, 2, Route110_EventScript_1EF61C, 0, 0, 0
-	object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 10, 39, 3, 9, 17, 0, 1, 6, Route110_EventScript_1EF64A, 0, 0, 0
-	object_event 34, EVENT_OBJ_GFX_MAN_6, 0, 0, 36, 40, 3, 66, 17, 0, 1, 3, Route110_EventScript_1EF633, 0, 0, 0
-	object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 38, 3, 1, 17, 0, 0, 0, Route110_EventScript_290D8E, 1141, 0, 0
-	object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 79, 3, 1, 17, 0, 0, 0, 0x0, 837, 0, 0
-
-Route110_MapWarps: @ 8529050
-	warp_def 35, 24, 3, 0, NEW_MAUVILLE_ENTRANCE
-	warp_def 11, 66, 0, 0, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 15, 16, 0, 0, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_2
-	warp_def 18, 16, 0, 2, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_2
-	warp_def 16, 88, 0, 0, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_1
-	warp_def 19, 88, 0, 2, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_1
-
-Route110_MapCoordEvents: @ 8529080
-	coord_event 28, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661
-	coord_event 29, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661
-	coord_event 33, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF74D
-	coord_event 34, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF758
-	coord_event 35, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF763
-	coord_event 7, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9CB
-	coord_event 8, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9D6
-	coord_event 9, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9E1
-	coord_event 10, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9EC
-
-Route110_MapBGEvents: @ 8529110
-	bg_event 15, 25, 0, 0, 0, Route110_EventScript_1EF353
-	bg_event 9, 51, 0, 0, 0, Route110_EventScript_1EF365
-	bg_event 14, 88, 0, 0, 0, Route110_EventScript_1EF34A
-	bg_event 20, 94, 0, 0, 0, Route110_EventScript_1EF341
-	bg_event 7, 79, 0, 0, 0, Route110_EventScript_1EF35C
-	bg_event 3, 17, 0, 0, 0, Route110_EventScript_1EF36E
-	bg_event 16, 25, 0, 8, 0, ITEM_MACHO_BRACE, 0, 0
-	bg_event 17, 25, 0, 8, 0, ITEM_SOUL_DEW, 0, 0
-	bg_event 33, 39, 3, 0, 0, Route110_EventScript_1EF377
-	bg_event 37, 70, 3, 0, 0, Route110_EventScript_1EF380
-	bg_event 8, 67, 0, 0, 0, Route110_EventScript_1EF389
-	bg_event 32, 93, 0, 0, 0, Route110_EventScript_1EF392
-	bg_event 35, 39, 3, 7, 0, ITEM_REVIVE, 54, 0
-	bg_event 33, 45, 3, 7, 0, ITEM_GREAT_BALL, 53, 0
-	bg_event 4, 35, 3, 7, 0, ITEM_POKE_BALL, 65, 0
-	bg_event 37, 67, 3, 7, 0, ITEM_FULL_HEAL, 55, 0
-	bg_event 13, 16, 0, 0, 0, Route110_EventScript_1EF34A
-
-Route110_MapEvents:: @ 85291DC
-	map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents
-
diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc
deleted file mode 100644
index 23f896e4b..000000000
--- a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route110_SeasideCyclingRoadEntrance1_EventObjects: @ 853E9A0
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0, 0, 0
-
-Route110_SeasideCyclingRoadEntrance1_MapWarps: @ 853E9B8
-	warp_def 1, 5, 0, 4, ROUTE_110
-	warp_def 2, 5, 0, 4, ROUTE_110
-	warp_def 12, 5, 0, 5, ROUTE_110
-	warp_def 13, 5, 0, 5, ROUTE_110
-
-Route110_SeasideCyclingRoadEntrance1_MapCoordEvents: @ 853E9D8
-	coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84
-	coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6
-
-Route110_SeasideCyclingRoadEntrance1_MapEvents:: @ 853E9F8
-	map_events Route110_SeasideCyclingRoadEntrance1_EventObjects, Route110_SeasideCyclingRoadEntrance1_MapWarps, Route110_SeasideCyclingRoadEntrance1_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc
deleted file mode 100644
index f988f9751..000000000
--- a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route110_SeasideCyclingRoadEntrance2_EventObjects: @ 853EA0C
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0, 0, 0
-
-Route110_SeasideCyclingRoadEntrance2_MapWarps: @ 853EA24
-	warp_def 1, 5, 0, 2, ROUTE_110
-	warp_def 2, 5, 0, 2, ROUTE_110
-	warp_def 12, 5, 0, 3, ROUTE_110
-	warp_def 13, 5, 0, 3, ROUTE_110
-
-Route110_SeasideCyclingRoadEntrance2_MapCoordEvents: @ 853EA44
-	coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0
-	coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13
-
-Route110_SeasideCyclingRoadEntrance2_MapEvents:: @ 853EA64
-	map_events Route110_SeasideCyclingRoadEntrance2_EventObjects, Route110_SeasideCyclingRoadEntrance2_MapWarps, Route110_SeasideCyclingRoadEntrance2_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/events/Route110_TrickHouseCorridor.inc
deleted file mode 100644
index eaef9c9a2..000000000
--- a/data/maps/events/Route110_TrickHouseCorridor.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route110_TrickHouseCorridor_MapWarps: @ 853DF54
-	warp_def 13, 3, 3, 1, ROUTE_110_TRICK_HOUSE_END
-	warp_def 14, 3, 3, 1, ROUTE_110_TRICK_HOUSE_END
-	warp_def 4, 23, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 5, 23, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-
-Route110_TrickHouseCorridor_MapEvents:: @ 853DF74
-	map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc
deleted file mode 100644
index 62640ab29..000000000
--- a/data/maps/events/Route110_TrickHouseEnd.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route110_TrickHouseEnd_EventObjects: @ 853DEFC
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899, 0, 0
-
-Route110_TrickHouseEnd_MapWarps: @ 853DF14
-	warp_def 10, 1, 3, 2, ROUTE_110_TRICK_HOUSE_PUZZLE_1
-	warp_def 2, 1, 3, 0, ROUTE_110_TRICK_HOUSE_CORRIDOR
-
-Route110_TrickHouseEnd_MapCoordEvents: @ 853DF24
-	coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_26B041
-
-Route110_TrickHouseEnd_MapBGEvents: @ 853DF34
-	bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0
-
-Route110_TrickHouseEnd_MapEvents:: @ 853DF40
-	map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents
-
diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc
deleted file mode 100644
index c6a31119f..000000000
--- a/data/maps/events/Route110_TrickHouseEntrance.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route110_TrickHouseEntrance_EventObjects: @ 853DE6C
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872, 0, 0
-
-Route110_TrickHouseEntrance_MapWarps: @ 853DE84
-	warp_def 5, 7, 3, 1, ROUTE_110
-	warp_def 6, 7, 3, 1, ROUTE_110
-	warp_def 5, 2, 3, 0, ROUTE_110_TRICK_HOUSE_PUZZLE_1
-
-Route110_TrickHouseEntrance_MapCoordEvents: @ 853DE9C
-	coord_event 4, 7, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
-	coord_event 5, 6, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
-	coord_event 6, 6, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
-	coord_event 7, 7, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
-
-Route110_TrickHouseEntrance_MapBGEvents: @ 853DEDC
-	bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_26A0D3
-
-Route110_TrickHouseEntrance_MapEvents:: @ 853DEE8
-	map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents
-
diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc
deleted file mode 100644
index 40da83bb8..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle1.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-Route110_TrickHousePuzzle1_EventObjects: @ 853DF88
-	object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 14, 20, 3, 9, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 8, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 2, 15, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19, 0, 0
-	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 18, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18, 0, 0
-	object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 14, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20, 0, 0
-	object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23, 0, 0
-	object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22, 0, 0
-	object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21, 0, 0
-	object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25, 0, 0
-	object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24, 0, 0
-	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27, 0, 0
-	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060, 0, 0
-	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28, 0, 0
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30, 0, 0
-
-Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0
-	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle1_MapBGEvents: @ 853E108
-	bg_event 3, 16, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_26B92B
-
-Route110_TrickHousePuzzle1_MapEvents:: @ 853E114
-	map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents
-
diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc
deleted file mode 100644
index ed03f5d79..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle2.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-Route110_TrickHousePuzzle2_EventObjects: @ 853E128
-	object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 10, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 17, 3, 8, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 11, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061, 0, 0
-
-Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0
-	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle2_MapCoordEvents: @ 853E1B8
-	coord_event 11, 12, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD
-	coord_event 0, 4, 0, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0
-	coord_event 14, 5, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BC03
-	coord_event 7, 11, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BC16
-
-Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8
-	bg_event 14, 14, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBC0
-
-Route110_TrickHousePuzzle2_MapEvents:: @ 853E204
-	map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents
-
diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc
deleted file mode 100644
index 0097717fa..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle3.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-Route110_TrickHousePuzzle3_EventObjects: @ 853E218
-	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 19, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 0, 4, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 10, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 1, 20, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 21, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22, 0, 0
-
-Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0
-	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle3_MapCoordEvents: @ 853E2D8
-	coord_event 4, 14, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD
-	coord_event 3, 11, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9
-	coord_event 12, 5, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5
-	coord_event 8, 2, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1
-
-Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318
-	bg_event 0, 14, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C5A7
-
-Route110_TrickHousePuzzle3_MapEvents:: @ 853E324
-	map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents
-
diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc
deleted file mode 100644
index b6e4b2f07..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle4.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-Route110_TrickHousePuzzle4_EventObjects: @ 853E338
-	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 2, 2, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 14, 7, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 14, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065, 0, 0
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19, 0, 0
-	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20, 0, 0
-	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21, 0, 0
-	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22, 0, 0
-	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23, 0, 0
-	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24, 0, 0
-	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 14, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25, 0, 0
-	object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26, 0, 0
-
-Route110_TrickHousePuzzle4_MapWarps: @ 853E488
-	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle4_MapBGEvents: @ 853E4A0
-	bg_event 14, 13, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_26C861
-
-Route110_TrickHousePuzzle4_MapEvents:: @ 853E4AC
-	map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents
-
diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc
deleted file mode 100644
index 7ae53cdad..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle5.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 6, 17, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 0, 7, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 14, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 0, 14, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0, 0, 0
-
-Route110_TrickHousePuzzle5_MapWarps: @ 853E538
-	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle5_MapCoordEvents: @ 853E550
-	coord_event 5, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7
-	coord_event 4, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3
-	coord_event 3, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF
-	coord_event 2, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBFB
-	coord_event 1, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC13
-	coord_event 2, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC1F
-	coord_event 13, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC5B
-	coord_event 12, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC67
-	coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC73
-	coord_event 13, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC97
-	coord_event 12, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCA3
-	coord_event 11, 4, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCDF
-	coord_event 1, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC07
-	coord_event 3, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC2B
-	coord_event 4, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC37
-	coord_event 5, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC43
-	coord_event 6, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC4F
-	coord_event 10, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC7F
-	coord_event 9, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC8B
-	coord_event 11, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCAF
-	coord_event 10, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB
-	coord_event 9, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7
-
-Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0
-	bg_event 11, 21, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB15
-
-Route110_TrickHousePuzzle5_MapEvents:: @ 853E6BC
-	map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents
-
diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc
deleted file mode 100644
index a36e7cd72..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle6.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0
-	object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 0, 7, 9, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 11, 10, 3, 10, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 4, 5, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067, 0, 0
-
-Route110_TrickHousePuzzle6_MapWarps: @ 853E730
-	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle6_MapBGEvents: @ 853E748
-	bg_event 0, 10, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_26DDC4
-
-Route110_TrickHousePuzzle6_MapEvents:: @ 853E754
-	map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents
-
diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc
deleted file mode 100644
index 39ee27853..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle7.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-Route110_TrickHousePuzzle7_EventObjects: @ 853E768
-	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 20, 0, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 10, 2, 0, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 8, 17, 0, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068, 0, 0
-	object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 2, 3, 8, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_LASS, 0, 0, 8, 13, 3, 7, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 12, 3, 9, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 17, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 6, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-Route110_TrickHousePuzzle7_MapWarps: @ 853E840
-	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END
-	warp_def 13, 4, 0, 4, ROUTE_110_TRICK_HOUSE_PUZZLE_7
-	warp_def 7, 3, 0, 3, ROUTE_110_TRICK_HOUSE_PUZZLE_7
-	warp_def 13, 11, 0, 6, ROUTE_110_TRICK_HOUSE_PUZZLE_7
-	warp_def 4, 3, 0, 5, ROUTE_110_TRICK_HOUSE_PUZZLE_7
-	warp_def 1, 17, 0, 8, ROUTE_110_TRICK_HOUSE_PUZZLE_7
-	warp_def 0, 11, 0, 7, ROUTE_110_TRICK_HOUSE_PUZZLE_7
-	warp_def 2, 3, 0, 10, ROUTE_110_TRICK_HOUSE_PUZZLE_7
-	warp_def 4, 13, 0, 9, ROUTE_110_TRICK_HOUSE_PUZZLE_7
-	warp_def 1, 3, 0, 12, ROUTE_110_TRICK_HOUSE_PUZZLE_7
-	warp_def 8, 12, 0, 11, ROUTE_110_TRICK_HOUSE_PUZZLE_7
-
-Route110_TrickHousePuzzle7_MapCoordEvents: @ 853E8A8
-	coord_event 8, 19, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E31B
-	coord_event 0, 14, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E331
-	coord_event 6, 6, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E347
-	coord_event 9, 7, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E35D
-
-Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8
-	bg_event 6, 17, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E1D0
-
-Route110_TrickHousePuzzle7_MapEvents:: @ 853E8F4
-	map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents
-
diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc
deleted file mode 100644
index 2e44e5b74..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle8.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-Route110_TrickHousePuzzle8_EventObjects: @ 853E908
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 10, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 17, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069, 0, 0
-
-Route110_TrickHousePuzzle8_MapWarps: @ 853E968
-	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 0, 0, ROUTE_110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle8_MapBGEvents: @ 853E980
-	bg_event 3, 21, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_26E802
-
-Route110_TrickHousePuzzle8_MapEvents:: @ 853E98C
-	map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents
-
diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc
deleted file mode 100644
index bfd09e58e..000000000
--- a/data/maps/events/Route111.inc
+++ /dev/null
@@ -1,114 +0,0 @@
-Route111_EventObjects: @ 85291F0
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 769, 0, 0
-	object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, 770, 0, 0
-	object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 771, 0, 0
-	object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F121B, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 22, 5, 3, 12, 0, 0, 0, 19, BerryTreeScript, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 23, 5, 3, 12, 0, 0, 0, 20, BerryTreeScript, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 91, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1189, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 37, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1204, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_HIKER, 0, 0, 27, 69, 3, 50, 34, 0, 1, 2, Route111_EventScript_1F1260, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1F1232, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 0, 32, 66, 3, 24, 0, 0, 1, 3, Route111_EventScript_1F1249, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796, 0, 0
-	object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796, 0, 0
-	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 101, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 17, 0, 0
-	object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 100, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 18, 0, 0
-	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 104, 3, 1, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008, 0, 0
-	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 80, BerryTreeScript, 0, 0, 0
-	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 19, 5, 3, 12, 0, 0, 0, 81, BerryTreeScript, 0, 0, 0
-	object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CE96, 799, 0, 0
-	object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799, 0, 0
-	object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF16, 903, 0, 0
-	object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF36, 903, 0, 0
-	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009, 0, 0
-	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010, 0, 0
-	object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 22, 21, 3, 1, 0, 0, 0, 0, Route111_EventScript_2906BB, 19, 0, 0
-	object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0, 0, 0
-	object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0, 0, 0
-	object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0, 0, 0
-	object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 11, 3, 7, 4, 0, 1, 4, Route111_EventScript_1F1369, 0, 0, 0
-	object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1307, 0, 0, 0
-	object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 0, 13, 20, 3, 7, 17, 0, 0, 0, Route111_EventScript_2765FF, 960, 0, 0
-	object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 0, 20, 114, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1192, 0, 0, 0
-	object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 0, 26, 132, 3, 9, 17, 0, 1, 5, Route111_EventScript_1F13F9, 0, 0, 0
-	object_event 36, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 20, 132, 3, 10, 17, 0, 1, 5, Route111_EventScript_1F1410, 0, 0, 0
-	object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 0, 19, 121, 3, 7, 17, 0, 1, 2, Route111_EventScript_1F13E2, 0, 0, 0
-	object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 0, 16, 119, 3, 10, 17, 0, 1, 3, Route111_EventScript_1F13CB, 0, 0, 0
-	object_event 39, EVENT_OBJ_GFX_HIKER, 0, 0, 29, 77, 3, 14, 17, 0, 1, 7, Route111_EventScript_1F143E, 0, 0, 0
-	object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 0, 22, 77, 3, 10, 17, 0, 1, 6, Route111_EventScript_1F1427, 0, 0, 0
-	object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 0, 37, 77, 3, 9, 17, 0, 1, 7, Route111_EventScript_1F1455, 0, 0, 0
-	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 118, 3, 1, 17, 0, 0, 0, Route111_EventScript_290DC2, 1142, 0, 0
-	object_event 43, EVENT_OBJ_GFX_HIKER, 0, 0, 14, 56, 3, 16, 17, 0, 0, 0, Route111_EventScript_1F119B, 0, 0, 0
-	object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 0, 20, 53, 3, 8, 17, 0, 0, 0, 0x0, 876, 0, 0
-	object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 0, 19, 53, 3, 8, 17, 0, 0, 0, 0x0, 875, 0, 0
-	object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 19, 101, 3, 7, 17, 0, 0, 0, Route111_EventScript_1F11E4, 843, 0, 0
-
-Route111_MapWarps: @ 8529640
-	warp_def 13, 113, 0, 0, ROUTE_111_WINSTRATE_FAMILYS_HOUSE
-	warp_def 29, 87, 0, 0, DESERT_RUINS
-	warp_def 26, 18, 0, 0, ROUTE_111_OLD_LADYS_REST_STOP
-	warp_def 19, 58, 0, 0, MIRAGE_TOWER_1F
-	warp_def 31, 113, 0, 0, TRAINER_HILL_ENTRANCE
-
-Route111_MapCoordEvents: @ 8529668
-	coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 11, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A
-	coord_event 12, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A
-	coord_event 13, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A
-	coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 12, 44, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16
-	coord_event 13, 43, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16
-	coord_event 14, 42, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16
-	coord_event 16, 40, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16
-	coord_event 14, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A
-	coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 17, 39, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16
-	coord_event 18, 38, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16
-	coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 11, 66, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 12, 67, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 13, 68, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 14, 69, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
-	coord_event 10, 61, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 11, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 13, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 14, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 17, 38, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 16, 39, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 15, 40, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 14, 41, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 13, 42, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 12, 43, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
-	coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
-
-Route111_MapBGEvents: @ 8529888
-	bg_event 16, 114, 0, 0, 0, Route111_EventScript_1F115C
-	bg_event 24, 126, 0, 0, 0, Route111_EventScript_1F1153
-	bg_event 7, 66, 0, 0, 0, Route111_EventScript_1F1165
-	bg_event 13, 6, 0, 0, 0, Route111_EventScript_1F116E
-	bg_event 24, 36, 0, 8, 0, ITEM_FAB_MAIL, 0, 0
-	bg_event 34, 50, 0, 8, 0, ITEM_LUM_BERRY, 0, 0
-	bg_event 33, 34, 0, 8, 0, ITEM_ORANGE_MAIL, 0, 0
-	bg_event 25, 19, 0, 0, 0, Route111_EventScript_1F1177
-	bg_event 35, 1, 0, 8, 0, ITEM_POTION, 0, 0
-	bg_event 35, 31, 0, 8, 0, ITEM_POMEG_BERRY, 0, 0
-	bg_event 26, 70, 0, 7, 0, ITEM_STARDUST, 2, 0
-	bg_event 27, 27, 3, 8, 0, ITEM_REVIVAL_HERB, 0, 0
-	bg_event 7, 84, 3, 0, 0, Route111_EventScript_1F1180
-	bg_event 14, 19, 0, 8, 0, ITEM_PAMTRE_BERRY, 0, 0
-	bg_event 13, 19, 0, 8, 0, ITEM_RABUTA_BERRY, 0, 0
-	bg_event 19, 55, 0, 7, 0, ITEM_PROTEIN, 56, 0
-	bg_event 35, 66, 0, 7, 0, ITEM_RARE_CANDY, 57, 0
-	bg_event 24, 116, 0, 0, 0, Route111_EventScript_1F146C
-
-Route111_MapEvents:: @ 8529960
-	map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents
-
diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc
deleted file mode 100644
index 3cb500bdc..000000000
--- a/data/maps/events/Route111_OldLadysRestStop.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route111_OldLadysRestStop_EventObjects: @ 8533C18
-	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0, 0, 0
-
-Route111_OldLadysRestStop_MapWarps: @ 8533C30
-	warp_def 3, 7, 0, 2, ROUTE_111
-	warp_def 4, 7, 0, 2, ROUTE_111
-
-Route111_OldLadysRestStop_MapEvents:: @ 8533C40
-	map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc
deleted file mode 100644
index bd7567d81..000000000
--- a/data/maps/events/Route111_WinstrateFamilysHouse.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94
-	object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0, 0, 0
-
-Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4
-	warp_def 3, 7, 0, 0, ROUTE_111
-	warp_def 4, 7, 0, 0, ROUTE_111
-
-Route111_WinstrateFamilysHouse_MapEvents:: @ 8533C04
-	map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc
deleted file mode 100644
index e2b26846e..000000000
--- a/data/maps/events/Route112.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-Route112_EventObjects: @ 8529974
-	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 30, 3, 7, 17, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_HIKER, 0, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_HIKER, 0, 0, 8, 50, 3, 26, 48, 0, 0, 0, Route112_EventScript_1F1E61, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011, 0, 0
-	object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 0, 31, 7, 3, 18, 17, 0, 1, 3, Route112_EventScript_1F1F11, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 31, 11, 3, 15, 17, 0, 1, 3, Route112_EventScript_1F1F28, 0, 0, 0
-
-Route112_MapWarps: @ 8529AC4
-	warp_def 28, 27, 0, 0, ROUTE_112_CABLE_CAR_STATION
-	warp_def 29, 27, 0, 1, ROUTE_112_CABLE_CAR_STATION
-	warp_def 6, 46, 3, 0, JAGGED_PASS
-	warp_def 7, 46, 3, 1, JAGGED_PASS
-	warp_def 11, 36, 0, 0, FIERY_PATH
-	warp_def 22, 10, 0, 1, FIERY_PATH
-
-Route112_MapBGEvents: @ 8529AF4
-	bg_event 19, 44, 3, 0, 0, Route112_EventScript_1F1E4F
-	bg_event 22, 37, 0, 0, 0, Route112_EventScript_1F1E46
-	bg_event 4, 49, 0, 0, 0, Route112_EventScript_1F1E58
-
-Route112_MapEvents:: @ 8529B18
-	map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents
-
diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc
deleted file mode 100644
index e33f6cb77..000000000
--- a/data/maps/events/Route112_CableCarStation.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route112_CableCarStation_EventObjects: @ 8533C54
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-Route112_CableCarStation_MapWarps: @ 8533C84
-	warp_def 6, 11, 0, 0, ROUTE_112
-	warp_def 7, 11, 0, 1, ROUTE_112
-
-Route112_CableCarStation_MapEvents:: @ 8533C94
-	map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc
deleted file mode 100644
index 4d5376cce..000000000
--- a/data/maps/events/Route113.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-Route113_EventObjects: @ 8529B2C
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_1F2193, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 36, 10, 3, 3, 16, 0, 0, 0, Route113_EventScript_1F218A, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 79, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013, 0, 0
-	object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F2250, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 71, 2, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 45, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22C9, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 46, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22E4, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 15, 3, 1, 17, 0, 0, 0, Route113_EventScript_290DF6, 1143, 0, 0
-	object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 0, 75, 3, 3, 9, 17, 0, 1, 4, Route113_EventScript_1F2344, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 0, 71, 4, 3, 7, 17, 0, 1, 1, Route113_EventScript_1F232D, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 0, 7, 6, 3, 26, 49, 0, 1, 6, Route113_EventScript_1F22FF, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 13, 3, 25, 49, 0, 1, 6, Route113_EventScript_1F2316, 0, 0, 0
-
-Route113_MapWarps: @ 8529CAC
-	warp_def 33, 5, 0, 0, ROUTE_113_GLASS_WORKSHOP
-	warp_def 41, 12, 0, 0, TERRA_CAVE_ENTRANCE
-	warp_def 88, 5, 0, 0, TERRA_CAVE_ENTRANCE
-
-Route113_MapCoordEvents: @ 8529CC4
-	coord_event 19, 11, 3, 0, 8, 0, 0, 0x0
-	coord_event 19, 10, 3, 0, 8, 0, 0, 0x0
-	coord_event 19, 12, 3, 0, 8, 0, 0, 0x0
-	coord_event 19, 13, 3, 0, 8, 0, 0, 0x0
-	coord_event 86, 9, 3, 0, 8, 0, 0, 0x0
-	coord_event 85, 10, 3, 0, 8, 0, 0, 0x0
-	coord_event 85, 11, 3, 0, 8, 0, 0, 0x0
-	coord_event 14, 10, 3, 0, 2, 0, 0, 0x0
-	coord_event 14, 11, 3, 0, 2, 0, 0, 0x0
-	coord_event 14, 12, 3, 0, 2, 0, 0, 0x0
-	coord_event 14, 13, 3, 0, 2, 0, 0, 0x0
-	coord_event 94, 8, 3, 0, 2, 0, 0, 0x0
-	coord_event 94, 9, 3, 0, 2, 0, 0, 0x0
-	coord_event 94, 10, 3, 0, 2, 0, 0, 0x0
-	coord_event 94, 11, 0, 0, 2, 0, 0, 0x0
-	coord_event 19, 14, 3, 0, 8, 0, 0, 0x0
-	coord_event 87, 8, 3, 0, 8, 0, 0, 0x0
-	coord_event 87, 6, 3, 0, 8, 0, 0, 0x0
-	coord_event 87, 7, 3, 0, 8, 0, 0, 0x0
-
-Route113_MapBGEvents: @ 8529DF4
-	bg_event 85, 6, 0, 0, 0, Route113_EventScript_1F219C
-	bg_event 12, 9, 0, 0, 0, Route113_EventScript_1F21A5
-	bg_event 58, 4, 3, 0, 0, Route113_EventScript_1F21B7
-	bg_event 31, 5, 0, 0, 0, Route113_EventScript_1F21AE
-	bg_event 49, 8, 3, 8, 0, ITEM_GREAT_BALL, 0, 0
-	bg_event 66, 3, 3, 7, 0, ITEM_ETHER, 3, 0
-	bg_event 22, 5, 3, 7, 0, ITEM_TM32, 30, 0
-	bg_event 73, 3, 3, 7, 0, ITEM_NUGGET, 98, 0
-
-Route113_MapEvents:: @ 8529E54
-	map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
-
diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/events/Route113_GlassWorkshop.inc
deleted file mode 100644
index 85d84324c..000000000
--- a/data/maps/events/Route113_GlassWorkshop.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route113_GlassWorkshop_EventObjects: @ 853EA78
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0, 0, 0
-
-Route113_GlassWorkshop_MapWarps: @ 853EAA8
-	warp_def 3, 8, 0, 0, ROUTE_113
-	warp_def 4, 8, 0, 0, ROUTE_113
-
-Route113_GlassWorkshop_MapEvents:: @ 853EAB8
-	map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc
deleted file mode 100644
index 1a7b58289..000000000
--- a/data/maps/events/Route114.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-Route114_EventObjects: @ 8529E68
-	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 43, 3, 12, 0, 0, 0, 77, BerryTreeScript, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 44, 3, 12, 0, 0, 0, 78, BerryTreeScript, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1F2640, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 30, 72, 5, 9, 0, 0, 1, 4, Route114_EventScript_1F2657, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_1F266E, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_1F2685, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_1F269C, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 45, 3, 12, 0, 0, 0, 68, BerryTreeScript, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_290E03, 1014, 0, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_290E10, 1015, 0, 0
-	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 43, 4, 1, 0, 0, 0, 0, Route114_EventScript_2907A6, 17, 0, 0
-	object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F2612, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 0, 27, 42, 3, 3, 16, 0, 0, 0, Route114_EventScript_1F2582, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 25, 6, 3, 8, 0, 0, 1, 0, Route114_EventScript_1F2777, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1F2760, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 53, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 18, 0, 0
-	object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 30, 54, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 19, 0, 0
-	object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 22, 69, 7, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 20, 0, 0
-	object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 64, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 21, 0, 0
-	object_event 22, EVENT_OBJ_GFX_LASS, 0, 0, 24, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F27A9, 0, 0, 0
-	object_event 23, EVENT_OBJ_GFX_LASS, 0, 0, 23, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F278E, 0, 0, 0
-	object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 0, 28, 20, 3, 7, 17, 0, 1, 3, Route114_EventScript_1F27DB, 0, 0, 0
-	object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 0, 26, 72, 5, 18, 17, 0, 1, 4, Route114_EventScript_1F27C4, 0, 0, 0
-	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 19, 3, 1, 17, 0, 0, 0, Route114_EventScript_290E1D, 1160, 0, 0
-	object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 28, 16, 3, 17, 17, 0, 1, 3, Route114_EventScript_1F27F2, 0, 0, 0
-
-Route114_MapWarps: @ 852A0F0
-	warp_def 8, 63, 0, 0, METEOR_FALLS_1F_1R
-	warp_def 29, 5, 0, 0, ROUTE_114_FOSSIL_MANIACS_HOUSE
-	warp_def 27, 36, 0, 0, ROUTE_114_LANETTES_HOUSE
-	warp_def 6, 46, 0, 0, TERRA_CAVE_ENTRANCE
-	warp_def 7, 4, 0, 0, TERRA_CAVE_ENTRANCE
-
-Route114_MapBGEvents: @ 852A118
-	bg_event 7, 64, 0, 0, 0, Route114_EventScript_1F2625
-	bg_event 31, 7, 0, 0, 0, Route114_EventScript_1F262E
-	bg_event 9, 47, 0, 8, 0, ITEM_RED_FLUTE, 0, 0
-	bg_event 30, 51, 0, 8, 0, ITEM_GREEN_SHARD, 0, 0
-	bg_event 11, 62, 0, 8, 0, 61, 0, 0
-	bg_event 19, 70, 0, 8, 0, ITEM_PP_MAX, 0, 0
-	bg_event 11, 27, 0, 8, 0, ITEM_EXP_SHARE, 0, 0
-	bg_event 12, 27, 0, 8, 0, ITEM_DEEP_SEA_TOOTH, 0, 0
-	bg_event 25, 38, 3, 0, 0, Route114_EventScript_1F2637
-	bg_event 20, 57, 3, 7, 0, ITEM_CARBOS, 4, 0
-	bg_event 32, 57, 0, 8, 0, ITEM_GUARD_SPEC, 0, 0
-	bg_event 7, 30, 3, 7, 0, ITEM_REVIVE, 42, 0
-
-Route114_MapEvents:: @ 852A1A8
-	map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents
-
diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc
deleted file mode 100644
index ef9ad911a..000000000
--- a/data/maps/events/Route114_FossilManiacsHouse.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-Route114_FossilManiacsHouse_EventObjects: @ 8533CFC
-	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 3, 2, 3, 8, 17, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0, 0, 0
-
-Route114_FossilManiacsHouse_MapWarps: @ 8533D14
-	warp_def 4, 7, 0, 1, ROUTE_114
-	warp_def 5, 7, 0, 1, ROUTE_114
-	warp_def 4, 1, 0, 0, ROUTE_114_FOSSIL_MANIACS_TUNNEL
-
-Route114_FossilManiacsHouse_MapBGEvents: @ 8533D2C
-	bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD73
-	bg_event 6, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD73
-	bg_event 7, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD7C
-	bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD7C
-
-Route114_FossilManiacsHouse_MapEvents:: @ 8533D5C
-	map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents
-
diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc
deleted file mode 100644
index 5521303f7..000000000
--- a/data/maps/events/Route114_FossilManiacsTunnel.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route114_FossilManiacsTunnel_EventObjects: @ 8533D70
-	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 5, 3, 3, 7, 17, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0, 0, 0
-
-Route114_FossilManiacsTunnel_MapWarps: @ 8533D88
-	warp_def 6, 25, 3, 2, ROUTE_114_FOSSIL_MANIACS_HOUSE
-	warp_def 7, 25, 3, 2, ROUTE_114_FOSSIL_MANIACS_HOUSE
-	warp_def 6, 2, 0, 0, DESERT_UNDERPASS
-
-Route114_FossilManiacsTunnel_MapCoordEvents: @ 8533DA0
-	coord_event 5, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66
-	coord_event 6, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66
-
-Route114_FossilManiacsTunnel_MapEvents:: @ 8533DC0
-	map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc
deleted file mode 100644
index 1182d95f2..000000000
--- a/data/maps/events/Route114_LanettesHouse.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route114_LanettesHouse_EventObjects: @ 8533DD4
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870, 0, 0
-
-Route114_LanettesHouse_MapWarps: @ 8533DEC
-	warp_def 5, 7, 0, 2, ROUTE_114
-	warp_def 6, 7, 0, 2, ROUTE_114
-
-Route114_LanettesHouse_MapBGEvents: @ 8533DFC
-	bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B309
-	bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345
-	bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345
-
-Route114_LanettesHouse_MapEvents:: @ 8533E20
-	map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents
-
diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc
deleted file mode 100644
index 63924166c..000000000
--- a/data/maps/events/Route115.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-Route115_EventObjects: @ 852A1BC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 18, 68, 3, 2, 17, 0, 0, 0, Route115_EventScript_1F2973, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_1F298E, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 27, 53, 3, 15, 17, 0, 1, 4, Route115_EventScript_1F2A07, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 69, BerryTreeScript, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 13, 5, 3, 12, 0, 0, 0, 70, BerryTreeScript, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 71, BerryTreeScript, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 19, 15, 3, 27, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 24, 62, 3, 18, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016, 0, 0
-	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 18, 7, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E37, 1017, 0, 0
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E44, 1018, 0, 0
-	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 64, 3, 12, 0, 0, 0, 55, BerryTreeScript, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 65, 3, 12, 0, 0, 0, 56, BerryTreeScript, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 50, 3, 1, 17, 0, 0, 0, Route115_EventScript_2907A6, 17, 0, 0
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 56, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E51, 1118, 0, 0
-	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 10, 15, 3, 46, 51, 0, 1, 2, Route115_EventScript_1F2AE2, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 11, 12, 3, 57, 17, 0, 1, 3, Route115_EventScript_1F2AF9, 0, 0, 0
-	object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 7, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B27, 0, 0, 0
-	object_event 20, EVENT_OBJ_GFX_LASS, 0, 0, 10, 7, 3, 10, 17, 0, 1, 4, Route115_EventScript_1F2B10, 0, 0, 0
-	object_event 21, EVENT_OBJ_GFX_LASS, 0, 0, 28, 62, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B3E, 0, 0, 0
-	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 67, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E6B, 1161, 0, 0
-	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 14, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E5E, 1144, 0, 0
-
-Route115_MapWarps: @ 852A3E4
-	warp_def 27, 37, 0, 1, METEOR_FALLS_1F_1R
-	warp_def 21, 6, 0, 0, TERRA_CAVE_ENTRANCE
-	warp_def 36, 10, 0, 0, TERRA_CAVE_ENTRANCE
-
-Route115_MapBGEvents: @ 852A3FC
-	bg_event 32, 6, 0, 8, 0, 72, 0, 0
-	bg_event 21, 18, 0, 8, 0, 62, 0, 0
-	bg_event 16, 64, 0, 0, 0, Route115_EventScript_1F297C
-	bg_event 25, 38, 3, 0, 0, Route115_EventScript_1F2985
-	bg_event 8, 30, 0, 8, 0, ITEM_CHERI_BERRY, 0, 0
-	bg_event 32, 39, 0, 8, 0, ITEM_BLACK_FLUTE, 0, 0
-	bg_event 26, 15, 0, 8, 0, 52, 0, 0
-	bg_event 23, 8, 0, 8, 0, ITEM_WHITE_FLUTE, 0, 0
-	bg_event 32, 46, 0, 8, 0, 53, 0, 0
-	bg_event 7, 20, 0, 8, 0, ITEM_STARF_BERRY, 0, 0
-	bg_event 8, 20, 0, 8, 0, ITEM_QUICK_CLAW, 0, 0
-	bg_event 25, 24, 0, 8, 0, ITEM_HP_UP, 0, 0
-	bg_event 20, 53, 0, 8, 0, ITEM_HYPER_POTION, 0, 0
-	bg_event 15, 49, 3, 7, 0, ITEM_HEART_SCALE, 97, 0
-
-Route115_MapEvents:: @ 852A4A4
-	map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents
-
diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc
deleted file mode 100644
index 25bc3891c..000000000
--- a/data/maps/events/Route116.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-Route116_EventObjects: @ 852A4B8
-	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 2, 3, 12, 0, 0, 0, 25, BerryTreeScript, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 19, 2, 3, 12, 0, 0, 0, 26, BerryTreeScript, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 21, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 17, 0, 0
-	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 10, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 18, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E85, 1019, 0, 0
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E92, 1020, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 20, 2, 3, 12, 0, 0, 0, 66, BerryTreeScript, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 21, 2, 3, 12, 0, 0, 0, 67, BerryTreeScript, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891, 0, 0
-	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 28, 11, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 19, 0, 0
-	object_event 13, EVENT_OBJ_GFX_HIKER, 0, 0, 36, 17, 3, 15, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 24, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 20, 0, 0
-	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021, 0, 0
-	object_event 16, EVENT_OBJ_GFX_LASS, 0, 0, 26, 6, 3, 10, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 28, 8, 3, 7, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0, 0, 0
-	object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 0, 46, 11, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2CA2, 947, 0, 0
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 55, 12, 4, 1, 17, 0, 0, 0, Route116_EventScript_290E78, 1001, 0, 0
-	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 38, 9, 3, 10, 17, 0, 0, 0, Route116_EventScript_1F2C70, 894, 0, 0
-	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 0, 74, 13, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2DB6, 813, 0, 0
-	object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 33, 8, 3, 7, 0, 0, 1, 1, Route116_EventScript_1F3041, 0, 0, 0
-	object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 0, 33, 5, 3, 8, 0, 0, 1, 2, Route116_EventScript_1F3058, 0, 0, 0
-	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 34, 7, 0, 1, 17, 0, 0, 0, Route116_EventScript_290EAC, 1146, 0, 0
-	object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 30, 5, 3, 1, 17, 0, 0, 0, Route116_EventScript_2906BB, 21, 0, 0
-	object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 36, 13, 3, 18, 17, 0, 1, 5, Route116_EventScript_1F3086, 0, 0, 0
-	object_event 28, EVENT_OBJ_GFX_HIKER, 0, 0, 42, 13, 3, 9, 17, 0, 1, 5, Route116_EventScript_1F306F, 0, 0, 0
-
-Route116_MapWarps: @ 852A758
-	warp_def 47, 8, 0, 0, RUSTURF_TUNNEL
-	warp_def 38, 8, 0, 0, ROUTE_116_TUNNELERS_REST_HOUSE
-	warp_def 65, 10, 0, 2, RUSTURF_TUNNEL
-	warp_def 59, 13, 0, 0, TERRA_CAVE_ENTRANCE
-	warp_def 79, 6, 0, 0, TERRA_CAVE_ENTRANCE
-
-Route116_MapCoordEvents: @ 852A780
-	coord_event 47, 9, 3, 0, VAR_0x406F, 1, 0, Route116_EventScript_1F2D95
-
-Route116_MapBGEvents: @ 852A790
-	bg_event 5, 10, 0, 0, 0, Route116_EventScript_1F2D57
-	bg_event 48, 9, 0, 0, 0, Route116_EventScript_1F2D60
-	bg_event 40, 9, 0, 0, 0, Route116_EventScript_1F2D69
-	bg_event 71, 4, 0, 8, 0, ITEM_FLUFFY_TAIL, 0, 0
-	bg_event 79, 11, 0, 8, 0, 91, 0, 0
-	bg_event 16, 12, 0, 0, 0, Route116_EventScript_1F2D72
-	bg_event 29, 10, 0, 0, 0, Route116_EventScript_1F2D7B
-	bg_event 56, 6, 0, 8, 0, 102, 0, 0
-	bg_event 55, 15, 0, 8, 0, 112, 0, 0
-	bg_event 22, 9, 3, 7, 0, ITEM_SUPER_POTION, 45, 0
-	bg_event 70, 13, 3, 7, 0, ITEM_BLACK_GLASSES, 96, 0
-
-Route116_MapEvents:: @ 852A814
-	map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents
-
diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc
deleted file mode 100644
index da8f9c1a0..000000000
--- a/data/maps/events/Route116_TunnelersRestHouse.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route116_TunnelersRestHouse_EventObjects: @ 8533E34
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0, 0, 0
-
-Route116_TunnelersRestHouse_MapWarps: @ 8533E7C
-	warp_def 4, 8, 0, 1, ROUTE_116
-	warp_def 5, 8, 0, 1, ROUTE_116
-
-Route116_TunnelersRestHouse_MapEvents:: @ 8533E8C
-	map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc
deleted file mode 100644
index 4478507ae..000000000
--- a/data/maps/events/Route117.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-Route117_EventObjects: @ 852A828
-	object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_1F399A, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 25, 5, 3, 40, 34, 0, 0, 0, Route117_EventScript_1F39A3, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_291C18, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 33, 3, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 42, 2, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 38, 16, 3, 28, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 10, 3, 23, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 0, 33, 11, 3, 16, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 41, 13, 3, 12, 0, 0, 0, 29, BerryTreeScript, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 42, 13, 3, 12, 0, 0, 0, 28, BerryTreeScript, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 43, 13, 3, 12, 0, 0, 0, 27, BerryTreeScript, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022, 0, 0
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 2, 3, 1, 0, 0, 0, 0, Route117_EventScript_2906BB, 17, 0, 0
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023, 0, 0
-	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 26, 13, 3, 33, 34, 0, 1, 5, Route117_EventScript_1F3AF6, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 0, 17, 12, 3, 7, 17, 0, 1, 4, Route117_EventScript_1F3B58, 0, 0, 0
-	object_event 19, EVENT_OBJ_GFX_LASS, 0, 0, 43, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0, 0, 0
-	object_event 20, EVENT_OBJ_GFX_LASS, 0, 0, 42, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0, 0, 0
-	object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 0, 48, 10, 3, 2, 17, 0, 0, 0, Route117_EventScript_1F39AC, 0, 0, 0
-	object_event 22, EVENT_OBJ_GFX_LASS, 0, 0, 15, 4, 3, 10, 17, 0, 1, 4, Route117_EventScript_1F3C4E, 0, 0, 0
-	object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 0, 21, 4, 3, 9, 17, 0, 1, 4, Route117_EventScript_1F3C65, 0, 0, 0
-	object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 16, 4, 3, 28, 20, 0, 1, 4, Route117_EventScript_1F3C37, 0, 0, 0
-
-Route117_MapWarps: @ 852AA68
-	warp_def 51, 5, 0, 0, ROUTE_117_POKEMON_DAY_CARE
-
-Route117_MapBGEvents: @ 852AA70
-	bg_event 16, 6, 0, 0, 0, Route117_EventScript_1F39B5
-	bg_event 49, 12, 0, 0, 0, Route117_EventScript_1F39BE
-	bg_event 49, 5, 0, 0, 0, Route117_EventScript_1F39C7
-	bg_event 3, 18, 3, 7, 0, ITEM_REPEL, 72, 0
-
-Route117_MapEvents:: @ 852AAA0
-	map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents
-
diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc
deleted file mode 100644
index 363c2132f..000000000
--- a/data/maps/events/Route117_PokemonDayCare.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route117_PokemonDayCare_EventObjects: @ 8533EA0
-	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0, 0, 0
-
-Route117_PokemonDayCare_MapWarps: @ 8533EB8
-	warp_def 2, 8, 0, 0, ROUTE_117
-	warp_def 3, 8, 0, 0, ROUTE_117
-
-Route117_PokemonDayCare_MapEvents:: @ 8533EC8
-	map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc
deleted file mode 100644
index 73ba40dd2..000000000
--- a/data/maps/events/Route118.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-Route118_EventObjects: @ 852AAB4
-	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797, 0, 0
-	object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797, 0, 0
-	object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 0, 12, 10, 3, 2, 17, 0, 0, 0, Route118_EventScript_1F3E73, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901, 0, 0
-	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901, 0, 0
-	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904, 0, 0
-	object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904, 0, 0
-	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17, 0, 0
-	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 0, 17, 11, 3, 15, 17, 0, 1, 3, Route118_EventScript_1F4017, 0, 0, 0
-	object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 0, 44, 7, 3, 8, 17, 0, 0, 0, 0x0, 966, 0, 0
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 69, 7, 3, 1, 17, 0, 0, 0, Route118_EventScript_290ED3, 1121, 0, 0
-	object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 7, 7, 3, 8, 17, 0, 1, 4, Route118_EventScript_1F40A7, 0, 0, 0
-
-Route118_MapWarps: @ 852ACAC
-	warp_def 42, 6, 0, 0, TERRA_CAVE_ENTRANCE
-	warp_def 9, 6, 0, 0, TERRA_CAVE_ENTRANCE
-
-Route118_MapCoordEvents: @ 852ACBC
-	coord_event 43, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3E8E
-	coord_event 44, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3EAE
-	coord_event 45, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3EC4
-
-Route118_MapBGEvents: @ 852ACEC
-	bg_event 47, 14, 0, 8, 0, ITEM_MASTER_BALL, 0, 0
-	bg_event 13, 6, 0, 0, 0, Route118_EventScript_1F3E7C
-	bg_event 56, 8, 0, 0, 0, Route118_EventScript_1F3E85
-	bg_event 67, 6, 0, 8, 0, ITEM_LUXURY_BALL, 0, 0
-	bg_event 29, 5, 0, 8, 0, ITEM_HARBOR_MAIL, 0, 0
-	bg_event 47, 5, 0, 8, 0, ITEM_SPELON_BERRY, 0, 0
-	bg_event 46, 5, 0, 8, 0, ITEM_PETAYA_BERRY, 0, 0
-	bg_event 31, 13, 3, 7, 0, ITEM_IRON, 67, 0
-	bg_event 12, 14, 3, 7, 0, ITEM_HEART_SCALE, 66, 0
-
-Route118_MapEvents:: @ 852AD58
-	map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents
-
diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc
deleted file mode 100644
index 96db2d944..000000000
--- a/data/maps/events/Route119.inc
+++ /dev/null
@@ -1,99 +0,0 @@
-Route119_EventObjects: @ 852AD6C
-	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 5, 3, 12, 0, 0, 0, 34, BerryTreeScript, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 25, 5, 3, 12, 0, 0, 0, 35, BerryTreeScript, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 26, 5, 3, 12, 0, 0, 0, 36, BerryTreeScript, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_1F479D, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1F4810, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F4786, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1F4872, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 28, 14, 3, 57, 0, 0, 1, 1, Route119_EventScript_1F4902, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_1F4919, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 0, 8, 63, 3, 8, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, 851, 0, 0
-	object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024, 0, 0
-	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EED, 1025, 0, 0
-	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026, 0, 0
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F07, 1027, 0, 0
-	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F14, 1028, 0, 0
-	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F21, 1029, 0, 0
-	object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890, 0, 0
-	object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890, 0, 0
-	object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, 923, 0, 0
-	object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 0, 31, 109, 3, 8, 17, 0, 0, 0, Route119_EventScript_1F49D1, 0, 0, 0
-	object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 8, 23, 3, 12, 0, 0, 0, 83, BerryTreeScript, 0, 0, 0
-	object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 9, 23, 3, 12, 0, 0, 0, 84, BerryTreeScript, 0, 0, 0
-	object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 29, 90, 3, 12, 0, 0, 0, 85, BerryTreeScript, 0, 0, 0
-	object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 30, 90, 3, 12, 0, 0, 0, 86, BerryTreeScript, 0, 0, 0
-	object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 133, 3, 5, 18, 0, 0, 0, Route119_EventScript_1F476B, 0, 0, 0
-	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 56, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F2E, 1106, 0, 0
-	object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 0, 35, 93, 4, 2, 17, 0, 0, 0, Route119_EventScript_1F49DA, 0, 0, 0
-	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 57, 17, 0, 1, 3, Route119_EventScript_1F4930, 0, 0, 0
-	object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 31, 6, 3, 76, 17, 0, 0, 0, Route119_EventScript_27231C, 989, 0, 0
-	object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 25, 15, 3, 76, 17, 0, 0, 0, Route119_EventScript_272329, 990, 0, 0
-	object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 13, 104, 3, 10, 17, 0, 1, 0, Route119_EventScript_1F4947, 0, 0, 0
-	object_event 38, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 68, 3, 7, 17, 0, 1, 5, Route119_EventScript_1F498C, 0, 0, 0
-	object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 0, 16, 52, 3, 10, 17, 0, 1, 3, Route119_EventScript_1F4975, 0, 0, 0
-	object_event 40, EVENT_OBJ_GFX_MAN_6, 0, 0, 32, 15, 3, 9, 17, 0, 1, 4, Route119_EventScript_1F495E, 0, 0, 0
-	object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 5, 4, 1, 17, 0, 0, 0, Route119_EventScript_291399, 1134, 0, 0
-	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 24, 42, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F3B, 1147, 0, 0
-	object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786, 0, 0
-
-Route119_MapWarps: @ 852B174
-	warp_def 6, 32, 0, 0, ROUTE_119_WEATHER_INSTITUTE_1F
-	warp_def 33, 109, 0, 0, ROUTE_119_HOUSE
-
-Route119_MapCoordEvents: @ 852B184
-	coord_event 25, 31, 0, 0, VAR_0x4072, 0, 0, Route119_EventScript_1F4472
-	coord_event 26, 31, 0, 0, VAR_0x4072, 0, 0, Route119_EventScript_1F447D
-	coord_event 29, 13, 3, 0, 20, 0, 0, 0x0
-	coord_event 30, 13, 3, 0, 20, 0, 0, 0x0
-	coord_event 31, 13, 3, 0, 20, 0, 0, 0x0
-	coord_event 32, 13, 3, 0, 20, 0, 0, 0x0
-	coord_event 15, 133, 3, 0, 20, 0, 0, 0x0
-	coord_event 16, 132, 3, 0, 20, 0, 0, 0x0
-	coord_event 17, 131, 3, 0, 20, 0, 0, 0x0
-	coord_event 18, 130, 3, 0, 20, 0, 0, 0x0
-	coord_event 19, 131, 3, 0, 20, 0, 0, 0x0
-	coord_event 20, 132, 3, 0, 20, 0, 0, 0x0
-	coord_event 21, 133, 3, 0, 20, 0, 0, 0x0
-	coord_event 36, 6, 3, 0, 2, 0, 0, 0x0
-	coord_event 36, 7, 3, 0, 2, 0, 0, 0x0
-	coord_event 35, 8, 3, 0, 2, 0, 0, 0x0
-	coord_event 35, 9, 3, 0, 2, 0, 0, 0x0
-	coord_event 16, 137, 3, 0, 2, 0, 0, 0x0
-	coord_event 17, 137, 3, 0, 2, 0, 0, 0x0
-	coord_event 18, 137, 3, 0, 2, 0, 0, 0x0
-	coord_event 19, 137, 3, 0, 2, 0, 0, 0x0
-	coord_event 20, 137, 3, 0, 2, 0, 0, 0x0
-	coord_event 34, 13, 3, 0, 20, 0, 0, 0x0
-
-Route119_MapBGEvents: @ 852B2F4
-	bg_event 9, 33, 0, 0, 0, Route119_EventScript_1F477D
-	bg_event 27, 19, 0, 0, 0, Route119_EventScript_1F4774
-	bg_event 5, 2, 0, 8, 0, ITEM_DRAGON_SCALE, 0, 0
-	bg_event 4, 89, 0, 8, 0, ITEM_LIGHT_BALL, 0, 0
-	bg_event 5, 15, 0, 8, 0, ITEM_POISON_BARB, 0, 0
-	bg_event 7, 101, 3, 8, 0, ITEM_NEVER_MELT_ICE, 0, 0
-	bg_event 34, 24, 3, 8, 0, ITEM_LAX_INCENSE, 0, 0
-	bg_event 31, 73, 3, 8, 0, 231, 0, 0
-	bg_event 16, 81, 0, 8, 0, ITEM_TINY_MUSHROOM, 0, 0
-	bg_event 16, 28, 0, 8, 0, 113, 0, 0
-	bg_event 17, 82, 3, 7, 0, ITEM_CALCIUM, 5, 0
-	bg_event 38, 63, 3, 7, 0, ITEM_ULTRA_BALL, 6, 0
-	bg_event 26, 81, 0, 8, 0, ITEM_FULL_HEAL, 0, 0
-	bg_event 19, 76, 0, 8, 0, ITEM_LANSAT_BERRY, 0, 0
-	bg_event 18, 76, 0, 8, 0, ITEM_DEEP_SEA_SCALE, 0, 0
-	bg_event 4, 15, 0, 8, 0, ITEM_METAL_POWDER, 0, 0
-	bg_event 6, 2, 0, 8, 0, 233, 0, 0
-	bg_event 26, 120, 3, 7, 0, ITEM_FULL_HEAL, 68, 0
-	bg_event 20, 29, 3, 7, 0, ITEM_MAX_ETHER, 87, 0
-	bg_event 28, 9, 0, 0, 0, Route119_EventScript_1F49E3
-
-Route119_MapEvents:: @ 852B3E4
-	map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents
-
diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc
deleted file mode 100644
index 38c35b40a..000000000
--- a/data/maps/events/Route119_House.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route119_House_EventObjects: @ 853ECD0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 0, 1, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 0, 4, 3, 2, 19, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 0, 2, 2, 3, 2, 17, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 0, 8, 5, 3, 2, 35, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 0, 6, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 5, 3, 3, 2, 49, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-
-Route119_House_MapWarps: @ 853ED78
-	warp_def 3, 8, 0, 1, ROUTE_119
-	warp_def 4, 8, 0, 1, ROUTE_119
-
-Route119_House_MapEvents:: @ 853ED88
-	map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc
deleted file mode 100644
index 6fa459ac6..000000000
--- a/data/maps/events/Route119_WeatherInstitute_1F.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-Route119_WeatherInstitute_1F_EventObjects: @ 853EB20
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890, 0, 0
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892, 0, 0
-	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 14, 11, 3, 2, 17, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0, 0, 0
-
-Route119_WeatherInstitute_1F_MapWarps: @ 853EB98
-	warp_def 9, 12, 0, 0, ROUTE_119
-	warp_def 10, 12, 0, 0, ROUTE_119
-	warp_def 17, 1, 0, 0, ROUTE_119_WEATHER_INSTITUTE_2F
-
-Route119_WeatherInstitute_1F_MapBGEvents: @ 853EBB0
-	bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18
-	bg_event 1, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18
-	bg_event 0, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18
-	bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18
-
-Route119_WeatherInstitute_1F_MapEvents:: @ 853EBE0
-	map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents
-
diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc
deleted file mode 100644
index 0f838709c..000000000
--- a/data/maps/events/Route119_WeatherInstitute_2F.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890, 0, 0
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890, 0, 0
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 6, 3, 1, 18, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0
-	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 16, 6, 3, 9, 17, 0, 0, 0, 0x0, 992, 0, 0
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 19, 6, 3, 9, 17, 0, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890, 0, 0
-
-Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4
-	warp_def 17, 1, 0, 2, ROUTE_119_WEATHER_INSTITUTE_1F
-
-Route119_WeatherInstitute_2F_MapEvents:: @ 853ECBC
-	map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc
deleted file mode 100644
index 6f227115c..000000000
--- a/data/maps/events/Route120.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-Route120_EventObjects: @ 852B3F8
-	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030, 0, 0
-	object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798, 0, 0
-	object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798, 0, 0
-	object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902, 0, 0
-	object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902, 0, 0
-	object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17, 0, 0
-	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031, 0, 0
-	object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0, 0, 0
-	object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0, 0, 0
-	object_event 25, EVENT_OBJ_GFX_HIKER, 0, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0, 0, 0
-	object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0, 0, 0
-	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0, 0, 0
-	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 22, 13, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F6F, 1108, 0, 0
-	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 82, 5, 1, 17, 0, 0, 0, Route120_EventScript_290F62, 1107, 0, 0
-	object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 12, 16, 4, 76, 17, 0, 0, 0, Route120_EventScript_1F57BC, 970, 0, 0
-	object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 0, 13, 15, 4, 8, 17, 0, 0, 0, Route120_EventScript_1F5641, 972, 0, 0
-	object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 20, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 20, 0, 0
-	object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 18, 0, 0
-	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 10, 72, 3, 58, 17, 0, 1, 3, Route120_EventScript_1F593C, 0, 0, 0
-	object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 28, 3, 57, 17, 0, 1, 3, Route120_EventScript_1F5953, 0, 0, 0
-	object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 0, 12, 16, 3, 8, 17, 0, 0, 0, 0x0, 981, 0, 0
-	object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 20, 11, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722DB, 982, 0, 0
-	object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 27, 2, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722E8, 985, 0, 0
-	object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 4, 77, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722F5, 986, 0, 0
-	object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 7, 51, 3, 76, 17, 0, 0, 0, Route120_EventScript_27230F, 988, 0, 0
-	object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 19, 48, 3, 76, 17, 0, 0, 0, Route120_EventScript_272302, 987, 0, 0
-	object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 0, 19, 32, 3, 7, 17, 0, 1, 3, Route120_EventScript_1F5981, 0, 0, 0
-	object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 34, 3, 10, 17, 0, 1, 3, Route120_EventScript_1F596A, 0, 0, 0
-	object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 24, 33, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F7C, 1148, 0, 0
-
-Route120_MapWarps: @ 852B818
-	warp_def 7, 55, 0, 0, ANCIENT_TOMB
-	warp_def 19, 23, 1, 0, SCORCHED_SLAB
-
-Route120_MapCoordEvents: @ 852B828
-	coord_event 7, 15, 0, 0, 3, 0, 0, 0x0
-	coord_event 7, 16, 0, 0, 3, 0, 0, 0x0
-	coord_event 22, 61, 3, 0, 3, 0, 0, 0x0
-	coord_event 12, 64, 3, 0, 3, 0, 0, 0x0
-	coord_event 35, 63, 3, 0, 1, 0, 0, 0x0
-	coord_event 36, 63, 3, 0, 1, 0, 0, 0x0
-	coord_event 37, 63, 3, 0, 1, 0, 0, 0x0
-	coord_event 38, 63, 3, 0, 1, 0, 0, 0x0
-	coord_event 32, 88, 5, 0, 1, 0, 0, 0x0
-	coord_event 28, 15, 0, 0, 2, 0, 0, 0x0
-	coord_event 28, 16, 0, 0, 2, 0, 0, 0x0
-	coord_event 28, 17, 3, 0, 2, 0, 0, 0x0
-	coord_event 32, 89, 5, 0, 1, 0, 0, 0x0
-	coord_event 32, 90, 5, 0, 1, 0, 0, 0x0
-	coord_event 32, 91, 5, 0, 1, 0, 0, 0x0
-	coord_event 10, 75, 3, 0, 1, 0, 0, 0x0
-	coord_event 11, 75, 3, 0, 1, 0, 0, 0x0
-	coord_event 12, 75, 3, 0, 1, 0, 0, 0x0
-	coord_event 13, 75, 3, 0, 1, 0, 0, 0x0
-
-Route120_MapBGEvents: @ 852B958
-	bg_event 27, 3, 3, 0, 0, Route120_EventScript_1F57C5
-	bg_event 38, 88, 3, 0, 0, Route120_EventScript_1F57CE
-	bg_event 28, 62, 0, 8, 0, 101, 0, 0
-	bg_event 30, 62, 0, 8, 0, ITEM_HEART_SCALE, 0, 0
-	bg_event 26, 10, 0, 8, 0, ITEM_LUCKY_PUNCH, 0, 0
-	bg_event 29, 85, 5, 8, 0, 232, 0, 0
-	bg_event 18, 12, 0, 8, 0, ITEM_SUN_STONE, 0, 0
-	bg_event 38, 54, 0, 8, 0, ITEM_SOFT_SAND, 0, 0
-	bg_event 31, 23, 0, 8, 0, ITEM_SPELL_TAG, 0, 0
-	bg_event 9, 1, 3, 7, 0, ITEM_RARE_CANDY, 71, 0
-	bg_event 31, 11, 3, 7, 0, ITEM_REVIVE, 84, 0
-	bg_event 0, 86, 3, 7, 0, ITEM_RARE_CANDY, 69, 0
-	bg_event 24, 42, 3, 7, 0, ITEM_ZINC, 70, 0
-	bg_event 5, 76, 0, 8, 0, ITEM_HARD_STONE, 0, 0
-
-Route120_MapEvents:: @ 852BA00
-	map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents
-
diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc
deleted file mode 100644
index ec6ced043..000000000
--- a/data/maps/events/Route121.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-Route121_EventObjects: @ 852BA14
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 29, 14, 3, 10, 17, 0, 0, 0, Route121_EventScript_1F5DFD, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_LASS, 0, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_LASS, 0, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914, 0, 0
-	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914, 0, 0
-	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914, 0, 0
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17, 0, 0
-	object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18, 0, 0
-	object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0, 0, 0
-	object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0, 0, 0
-	object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0, 0, 0
-	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 55, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F89, 1103, 0, 0
-	object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 26, 12, 3, 1, 17, 0, 0, 0, Route121_EventScript_2906BB, 19, 0, 0
-	object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 0, 11, 6, 3, 26, 65, 0, 1, 3, Route121_EventScript_1F5F9C, 0, 0, 0
-	object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 0, 59, 8, 3, 8, 17, 0, 1, 4, Route121_EventScript_1F5FB3, 0, 0, 0
-	object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 59, 13, 3, 7, 17, 0, 1, 4, Route121_EventScript_1F5FCA, 0, 0, 0
-	object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 0, 65, 9, 3, 18, 17, 0, 1, 6, Route121_EventScript_1F5FE1, 0, 0, 0
-	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 72, 9, 3, 17, 17, 0, 1, 6, Route121_EventScript_1F5FF8, 0, 0, 0
-	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 60, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F96, 1149, 0, 0
-	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 38, 13, 3, 1, 17, 0, 0, 0, Route121_EventScript_290FA3, 1150, 0, 0
-
-Route121_MapWarps: @ 852BCCC
-	warp_def 37, 5, 0, 2, ROUTE_121_SAFARI_ZONE_ENTRANCE
-
-Route121_MapCoordEvents: @ 852BCD4
-	coord_event 25, 5, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
-	coord_event 25, 6, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
-	coord_event 25, 7, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
-	coord_event 25, 8, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
-
-Route121_MapBGEvents: @ 852BD14
-	bg_event 32, 14, 0, 0, 0, Route121_EventScript_1F5E06
-	bg_event 40, 11, 0, 8, 0, ITEM_PREMIER_BALL, 0, 0
-	bg_event 18, 13, 0, 8, 0, ITEM_SUPER_POTION, 0, 0
-	bg_event 43, 7, 0, 8, 0, ITEM_NOMEL_BERRY, 0, 0
-	bg_event 42, 7, 0, 8, 0, ITEM_APICOT_BERRY, 0, 0
-	bg_event 39, 6, 0, 0, 0, Route121_EventScript_1F5E0F
-	bg_event 23, 10, 3, 7, 0, ITEM_HP_UP, 39, 0
-	bg_event 58, 3, 3, 7, 0, ITEM_NUGGET, 40, 0
-	bg_event 72, 5, 3, 7, 0, ITEM_FULL_HEAL, 73, 0
-	bg_event 68, 8, 3, 7, 0, ITEM_MAX_REVIVE, 100, 0
-
-Route121_MapEvents:: @ 852BD8C
-	map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents
-
diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc
deleted file mode 100644
index 39bb6123c..000000000
--- a/data/maps/events/Route121_SafariZoneEntrance.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route121_SafariZoneEntrance_EventObjects: @ 8533EDC
-	object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-Route121_SafariZoneEntrance_MapWarps: @ 8533F24
-	warp_def 2, 5, 0, 0, SAFARI_ZONE_SOUTH
-	warp_def 3, 5, 0, 0, SAFARI_ZONE_SOUTH
-	warp_def 14, 13, 0, 0, ROUTE_121
-	warp_def 15, 13, 0, 0, ROUTE_121
-
-Route121_SafariZoneEntrance_MapCoordEvents: @ 8533F44
-	coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_22BC18
-
-Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54
-	bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BD21
-
-Route121_SafariZoneEntrance_MapEvents:: @ 8533F60
-	map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents
-
diff --git a/data/maps/events/Route122.inc b/data/maps/events/Route122.inc
deleted file mode 100644
index 10330d8e3..000000000
--- a/data/maps/events/Route122.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-Route122_MapWarps: @ 852BDA0
-	warp_def 22, 29, 0, 0, MT_PYRE_1F
-
-Route122_MapEvents:: @ 852BDA8
-	map_events 0x0, Route122_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc
deleted file mode 100644
index 0521a0592..000000000
--- a/data/maps/events/Route123.inc
+++ /dev/null
@@ -1,88 +0,0 @@
-Route123_EventObjects: @ 852BDBC
-	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17, 0, 0
-	object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18, 0, 0
-	object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19, 0, 0
-	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032, 0, 0
-	object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0, 0, 0
-	object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0, 0, 0
-	object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0, 0, 0
-	object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0, 0, 0
-	object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0, 0, 0
-	object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0, 0, 0
-	object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0, 0, 0
-	object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0, 0, 0
-	object_event 30, EVENT_OBJ_GFX_LASS, 0, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0, 0, 0
-	object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0, 0, 0
-	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 18, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FBD, 1104, 0, 0
-	object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 75, 9, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FCA, 1109, 0, 0
-	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 138, 14, 3, 57, 17, 0, 1, 1, Route123_EventScript_1F6377, 0, 0, 0
-	object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 138, 16, 3, 7, 17, 0, 1, 1, Route123_EventScript_1F6360, 0, 0, 0
-	object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 0, 87, 17, 3, 7, 17, 0, 1, 4, Route123_EventScript_1F6349, 0, 0, 0
-	object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 0, 66, 16, 3, 8, 17, 0, 1, 2, Route123_EventScript_1F63BC, 0, 0, 0
-	object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 0, 66, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F6332, 0, 0, 0
-	object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 49, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F631B, 0, 0, 0
-	object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 43, 15, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FD7, 1152, 0, 0
-	object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 14, 16, 3, 7, 17, 0, 1, 3, Route123_EventScript_1F638E, 0, 0, 0
-	object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 12, 3, 26, 49, 0, 1, 3, Route123_EventScript_1F63A5, 0, 0, 0
-	object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 57, 16, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FE4, 1153, 0, 0
-
-Route123_MapWarps: @ 852C1C4
-	warp_def 22, 6, 0, 0, ROUTE_123_BERRY_MASTERS_HOUSE
-
-Route123_MapCoordEvents: @ 852C1CC
-	coord_event 90, 16, 3, 0, 21, 0, 0, 0x0
-	coord_event 92, 9, 3, 0, 21, 0, 0, 0x0
-	coord_event 93, 12, 3, 0, 21, 0, 0, 0x0
-	coord_event 92, 13, 3, 0, 21, 0, 0, 0x0
-	coord_event 91, 14, 3, 0, 21, 0, 0, 0x0
-	coord_event 19, 13, 3, 0, 21, 0, 0, 0x0
-	coord_event 19, 12, 3, 0, 21, 0, 0, 0x0
-	coord_event 34, 13, 3, 0, 21, 0, 0, 0x0
-	coord_event 19, 14, 3, 0, 21, 0, 0, 0x0
-	coord_event 19, 15, 3, 0, 21, 0, 0, 0x0
-	coord_event 19, 16, 3, 0, 21, 0, 0, 0x0
-	coord_event 108, 14, 3, 0, 2, 0, 0, 0x0
-	coord_event 109, 15, 3, 0, 2, 0, 0, 0x0
-	coord_event 110, 16, 3, 0, 2, 0, 0, 0x0
-	coord_event 111, 17, 3, 0, 2, 0, 0, 0x0
-	coord_event 112, 18, 3, 0, 2, 0, 0, 0x0
-	coord_event 9, 12, 3, 0, 2, 0, 0, 0x0
-	coord_event 9, 13, 3, 0, 2, 0, 0, 0x0
-	coord_event 9, 14, 3, 0, 2, 0, 0, 0x0
-	coord_event 9, 15, 3, 0, 2, 0, 0, 0x0
-	coord_event 9, 16, 3, 0, 2, 0, 0, 0x0
-	coord_event 94, 10, 3, 0, 21, 0, 0, 0x0
-
-Route123_MapBGEvents: @ 852C32C
-	bg_event 117, 10, 0, 0, 0, Route123_EventScript_1F61B3
-	bg_event 47, 3, 0, 8, 0, 82, 0, 0
-	bg_event 49, 3, 0, 8, 0, 92, 0, 0
-	bg_event 10, 12, 3, 0, 0, Route123_EventScript_1F61AA
-	bg_event 75, 1, 3, 7, 0, ITEM_SUPER_REPEL, 7, 0
-	bg_event 20, 7, 3, 0, 0, Route123_EventScript_1F61BC
-	bg_event 57, 5, 0, 8, 0, ITEM_SUPER_REPEL, 0, 0
-	bg_event 12, 1, 3, 7, 0, ITEM_REVIVE, 41, 0
-	bg_event 91, 15, 3, 7, 0, ITEM_HYPER_POTION, 74, 0
-	bg_event 139, 15, 3, 7, 0, ITEM_PP_UP, 99, 0
-	bg_event 138, 18, 3, 7, 0, ITEM_RARE_CANDY, 110, 0
-
-Route123_MapEvents:: @ 852C3B0
-	map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents
-
diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/events/Route123_BerryMastersHouse.inc
deleted file mode 100644
index 719dc55c7..000000000
--- a/data/maps/events/Route123_BerryMastersHouse.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route123_BerryMastersHouse_EventObjects: @ 853EACC
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0, 0, 0
-
-Route123_BerryMastersHouse_MapWarps: @ 853EAFC
-	warp_def 3, 7, 0, 0, ROUTE_123
-	warp_def 4, 7, 0, 0, ROUTE_123
-
-Route123_BerryMastersHouse_MapEvents:: @ 853EB0C
-	map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc
deleted file mode 100644
index 8cd919a63..000000000
--- a/data/maps/events/Route124.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-Route124_EventObjects: @ 852C3C4
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 61, 74, 1, 67, 53, 0, 1, 7, Route124_EventScript_1F659C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 7, 23, 1, 18, 134, 0, 1, 5, Route124_EventScript_1F6615, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 28, 12, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FF1, 1092, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 53, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FFE, 1093, 0, 0
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 58, 11, 3, 1, 17, 0, 0, 0, Route124_EventScript_29100B, 1066, 0, 0
-	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 18, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F6643, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 17, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F66A7, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 29, 1, 7, 17, 0, 1, 5, Route124_EventScript_1F670B, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 69, 74, 1, 66, 17, 0, 1, 7, Route124_EventScript_1F6722, 0, 0, 0
-
-Route124_MapWarps: @ 852C4E4
-	warp_def 70, 48, 3, 0, ROUTE_124_DIVING_TREASURE_HUNTERS_HOUSE
-
-Route124_MapBGEvents: @ 852C4EC
-	bg_event 73, 48, 3, 0, 0, Route124_EventScript_1F657C
-
-Route124_MapEvents:: @ 852C4F8
-	map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents
-
diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
deleted file mode 100644
index 1916f36b7..000000000
--- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C
-	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0, 0, 0
-
-Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4
-	warp_def 3, 8, 0, 0, ROUTE_124
-	warp_def 4, 8, 0, 0, ROUTE_124
-
-Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4
-	bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270F63
-
-Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0
-	map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents
diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc
deleted file mode 100644
index 30fa1f18f..000000000
--- a/data/maps/events/Route125.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-Route125_EventObjects: @ 852C50C
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 45, 9, 1, 10, 82, 0, 1, 2, Route125_EventScript_1F67BB, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 30, 28, 1, 52, 153, 0, 1, 3, Route125_EventScript_1F67E9, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_LASS, 0, 0, 17, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F6862, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 18, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F687D, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 43, 19, 3, 28, 18, 0, 1, 3, Route125_EventScript_1F6898, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 48, 19, 3, 27, 18, 0, 1, 3, Route125_EventScript_1F68AF, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 46, 17, 3, 1, 17, 0, 0, 0, Route125_EventScript_291018, 1154, 0, 0
-
-Route125_MapWarps: @ 852C5FC
-	warp_def 22, 19, 0, 0, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
-
-Route125_MapBGEvents: @ 852C604
-	bg_event 53, 10, 0, 8, 0, ITEM_ULTRA_BALL, 0, 0
-	bg_event 55, 11, 0, 8, 0, ITEM_HEAL_POWDER, 0, 0
-	bg_event 7, 25, 0, 8, 0, ITEM_RETRO_MAIL, 0, 0
-	bg_event 24, 32, 0, 8, 0, ITEM_PINAP_BERRY, 0, 0
-
-Route125_MapEvents:: @ 852C634
-	map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents
-
diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc
deleted file mode 100644
index f6d4a71a5..000000000
--- a/data/maps/events/Route126.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-Route126_EventObjects: @ 852C648
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 51, 65, 1, 51, 58, 0, 1, 3, Route126_EventScript_1F68D6, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 56, 22, 1, 28, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 63, 43, 1, 24, 0, 0, 1, 3, Route126_EventScript_1F6904, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 9, 48, 1, 7, 0, 0, 1, 3, Route126_EventScript_1F691B, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 1, 3, 1, 17, 0, 0, 0, Route126_EventScript_291025, 1105, 0, 0
-	object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 15, 66, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6960, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 66, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6977, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 64, 5, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6949, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 56, 5, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6932, 0, 0, 0
-
-Route126_MapEvents:: @ 852C720
-	map_events Route126_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc
deleted file mode 100644
index b72a1d629..000000000
--- a/data/maps/events/Route127.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-Route127_EventObjects: @ 852C734
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035, 0, 0
-	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 42, 21, 3, 9, 17, 0, 1, 0, Route127_EventScript_1F6A63, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 64, 19, 3, 10, 17, 0, 1, 0, Route127_EventScript_1F6A91, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 54, 14, 3, 7, 17, 0, 1, 0, Route127_EventScript_1F6A7A, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 15, 23, 3, 9, 17, 0, 1, 2, Route127_EventScript_1F6AA8, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 63, 63, 3, 1, 17, 0, 1, 3, Route127_EventScript_1F6AD6, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 12, 23, 3, 10, 17, 0, 1, 2, Route127_EventScript_1F6ABF, 0, 0, 0
-	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 20, 3, 1, 0, 0, 0, 0, Route127_EventScript_29104C, 1155, 0, 0
-
-Route127_MapBGEvents: @ 852C83C
-	bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0
-	bg_event 59, 72, 0, 8, 0, ITEM_SITRUS_BERRY, 0, 0
-	bg_event 67, 63, 0, 8, 0, ITEM_WEPEAR_BERRY, 0, 0
-	bg_event 61, 21, 0, 8, 0, ITEM_FIGY_BERRY, 0, 0
-	bg_event 45, 24, 0, 8, 0, ITEM_GLITTER_MAIL, 0, 0
-
-Route127_MapEvents:: @ 852C878
-	map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents
-
diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc
deleted file mode 100644
index e9efddf20..000000000
--- a/data/maps/events/Route128.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route128_EventObjects: @ 852C88C
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 35, 33, 1, 48, 85, 0, 1, 3, Route128_EventScript_1F6CBE, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 0, 37, 22, 3, 9, 17, 0, 0, 0, 0x0, 944, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 0, 38, 21, 3, 7, 17, 0, 0, 0, 0x0, 945, 0, 0
-	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 63, 28, 3, 7, 17, 0, 1, 0, Route128_EventScript_1F6DB0, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 47, 9, 3, 10, 17, 0, 1, 3, Route128_EventScript_1F6D99, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 24, 8, 3, 17, 17, 0, 1, 3, Route128_EventScript_1F6D82, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 101, 29, 1, 25, 49, 0, 1, 4, Route128_EventScript_1F6DDE, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 101, 22, 1, 26, 49, 0, 1, 4, Route128_EventScript_1F6DC7, 0, 0, 0
-
-Route128_MapBGEvents: @ 852C97C
-	bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0
-	bg_event 57, 21, 3, 7, 0, ITEM_HEART_SCALE, 93, 0
-	bg_event 31, 33, 3, 7, 0, ITEM_HEART_SCALE, 94, 0
-
-Route128_MapEvents:: @ 852C9A0
-	map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents
-
diff --git a/data/maps/events/Route129.inc b/data/maps/events/Route129.inc
deleted file mode 100644
index 297b9eeb2..000000000
--- a/data/maps/events/Route129.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route129_EventObjects: @ 852C9B4
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 28, 16, 1, 50, 67, 0, 1, 3, Route129_EventScript_1F72EC, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 14, 1, 52, 37, 0, 1, 2, Route129_EventScript_1F7303, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 13, 22, 1, 64, 17, 0, 1, 5, Route129_EventScript_1F7331, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 35, 9, 1, 24, 17, 0, 1, 2, Route129_EventScript_1F731A, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 13, 27, 1, 65, 17, 0, 1, 5, Route129_EventScript_1F7348, 0, 0, 0
-
-Route129_MapEvents:: @ 852CA2C
-	map_events Route129_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc
deleted file mode 100644
index 470fa9880..000000000
--- a/data/maps/events/Route130.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route130_EventObjects: @ 852CA40
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 70, 21, 1, 51, 99, 0, 1, 3, Route130_EventScript_1F73BF, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 7, 21, 1, 26, 65, 0, 1, 5, Route130_EventScript_1F73D6, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 30, 1, 25, 65, 0, 1, 5, Route130_EventScript_1F73ED, 0, 0, 0
-
-Route130_MapEvents:: @ 852CAA0
-	map_events Route130_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc
deleted file mode 100644
index b66f47867..000000000
--- a/data/maps/events/Route131.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route131_EventObjects: @ 852CAB4
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 41, 32, 1, 29, 117, 0, 1, 3, Route131_EventScript_1F7429, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 18, 19, 1, 22, 112, 0, 1, 4, Route131_EventScript_1F7440, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 22, 1, 20, 6, 0, 1, 4, Route131_EventScript_1F7457, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 31, 25, 1, 47, 83, 0, 1, 3, Route131_EventScript_1F746E, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 9, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F7485, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 8, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F74A0, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 52, 20, 1, 26, 49, 0, 1, 5, Route131_EventScript_1F74D2, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 52, 27, 1, 25, 49, 0, 1, 5, Route131_EventScript_1F74BB, 0, 0, 0
-
-Route131_MapWarps: @ 852CB74
-	warp_def 36, 6, 3, 0, SKY_PILLAR_ENTRANCE
-
-Route131_MapEvents:: @ 852CB7C
-	map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route132.inc b/data/maps/events/Route132.inc
deleted file mode 100644
index 825c6fc65..000000000
--- a/data/maps/events/Route132.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route132_EventObjects: @ 852CB90
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 40, 13, 1, 46, 51, 0, 1, 2, Route132_EventScript_1F74EA, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 6, 1, 45, 51, 0, 1, 2, Route132_EventScript_1F7501, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 33, 26, 3, 8, 17, 0, 1, 4, Route132_EventScript_1F7546, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 33, 31, 3, 25, 65, 0, 1, 4, Route132_EventScript_1F755D, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 21, 30, 3, 7, 17, 0, 1, 4, Route132_EventScript_1F758B, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 21, 25, 3, 26, 65, 0, 1, 4, Route132_EventScript_1F7574, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 27, 3, 1, 17, 0, 0, 0, Route132_EventScript_291066, 1156, 0, 0
-
-Route132_MapEvents:: @ 852CC80
-	map_events Route132_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc
deleted file mode 100644
index 6249ca026..000000000
--- a/data/maps/events/Route133.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route133_EventObjects: @ 852CC94
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 68, 27, 1, 25, 32, 0, 1, 3, Route133_EventScript_1F75A3, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 68, 28, 1, 26, 32, 0, 1, 3, Route133_EventScript_1F75BA, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 14, 3, 18, 17, 0, 1, 2, Route133_EventScript_1F75FF, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 56, 11, 3, 8, 17, 0, 1, 3, Route133_EventScript_1F7616, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 56, 15, 3, 16, 17, 0, 1, 3, Route133_EventScript_1F762D, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 48, 28, 3, 1, 17, 0, 0, 0, Route133_EventScript_29108D, 1157, 0, 0
-
-Route133_MapEvents:: @ 852CD84
-	map_events Route133_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/Route134.inc b/data/maps/events/Route134.inc
deleted file mode 100644
index 6beb27ba5..000000000
--- a/data/maps/events/Route134.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route134_EventObjects: @ 852CD98
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 49, 9, 1, 49, 83, 0, 1, 2, Route134_EventScript_1F7653, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 24, 23, 3, 26, 48, 0, 1, 6, Route134_EventScript_1F7681, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 43, 23, 1, 9, 17, 0, 1, 2, Route134_EventScript_1F76F4, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 0, 24, 30, 3, 25, 48, 0, 1, 6, Route134_EventScript_1F770B, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 0, 63, 14, 3, 18, 17, 0, 1, 3, Route134_EventScript_1F76C6, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 50, 17, 3, 1, 17, 0, 0, 0, Route134_EventScript_29109A, 1158, 0, 0
-	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 22, 27, 3, 1, 17, 0, 0, 0, Route134_EventScript_2910A7, 1159, 0, 0
-
-Route134_MapEvents:: @ 852CEA0
-	map_events Route134_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc
deleted file mode 100644
index 3efb9fac7..000000000
--- a/data/maps/events/RustboroCity.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-RustboroCity_EventObjects: @ 85267E0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 22, 34, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E088A, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 19, 13, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E085F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 21, 46, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E08D1, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 0, 26, 23, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0893, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 30, 10, 3, 10, 17, 0, 0, 0, RustboroCity_EventScript_1E0ADD, 732, 0, 0
-	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, 731, 0, 0
-	object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 0, 13, 34, 3, 2, 17, 0, 0, 0, RustboroCity_EventScript_1E087E, 0, 0, 0
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041, 0, 0
-	object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 0, 19, 27, 3, 8, 16, 0, 0, 0, RustboroCity_EventScript_1E094E, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 0, 16, 50, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0DB8, 814, 0, 0
-	object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 11, 15, 0, 1, 17, 0, 0, 0, 0x0, 844, 0, 0
-	object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 0, 31, 36, 3, 1, 16, 0, 0, 0, RustboroCity_EventScript_1E1236, 0, 0, 0
-
-RustboroCity_MapWarps: @ 8526960
-	warp_def 27, 19, 0, 0, RUSTBORO_CITY_GYM
-	warp_def 13, 30, 0, 0, RUSTBORO_CITY_FLAT_1_1F
-	warp_def 16, 45, 0, 0, RUSTBORO_CITY_MART
-	warp_def 16, 38, 0, 0, RUSTBORO_CITY_POKEMON_CENTER_1F
-	warp_def 27, 34, 0, 0, RUSTBORO_CITY_POKEMON_SCHOOL
-	warp_def 11, 15, 0, 0, RUSTBORO_CITY_DEVON_CORP_1F
-	warp_def 12, 15, 0, 1, RUSTBORO_CITY_DEVON_CORP_1F
-	warp_def 33, 19, 0, 0, RUSTBORO_CITY_HOUSE_1
-	warp_def 9, 38, 0, 0, RUSTBORO_CITY_CUTTERS_HOUSE
-	warp_def 30, 28, 0, 0, RUSTBORO_CITY_HOUSE_2
-	warp_def 5, 51, 0, 0, RUSTBORO_CITY_FLAT_2_1F
-	warp_def 26, 46, 0, 0, RUSTBORO_CITY_HOUSE_3
-
-RustboroCity_MapCoordEvents: @ 85269C0
-	coord_event 23, 20, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E095A
-	coord_event 23, 21, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E0971
-	coord_event 23, 22, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E0988
-	coord_event 23, 23, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E099F
-	coord_event 23, 24, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E09B6
-	coord_event 30, 9, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0AFE
-	coord_event 29, 10, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B0A
-	coord_event 30, 11, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B16
-	coord_event 30, 12, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B22
-	coord_event 30, 9, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C2B
-	coord_event 31, 10, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C37
-	coord_event 30, 11, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C43
-	coord_event 30, 12, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C4F
-	coord_event 12, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0DF3
-	coord_event 13, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0E33
-	coord_event 14, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0E73
-	coord_event 15, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0EB3
-	coord_event 16, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0EF3
-	coord_event 17, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0F33
-	coord_event 18, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0F73
-	coord_event 19, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0FB3
-
-RustboroCity_MapBGEvents: @ 8526B10
-	bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_1E08F5
-	bg_event 25, 35, 0, 0, 0, RustboroCity_EventScript_1E0910
-	bg_event 17, 45, 0, 1, 0, RustboroCity_EventScript_271E6A
-	bg_event 18, 38, 0, 1, 0, RustboroCity_EventScript_271E73
-	bg_event 19, 49, 0, 0, 0, RustboroCity_EventScript_1E0907
-	bg_event 18, 45, 0, 1, 0, RustboroCity_EventScript_271E6A
-	bg_event 17, 38, 0, 1, 0, RustboroCity_EventScript_271E73
-	bg_event 17, 20, 0, 0, 0, RustboroCity_EventScript_1E08EC
-	bg_event 30, 8, 0, 0, 0, RustboroCity_EventScript_1E08E3
-	bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_1E0919
-
-RustboroCity_MapEvents:: @ 8526B88
-	map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents
-
diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc
deleted file mode 100644
index bbed60478..000000000
--- a/data/maps/events/RustboroCity_CuttersHouse.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_CuttersHouse_EventObjects: @ 8530A1C
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0, 0, 0
-
-RustboroCity_CuttersHouse_MapWarps: @ 8530A4C
-	warp_def 5, 8, 0, 8, RUSTBORO_CITY
-	warp_def 6, 8, 0, 8, RUSTBORO_CITY
-
-RustboroCity_CuttersHouse_MapEvents:: @ 8530A5C
-	map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc
deleted file mode 100644
index 034c44aa3..000000000
--- a/data/maps/events/RustboroCity_DevonCorp_1F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-RustboroCity_DevonCorp_1F_EventObjects: @ 853037C
-	object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 0, 2, 6, 3, 2, 17, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 0, 15, 5, 3, 2, 18, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0, 0, 0
-
-RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4
-	warp_def 5, 8, 0, 5, RUSTBORO_CITY
-	warp_def 6, 8, 0, 6, RUSTBORO_CITY
-	warp_def 14, 1, 0, 0, RUSTBORO_CITY_DEVON_CORP_2F
-
-RustboroCity_DevonCorp_1F_MapBGEvents: @ 85303DC
-	bg_event 3, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211312
-	bg_event 8, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211309
-
-RustboroCity_DevonCorp_1F_MapEvents:: @ 85303F4
-	map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents
-
diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc
deleted file mode 100644
index f19ab8110..000000000
--- a/data/maps/events/RustboroCity_DevonCorp_2F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_DevonCorp_2F_EventObjects: @ 8530408
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 5, 3, 7, 160, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 8, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 5, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0, 0, 0
-
-RustboroCity_DevonCorp_2F_MapWarps: @ 8530498
-	warp_def 14, 1, 0, 2, RUSTBORO_CITY_DEVON_CORP_1F
-	warp_def 2, 1, 0, 0, RUSTBORO_CITY_DEVON_CORP_3F
-
-RustboroCity_DevonCorp_2F_MapEvents:: @ 85304A8
-	map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc
deleted file mode 100644
index 8422ef37a..000000000
--- a/data/maps/events/RustboroCity_DevonCorp_3F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC
-	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 15, 5, 3, 76, 17, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0
-
-RustboroCity_DevonCorp_3F_MapWarps: @ 8530504
-	warp_def 2, 1, 0, 1, RUSTBORO_CITY_DEVON_CORP_2F
-
-RustboroCity_DevonCorp_3F_MapBGEvents: @ 853050C
-	bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600
-	bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600
-
-RustboroCity_DevonCorp_3F_MapEvents:: @ 8530524
-	map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents
-
diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc
deleted file mode 100644
index 66786ea5b..000000000
--- a/data/maps/events/RustboroCity_Flat1_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-RustboroCity_Flat1_1F_EventObjects: @ 8530890
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0, 0, 0
-
-RustboroCity_Flat1_1F_MapWarps: @ 85308C0
-	warp_def 6, 7, 0, 1, RUSTBORO_CITY
-	warp_def 7, 7, 0, 1, RUSTBORO_CITY
-	warp_def 2, 1, 0, 0, RUSTBORO_CITY_FLAT_1_2F
-
-RustboroCity_Flat1_1F_MapEvents:: @ 85308D8
-	map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/events/RustboroCity_Flat1_2F.inc
deleted file mode 100644
index e56741b49..000000000
--- a/data/maps/events/RustboroCity_Flat1_2F.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-RustboroCity_Flat1_2F_EventObjects: @ 85308EC
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 6, 3, 5, 19, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 5, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 0, 9, 4, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 0, 10, 5, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 0, 10, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 8, 5, 3, 10, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
-
-RustboroCity_Flat1_2F_MapWarps: @ 85309AC
-	warp_def 2, 1, 0, 2, RUSTBORO_CITY_FLAT_1_1F
-
-RustboroCity_Flat1_2F_MapEvents:: @ 85309B4
-	map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/events/RustboroCity_Flat2_1F.inc
deleted file mode 100644
index f31acb8b6..000000000
--- a/data/maps/events/RustboroCity_Flat2_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-RustboroCity_Flat2_1F_EventObjects: @ 8530AC4
-	object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0, 0, 0
-
-RustboroCity_Flat2_1F_MapWarps: @ 8530AF4
-	warp_def 2, 8, 0, 10, RUSTBORO_CITY
-	warp_def 3, 8, 0, 10, RUSTBORO_CITY
-	warp_def 3, 1, 0, 0, RUSTBORO_CITY_FLAT_2_2F
-
-RustboroCity_Flat2_1F_MapEvents:: @ 8530B0C
-	map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/events/RustboroCity_Flat2_2F.inc
deleted file mode 100644
index 3bed978e8..000000000
--- a/data/maps/events/RustboroCity_Flat2_2F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_Flat2_2F_EventObjects: @ 8530B20
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0, 0, 0
-
-RustboroCity_Flat2_2F_MapWarps: @ 8530B50
-	warp_def 3, 1, 0, 2, RUSTBORO_CITY_FLAT_2_1F
-	warp_def 1, 1, 0, 0, RUSTBORO_CITY_FLAT_2_3F
-
-RustboroCity_Flat2_2F_MapEvents:: @ 8530B60
-	map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/events/RustboroCity_Flat2_3F.inc
deleted file mode 100644
index 16f9aa3ea..000000000
--- a/data/maps/events/RustboroCity_Flat2_3F.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-RustboroCity_Flat2_3F_EventObjects: @ 8530B74
-	object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0, 0, 0
-
-RustboroCity_Flat2_3F_MapWarps: @ 8530BA4
-	warp_def 1, 1, 0, 1, RUSTBORO_CITY_FLAT_2_2F
-
-RustboroCity_Flat2_3F_MapEvents:: @ 8530BAC
-	map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc
deleted file mode 100644
index d17c42d67..000000000
--- a/data/maps/events/RustboroCity_Gym.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-RustboroCity_Gym_EventObjects: @ 8530538
-	object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_HIKER, 0, 0, 1, 6, 3, 8, 17, 0, 1, 3, RustboroCity_Gym_EventScript_213011, 0, 0, 0
-
-RustboroCity_Gym_MapWarps: @ 85305B0
-	warp_def 5, 19, 0, 0, RUSTBORO_CITY
-	warp_def 6, 19, 0, 0, RUSTBORO_CITY
-
-RustboroCity_Gym_MapBGEvents: @ 85305C0
-	bg_event 2, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213047
-	bg_event 8, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213057
-
-RustboroCity_Gym_MapEvents:: @ 85305D8
-	map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents
-
diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc
deleted file mode 100644
index d07456dc9..000000000
--- a/data/maps/events/RustboroCity_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_House1_EventObjects: @ 85309C8
-	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0, 0, 0
-
-RustboroCity_House1_MapWarps: @ 85309F8
-	warp_def 5, 7, 0, 7, RUSTBORO_CITY
-	warp_def 6, 7, 0, 7, RUSTBORO_CITY
-
-RustboroCity_House1_MapEvents:: @ 8530A08
-	map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc
deleted file mode 100644
index 5d45c64d0..000000000
--- a/data/maps/events/RustboroCity_House2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_House2_EventObjects: @ 8530A70
-	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0, 0, 0
-
-RustboroCity_House2_MapWarps: @ 8530AA0
-	warp_def 5, 8, 0, 9, RUSTBORO_CITY
-	warp_def 6, 8, 0, 9, RUSTBORO_CITY
-
-RustboroCity_House2_MapEvents:: @ 8530AB0
-	map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc
deleted file mode 100644
index 61a528cdc..000000000
--- a/data/maps/events/RustboroCity_House3.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-RustboroCity_House3_EventObjects: @ 8530BC0
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0, 0, 0
-
-RustboroCity_House3_MapWarps: @ 8530C08
-	warp_def 5, 8, 0, 11, RUSTBORO_CITY
-	warp_def 6, 8, 0, 11, RUSTBORO_CITY
-
-RustboroCity_House3_MapEvents:: @ 8530C18
-	map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc
deleted file mode 100644
index e177ee10a..000000000
--- a/data/maps/events/RustboroCity_Mart.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-RustboroCity_Mart_EventObjects: @ 853080C
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 8, 4, 3, 3, 16, 0, 0, 0, RustboroCity_Mart_EventScript_214F74, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 8, 2, 3, 7, 17, 0, 0, 0, RustboroCity_Mart_EventScript_214F86, 0, 0, 0
-
-RustboroCity_Mart_MapWarps: @ 853086C
-	warp_def 3, 7, 0, 2, RUSTBORO_CITY
-	warp_def 4, 7, 0, 2, RUSTBORO_CITY
-
-RustboroCity_Mart_MapEvents:: @ 853087C
-	map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc
deleted file mode 100644
index 56dd4ef83..000000000
--- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0, 0, 0
-
-RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754
-	warp_def 7, 8, 3, 3, RUSTBORO_CITY
-	warp_def 6, 8, 3, 3, RUSTBORO_CITY
-	warp_def 1, 6, 4, 0, RUSTBORO_CITY_POKEMON_CENTER_2F
-
-RustboroCity_PokemonCenter_1F_MapEvents:: @ 853076C
-	map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/events/RustboroCity_PokemonCenter_2F.inc
deleted file mode 100644
index f9e00e26c..000000000
--- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-
-RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0
-	warp_def 1, 6, 4, 2, RUSTBORO_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-RustboroCity_PokemonCenter_2F_MapEvents:: @ 85307F8
-	map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc
deleted file mode 100644
index ac0160e7b..000000000
--- a/data/maps/events/RustboroCity_PokemonSchool.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-RustboroCity_PokemonSchool_EventObjects: @ 85305EC
-	object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 0, 10, 0, 7, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999, 0, 0
-
-RustboroCity_PokemonSchool_MapWarps: @ 8530694
-	warp_def 5, 10, 0, 4, RUSTBORO_CITY
-	warp_def 6, 10, 0, 4, RUSTBORO_CITY
-
-RustboroCity_PokemonSchool_MapBGEvents: @ 85306A4
-	bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9
-	bg_event 4, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9
-	bg_event 6, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9
-	bg_event 7, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9
-	bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F8C
-
-RustboroCity_PokemonSchool_MapEvents:: @ 85306E0
-	map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents
-
diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc
deleted file mode 100644
index 5c2a214b9..000000000
--- a/data/maps/events/RusturfTunnel.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-RusturfTunnel_EventObjects: @ 85341C4
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 5, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931, 0, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049, 0, 0
-	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, 879, 0, 0
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878, 0, 0
-	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 4, 3, 8, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932, 0, 0
-	object_event 9, EVENT_OBJ_GFX_HIKER, 0, 0, 32, 13, 3, 9, 17, 0, 1, 3, RusturfTunnel_EventScript_22D1B1, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 25, 4, 3, 9, 17, 0, 0, 0, RusturfTunnel_EventScript_22CE5F, 983, 0, 0
-
-RusturfTunnel_MapWarps: @ 85342B4
-	warp_def 4, 10, 3, 0, ROUTE_116
-	warp_def 29, 16, 3, 4, VERDANTURF_TOWN
-	warp_def 18, 20, 3, 2, ROUTE_116
-
-RusturfTunnel_MapCoordEvents: @ 85342CC
-	coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D071
-	coord_event 9, 4, 3, 0, VAR_0x409A, 2, 0, RusturfTunnel_EventScript_22D083
-	coord_event 9, 5, 3, 0, VAR_0x409A, 2, 0, RusturfTunnel_EventScript_22D083
-	coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D077
-	coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D07D
-
-RusturfTunnel_MapEvents:: @ 853431C
-	map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc
deleted file mode 100644
index 1816412d6..000000000
--- a/data/maps/events/SSTidalCorridor.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-SSTidalCorridor_EventObjects: @ 853A158
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 16, 7, 3, 3, 32, 0, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 2, 3, 8, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 0, 7, 2, 3, 1, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810, 0, 0
-
-SSTidalCorridor_MapWarps: @ 853A1D0
-	warp_def 4, 9, 3, 0, SS_TIDAL_ROOMS
-	warp_def 7, 9, 3, 2, SS_TIDAL_ROOMS
-	warp_def 10, 9, 3, 4, SS_TIDAL_ROOMS
-	warp_def 13, 9, 3, 6, SS_TIDAL_ROOMS
-	warp_def 4, 3, 3, 8, SS_TIDAL_ROOMS
-	warp_def 7, 3, 3, 9, SS_TIDAL_ROOMS
-	warp_def 10, 3, 3, 10, SS_TIDAL_ROOMS
-	warp_def 13, 3, 3, 11, SS_TIDAL_ROOMS
-	warp_def 16, 2, 3, 0, SS_TIDAL_LOWER_DECK
-
-SSTidalCorridor_MapBGEvents: @ 853A218
-	bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
-	bg_event 4, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
-	bg_event 6, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
-	bg_event 8, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
-	bg_event 10, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
-	bg_event 12, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
-	bg_event 14, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
-	bg_event 16, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
-	bg_event 5, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C0F5
-	bg_event 8, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C0FE
-	bg_event 11, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C107
-	bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C110
-
-SSTidalCorridor_MapEvents:: @ 853A2A8
-	map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents
-
diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc
deleted file mode 100644
index e135eceae..000000000
--- a/data/maps/events/SSTidalLowerDeck.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SSTidalLowerDeck_EventObjects: @ 853A2BC
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 10, 4, 3, 46, 68, 0, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 4, 3, 50, 71, 0, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0, 0, 0
-
-SSTidalLowerDeck_MapWarps: @ 853A2EC
-	warp_def 15, 2, 3, 8, SS_TIDAL_CORRIDOR
-
-SSTidalLowerDeck_MapBGEvents: @ 853A2F4
-	bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0
-
-SSTidalLowerDeck_MapEvents:: @ 853A300
-	map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
-
diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc
deleted file mode 100644
index 14aadda5f..000000000
--- a/data/maps/events/SSTidalRooms.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-SSTidalRooms_EventObjects: @ 853A314
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 5, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 4, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 0, 22, 11, 3, 8, 17, 0, 1, 3, SSTidalRooms_EventScript_23CAC4, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 28, 5, 3, 7, 17, 0, 0, 0, SSTidalRooms_EventScript_23C9F2, 951, 0, 0
-
-SSTidalRooms_MapWarps: @ 853A3D4
-	warp_def 4, 16, 0, 0, SS_TIDAL_CORRIDOR
-	warp_def 5, 16, 0, 0, SS_TIDAL_CORRIDOR
-	warp_def 13, 16, 0, 1, SS_TIDAL_CORRIDOR
-	warp_def 14, 16, 0, 1, SS_TIDAL_CORRIDOR
-	warp_def 22, 16, 0, 2, SS_TIDAL_CORRIDOR
-	warp_def 23, 16, 0, 2, SS_TIDAL_CORRIDOR
-	warp_def 31, 16, 0, 3, SS_TIDAL_CORRIDOR
-	warp_def 32, 16, 0, 3, SS_TIDAL_CORRIDOR
-	warp_def 4, 1, 0, 4, SS_TIDAL_CORRIDOR
-	warp_def 13, 1, 0, 5, SS_TIDAL_CORRIDOR
-	warp_def 22, 1, 0, 6, SS_TIDAL_CORRIDOR
-	warp_def 31, 1, 0, 7, SS_TIDAL_CORRIDOR
-
-SSTidalRooms_MapBGEvents: @ 853A434
-	bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_23CA33
-	bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_23CA33
-
-SSTidalRooms_MapEvents:: @ 853A44C
-	map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents
-
diff --git a/data/maps/events/SafariZone_North.inc b/data/maps/events/SafariZone_North.inc
deleted file mode 100644
index d11d31fe9..000000000
--- a/data/maps/events/SafariZone_North.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SafariZone_North_EventObjects: @ 853B160
-	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 22, 9, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D254, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 29, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D25D, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 10, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 17, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 13, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 18, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 28, 14, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 19, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 23, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 20, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 21, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 27, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 22, 0, 0
-	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2912C9, 1119, 0, 0
-
-SafariZone_North_MapEvents:: @ 853B238
-	map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc
deleted file mode 100644
index 233b55da0..000000000
--- a/data/maps/events/SafariZone_Northeast.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SafariZone_Northeast_EventObjects: @ 853B968
-	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 8, 20, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 30, 22, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 11, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 13, 35, 0, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 10, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18, 0, 0
-	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169, 0, 0
-
-SafariZone_Northeast_MapBGEvents: @ 853BA40
-	bg_event 31, 35, 3, 7, 0, ITEM_RARE_CANDY, 106, 0
-	bg_event 21, 5, 3, 7, 0, ITEM_ZINC, 107, 0
-
-SafariZone_Northeast_MapEvents:: @ 853BA58
-	map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents
-
diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc
deleted file mode 100644
index 41c2fe198..000000000
--- a/data/maps/events/SafariZone_Northwest.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SafariZone_Northwest_EventObjects: @ 853B11C
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094, 0, 0
-
-SafariZone_Northwest_MapEvents:: @ 853B14C
-	map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc
deleted file mode 100644
index 1ab278781..000000000
--- a/data/maps/events/SafariZone_RestHouse.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SafariZone_RestHouse_EventObjects: @ 853B8FC
-	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 7, 4, 0, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 5, 3, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0, 0, 0
-
-SafariZone_RestHouse_MapWarps: @ 853B944
-	warp_def 3, 8, 0, 0, SAFARI_ZONE_SOUTHWEST
-	warp_def 4, 8, 0, 0, SAFARI_ZONE_SOUTHWEST
-
-SafariZone_RestHouse_MapEvents:: @ 853B954
-	map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SafariZone_South.inc b/data/maps/events/SafariZone_South.inc
deleted file mode 100644
index c1e293e6f..000000000
--- a/data/maps/events/SafariZone_South.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SafariZone_South_EventObjects: @ 853B2A4
-	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 26, 28, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2CA, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 15, 31, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2DC, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 36, 16, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D390, 717, 0, 0
-	object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 0, 36, 17, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D3A2, 717, 0, 0
-
-SafariZone_South_MapWarps: @ 853B334
-	warp_def 32, 33, 0, 0, ROUTE_121_SAFARI_ZONE_ENTRANCE
-
-SafariZone_South_MapEvents:: @ 853B33C
-	map_events SafariZone_South_EventObjects, SafariZone_South_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc
deleted file mode 100644
index 61e6b93fe..000000000
--- a/data/maps/events/SafariZone_Southeast.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SafariZone_Southeast_EventObjects: @ 853BA6C
-	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 7, 7, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 20, 30, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 8, 26, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 15, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170, 0, 0
-	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 12, 16, 3, 9, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D399, 747, 0, 0
-
-SafariZone_Southeast_MapBGEvents: @ 853BAE4
-	bg_event 19, 36, 3, 7, 0, ITEM_PP_UP, 108, 0
-	bg_event 32, 33, 0, 7, 0, ITEM_FULL_RESTORE, 105, 0
-
-SafariZone_Southeast_MapEvents:: @ 853BAFC
-	map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents
-
diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc
deleted file mode 100644
index eda3552eb..000000000
--- a/data/maps/events/SafariZone_Southwest.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SafariZone_Southwest_EventObjects: @ 853B24C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 3, 1, 17, 0, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131, 0, 0
-
-SafariZone_Southwest_MapWarps: @ 853B27C
-	warp_def 29, 7, 3, 0, SAFARI_ZONE_REST_HOUSE
-
-SafariZone_Southwest_MapBGEvents: @ 853B284
-	bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_23D270
-
-SafariZone_Southwest_MapEvents:: @ 853B290
-	map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents
-
diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc
deleted file mode 100644
index 313423b51..000000000
--- a/data/maps/events/ScorchedSlab.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-ScorchedSlab_EventObjects: @ 8536F88
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079, 0, 0
-
-ScorchedSlab_MapWarps: @ 8536FA0
-	warp_def 7, 16, 1, 1, ROUTE_120
-
-ScorchedSlab_MapEvents:: @ 8536FA8
-	map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/events/SeafloorCavern_Entrance.inc
deleted file mode 100644
index 1118c0ab3..000000000
--- a/data/maps/events/SeafloorCavern_Entrance.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SeafloorCavern_Entrance_EventObjects: @ 85356BC
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941, 0, 0
-
-SeafloorCavern_Entrance_MapWarps: @ 85356D4
-	warp_def 10, 18, 3, 0, UNDERWATER_4
-	warp_def 10, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_1
-
-SeafloorCavern_Entrance_MapEvents:: @ 85356E4
-	map_events SeafloorCavern_Entrance_EventObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc
deleted file mode 100644
index 31fbb7d86..000000000
--- a/data/maps/events/SeafloorCavern_Room1.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room1_EventObjects: @ 85356F8
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17, 0, 0
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19, 0, 0
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 6, 3, 1, 17, 0, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946, 0, 0
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 10, 3, 16, 17, 0, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946, 0, 0
-
-SeafloorCavern_Room1_MapWarps: @ 8535770
-	warp_def 5, 18, 3, 1, SEAFLOOR_CAVERN_ENTRANCE
-	warp_def 17, 13, 3, 0, SEAFLOOR_CAVERN_ROOM_5
-	warp_def 6, 2, 3, 0, SEAFLOOR_CAVERN_ROOM_2
-
-SeafloorCavern_Room1_MapEvents:: @ 8535788
-	map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc
deleted file mode 100644
index 608b45e50..000000000
--- a/data/maps/events/SeafloorCavern_Room2.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SeafloorCavern_Room2_EventObjects: @ 853579C
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18, 0, 0
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19, 0, 0
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17, 0, 0
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21, 0, 0
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22, 0, 0
-	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25, 0, 0
-	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23, 0, 0
-
-SeafloorCavern_Room2_MapWarps: @ 853585C
-	warp_def 10, 7, 3, 2, SEAFLOOR_CAVERN_ROOM_1
-	warp_def 4, 10, 3, 0, SEAFLOOR_CAVERN_ROOM_4
-	warp_def 6, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_6
-	warp_def 11, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_7
-
-SeafloorCavern_Room2_MapEvents:: @ 853587C
-	map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc
deleted file mode 100644
index f7c919131..000000000
--- a/data/maps/events/SeafloorCavern_Room3.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SeafloorCavern_Room3_EventObjects: @ 8535890
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18, 0, 0
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20, 0, 0
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 9, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21, 0, 0
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22, 0, 0
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25, 0, 0
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 9, 5, 3, 9, 17, 0, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946, 0, 0
-	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 5, 3, 10, 17, 0, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946, 0, 0
-
-SeafloorCavern_Room3_MapWarps: @ 8535968
-	warp_def 8, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_8
-	warp_def 9, 13, 3, 1, SEAFLOOR_CAVERN_ROOM_7
-	warp_def 4, 15, 3, 1, SEAFLOOR_CAVERN_ROOM_6
-
-SeafloorCavern_Room3_MapEvents:: @ 8535980
-	map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc
deleted file mode 100644
index 3b7f6f2ee..000000000
--- a/data/maps/events/SeafloorCavern_Room4.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SeafloorCavern_Room4_EventObjects: @ 8535994
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 8, 3, 17, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946, 0, 0
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 5, 12, 3, 7, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946, 0, 0
-
-SeafloorCavern_Room4_MapWarps: @ 85359C4
-	warp_def 13, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_2
-	warp_def 4, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_5
-	warp_def 9, 10, 3, 2, SEAFLOOR_CAVERN_ROOM_5
-	warp_def 10, 15, 3, 1, SEAFLOOR_CAVERN_ENTRANCE
-
-SeafloorCavern_Room4_MapEvents:: @ 85359E4
-	map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc
deleted file mode 100644
index 4fd74a9c7..000000000
--- a/data/maps/events/SeafloorCavern_Room5.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SeafloorCavern_Room5_EventObjects: @ 85359F8
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17, 0, 0
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18, 0, 0
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20, 0, 0
-
-SeafloorCavern_Room5_MapWarps: @ 8535A88
-	warp_def 4, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_1
-	warp_def 15, 12, 3, 1, SEAFLOOR_CAVERN_ROOM_4
-	warp_def 7, 17, 3, 2, SEAFLOOR_CAVERN_ROOM_4
-
-SeafloorCavern_Room5_MapEvents:: @ 8535AA0
-	map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/events/SeafloorCavern_Room6.inc
deleted file mode 100644
index 2293f359d..000000000
--- a/data/maps/events/SeafloorCavern_Room6.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SeafloorCavern_Room6_MapWarps: @ 8535AB4
-	warp_def 11, 21, 3, 2, SEAFLOOR_CAVERN_ROOM_2
-	warp_def 4, 1, 3, 2, SEAFLOOR_CAVERN_ROOM_3
-	warp_def 14, 8, 1, 1, SEAFLOOR_CAVERN_ENTRANCE
-
-SeafloorCavern_Room6_MapEvents:: @ 8535ACC
-	map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/events/SeafloorCavern_Room7.inc
deleted file mode 100644
index 002154473..000000000
--- a/data/maps/events/SeafloorCavern_Room7.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SeafloorCavern_Room7_MapWarps: @ 8535AE0
-	warp_def 3, 23, 3, 3, SEAFLOOR_CAVERN_ROOM_2
-	warp_def 5, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_3
-
-SeafloorCavern_Room7_MapEvents:: @ 8535AF0
-	map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc
deleted file mode 100644
index 65a1da014..000000000
--- a/data/maps/events/SeafloorCavern_Room8.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SeafloorCavern_Room8_EventObjects: @ 8535B04
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17, 0, 0
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18, 0, 0
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19, 0, 0
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20, 0, 0
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23, 0, 0
-	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24, 0, 0
-	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25, 0, 0
-	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26, 0, 0
-	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27, 0, 0
-	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28, 0, 0
-
-SeafloorCavern_Room8_MapWarps: @ 8535C24
-	warp_def 5, 2, 3, 0, SEAFLOOR_CAVERN_ROOM_9
-	warp_def 5, 12, 3, 0, SEAFLOOR_CAVERN_ROOM_3
-
-SeafloorCavern_Room8_MapEvents:: @ 8535C34
-	map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc
deleted file mode 100644
index 8c203021c..000000000
--- a/data/maps/events/SeafloorCavern_Room9.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SeafloorCavern_Room9_EventObjects: @ 8535C48
-	object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, 859, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 828, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 829, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090, 0, 0
-	object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 0, 17, 38, 3, 8, 17, 0, 0, 0, 0x0, 733, 0, 0
-
-SeafloorCavern_Room9_MapWarps: @ 8535CF0
-	warp_def 5, 4, 3, 0, SEAFLOOR_CAVERN_ROOM_8
-
-SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8
-	coord_event 17, 42, 3, 0, VAR_0x40A2, 0, 0, SeafloorCavern_Room9_EventScript_234DC9
-
-SeafloorCavern_Room9_MapEvents:: @ 8535D08
-	map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/events/SealedChamber_InnerRoom.inc
deleted file mode 100644
index 753d6dbfb..000000000
--- a/data/maps/events/SealedChamber_InnerRoom.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SealedChamber_InnerRoom_MapWarps: @ 8536F00
-	warp_def 10, 19, 3, 0, SEALED_CHAMBER_OUTER_ROOM
-
-SealedChamber_InnerRoom_MapBGEvents: @ 8536F08
-	bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8
-	bg_event 6, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239255
-	bg_event 14, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_23925F
-	bg_event 4, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239269
-	bg_event 16, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239273
-	bg_event 6, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_23927D
-	bg_event 14, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239287
-	bg_event 9, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8
-	bg_event 11, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8
-
-SealedChamber_InnerRoom_MapEvents:: @ 8536F74
-	map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents
-
diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/events/SealedChamber_OuterRoom.inc
deleted file mode 100644
index 21be37675..000000000
--- a/data/maps/events/SealedChamber_OuterRoom.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-SealedChamber_OuterRoom_MapWarps: @ 8536D88
-	warp_def 10, 2, 3, 0, SEALED_CHAMBER_INNER_ROOM
-
-SealedChamber_OuterRoom_MapBGEvents: @ 8536D90
-	bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C
-	bg_event 5, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176
-	bg_event 5, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180
-	bg_event 5, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A
-	bg_event 11, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194
-	bg_event 11, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E
-	bg_event 11, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8
-	bg_event 11, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC
-	bg_event 16, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391B2
-	bg_event 16, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391C6
-	bg_event 10, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391D0
-	bg_event 6, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C
-	bg_event 4, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C
-	bg_event 4, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176
-	bg_event 6, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176
-	bg_event 4, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180
-	bg_event 6, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180
-	bg_event 4, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A
-	bg_event 6, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A
-	bg_event 10, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194
-	bg_event 12, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194
-	bg_event 10, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E
-	bg_event 12, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E
-	bg_event 10, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8
-	bg_event 12, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8
-	bg_event 10, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC
-	bg_event 12, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC
-	bg_event 9, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391ED
-	bg_event 11, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391ED
-
-SealedChamber_OuterRoom_MapEvents:: @ 8536EEC
-	map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents
-
diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc
deleted file mode 100644
index 301779af5..000000000
--- a/data/maps/events/SecretBase_BlueCave1.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BlueCave1_EventObjects: @ 8537BEC
-	object_event 1, 255, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_BlueCave1_MapWarps: @ 8537D54
-	warp_def 5, 7, 0, 126, NONE
-
-SecretBase_BlueCave1_MapEvents:: @ 8537D5C
-	map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc
deleted file mode 100644
index f919cfae0..000000000
--- a/data/maps/events/SecretBase_BlueCave2.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BlueCave2_EventObjects: @ 8538504
-	object_event 1, 255, 0, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_BlueCave2_MapWarps: @ 853866C
-	warp_def 7, 5, 0, 126, NONE
-
-SecretBase_BlueCave2_MapEvents:: @ 8538674
-	map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc
deleted file mode 100644
index ba2b28eb1..000000000
--- a/data/maps/events/SecretBase_BlueCave3.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BlueCave3_EventObjects: @ 8538E1C
-	object_event 1, 255, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_BlueCave3_MapWarps: @ 8538F84
-	warp_def 4, 15, 0, 126, NONE
-
-SecretBase_BlueCave3_MapEvents:: @ 8538F8C
-	map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc
deleted file mode 100644
index cc79f44be..000000000
--- a/data/maps/events/SecretBase_BlueCave4.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BlueCave4_EventObjects: @ 8539734
-	object_event 1, 255, 0, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_BlueCave4_MapWarps: @ 853989C
-	warp_def 4, 15, 0, 126, NONE
-
-SecretBase_BlueCave4_MapEvents:: @ 85398A4
-	map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc
deleted file mode 100644
index e937ac1f4..000000000
--- a/data/maps/events/SecretBase_BrownCave1.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BrownCave1_EventObjects: @ 8537A68
-	object_event 1, 255, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_BrownCave1_MapWarps: @ 8537BD0
-	warp_def 5, 7, 0, 126, NONE
-
-SecretBase_BrownCave1_MapEvents:: @ 8537BD8
-	map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc
deleted file mode 100644
index d3885cb0d..000000000
--- a/data/maps/events/SecretBase_BrownCave2.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BrownCave2_EventObjects: @ 8538380
-	object_event 1, 255, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_BrownCave2_MapWarps: @ 85384E8
-	warp_def 1, 7, 0, 126, NONE
-
-SecretBase_BrownCave2_MapEvents:: @ 85384F0
-	map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc
deleted file mode 100644
index c0ec35e37..000000000
--- a/data/maps/events/SecretBase_BrownCave3.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BrownCave3_EventObjects: @ 8538C98
-	object_event 1, 255, 0, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_BrownCave3_MapWarps: @ 8538E00
-	warp_def 11, 9, 0, 126, NONE
-
-SecretBase_BrownCave3_MapEvents:: @ 8538E08
-	map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc
deleted file mode 100644
index de9250cbb..000000000
--- a/data/maps/events/SecretBase_BrownCave4.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BrownCave4_EventObjects: @ 85395B0
-	object_event 1, 255, 0, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_BrownCave4_MapWarps: @ 8539718
-	warp_def 2, 8, 0, 126, NONE
-
-SecretBase_BrownCave4_MapEvents:: @ 8539720
-	map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc
deleted file mode 100644
index aa664f45c..000000000
--- a/data/maps/events/SecretBase_RedCave1.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_RedCave1_EventObjects: @ 85378E4
-	object_event 1, 255, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_RedCave1_MapWarps: @ 8537A4C
-	warp_def 5, 7, 0, 126, NONE
-
-SecretBase_RedCave1_MapEvents:: @ 8537A54
-	map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc
deleted file mode 100644
index 956e3b03b..000000000
--- a/data/maps/events/SecretBase_RedCave2.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_RedCave2_EventObjects: @ 85381FC
-	object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_RedCave2_MapWarps: @ 8538364
-	warp_def 3, 14, 0, 126, NONE
-
-SecretBase_RedCave2_MapEvents:: @ 853836C
-	map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc
deleted file mode 100644
index dfdbec94c..000000000
--- a/data/maps/events/SecretBase_RedCave3.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_RedCave3_EventObjects: @ 8538B14
-	object_event 1, 255, 0, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_RedCave3_MapWarps: @ 8538C7C
-	warp_def 3, 6, 0, 126, NONE
-
-SecretBase_RedCave3_MapEvents:: @ 8538C84
-	map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc
deleted file mode 100644
index b485d0ad9..000000000
--- a/data/maps/events/SecretBase_RedCave4.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_RedCave4_EventObjects: @ 853942C
-	object_event 1, 255, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_RedCave4_MapWarps: @ 8539594
-	warp_def 2, 12, 0, 126, NONE
-
-SecretBase_RedCave4_MapEvents:: @ 853959C
-	map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc
deleted file mode 100644
index 545426eea..000000000
--- a/data/maps/events/SecretBase_Shrub1.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Shrub1_EventObjects: @ 8538078
-	object_event 1, 255, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_Shrub1_MapWarps: @ 85381E0
-	warp_def 5, 7, 0, 126, NONE
-
-SecretBase_Shrub1_MapEvents:: @ 85381E8
-	map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc
deleted file mode 100644
index 0adb6b76d..000000000
--- a/data/maps/events/SecretBase_Shrub2.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Shrub2_EventObjects: @ 8538990
-	object_event 1, 255, 0, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_Shrub2_MapWarps: @ 8538AF8
-	warp_def 7, 5, 0, 126, NONE
-
-SecretBase_Shrub2_MapEvents:: @ 8538B00
-	map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc
deleted file mode 100644
index b8f4d4ed4..000000000
--- a/data/maps/events/SecretBase_Shrub3.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Shrub3_EventObjects: @ 85392A8
-	object_event 1, 255, 0, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_Shrub3_MapWarps: @ 8539410
-	warp_def 6, 9, 0, 126, NONE
-
-SecretBase_Shrub3_MapEvents:: @ 8539418
-	map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc
deleted file mode 100644
index 679b313d5..000000000
--- a/data/maps/events/SecretBase_Shrub4.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Shrub4_EventObjects: @ 8539BC0
-	object_event 1, 255, 0, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_Shrub4_MapWarps: @ 8539D28
-	warp_def 11, 8, 0, 126, NONE
-
-SecretBase_Shrub4_MapEvents:: @ 8539D30
-	map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc
deleted file mode 100644
index 402081450..000000000
--- a/data/maps/events/SecretBase_Tree1.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Tree1_EventObjects: @ 8537EF4
-	object_event 1, 255, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_Tree1_MapWarps: @ 853805C
-	warp_def 5, 7, 0, 126, NONE
-
-SecretBase_Tree1_MapEvents:: @ 8538064
-	map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc
deleted file mode 100644
index ddfbf094c..000000000
--- a/data/maps/events/SecretBase_Tree2.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Tree2_EventObjects: @ 853880C
-	object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_Tree2_MapWarps: @ 8538974
-	warp_def 3, 14, 0, 126, NONE
-
-SecretBase_Tree2_MapEvents:: @ 853897C
-	map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc
deleted file mode 100644
index a13916bc7..000000000
--- a/data/maps/events/SecretBase_Tree3.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Tree3_EventObjects: @ 8539124
-	object_event 1, 255, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_Tree3_MapWarps: @ 853928C
-	warp_def 8, 6, 0, 126, NONE
-
-SecretBase_Tree3_MapEvents:: @ 8539294
-	map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc
deleted file mode 100644
index 4511b236c..000000000
--- a/data/maps/events/SecretBase_Tree4.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Tree4_EventObjects: @ 8539A3C
-	object_event 1, 255, 0, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_Tree4_MapWarps: @ 8539BA4
-	warp_def 7, 12, 0, 126, NONE
-
-SecretBase_Tree4_MapEvents:: @ 8539BAC
-	map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc
deleted file mode 100644
index 6fc02d447..000000000
--- a/data/maps/events/SecretBase_YellowCave1.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_YellowCave1_EventObjects: @ 8537D70
-	object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_YellowCave1_MapWarps: @ 8537ED8
-	warp_def 5, 7, 0, 126, NONE
-
-SecretBase_YellowCave1_MapEvents:: @ 8537EE0
-	map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc
deleted file mode 100644
index 646176740..000000000
--- a/data/maps/events/SecretBase_YellowCave2.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_YellowCave2_EventObjects: @ 8538688
-	object_event 1, 255, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_YellowCave2_MapWarps: @ 85387F0
-	warp_def 12, 7, 0, 126, NONE
-
-SecretBase_YellowCave2_MapEvents:: @ 85387F8
-	map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc
deleted file mode 100644
index 32b71c477..000000000
--- a/data/maps/events/SecretBase_YellowCave3.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_YellowCave3_EventObjects: @ 8538FA0
-	object_event 1, 255, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_YellowCave3_MapWarps: @ 8539108
-	warp_def 5, 9, 0, 126, NONE
-
-SecretBase_YellowCave3_MapEvents:: @ 8539110
-	map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc
deleted file mode 100644
index 187d0dff9..000000000
--- a/data/maps/events/SecretBase_YellowCave4.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_YellowCave4_EventObjects: @ 85398B8
-	object_event 1, 255, 0, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
-	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
-	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
-	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
-	object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
-	object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
-	object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
-	object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
-
-SecretBase_YellowCave4_MapWarps: @ 8539A20
-	warp_def 6, 12, 0, 126, NONE
-
-SecretBase_YellowCave4_MapEvents:: @ 8539A28
-	map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
deleted file mode 100644
index dda65b0fe..000000000
--- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 3, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081, 0, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 18, 15, 3, 9, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0, 0, 0
-
-ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC
-	warp_def 20, 30, 3, 0, ROUTE_125
-	warp_def 19, 5, 3, 0, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-	warp_def 6, 2, 3, 6, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-	warp_def 27, 2, 3, 7, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-
-ShoalCave_LowTideEntranceRoom_MapEvents:: @ 85362CC
-	map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc
deleted file mode 100644
index 809fb146c..000000000
--- a/data/maps/events/ShoalCave_LowTideIceRoom.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-ShoalCave_LowTideIceRoom_EventObjects: @ 8537100
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 21, 4, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113, 0, 0
-
-ShoalCave_LowTideIceRoom_MapWarps: @ 8537130
-	warp_def 17, 10, 3, 3, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
-
-ShoalCave_LowTideIceRoom_MapEvents:: @ 8537138
-	map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc
deleted file mode 100644
index 4d48e1aab..000000000
--- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 14, 5, 1, 17, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082, 0, 0
-
-ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8
-	warp_def 34, 29, 3, 1, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
-	warp_def 38, 15, 3, 0, SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM
-	warp_def 42, 4, 3, 1, SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM
-	warp_def 19, 14, 4, 0, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
-	warp_def 15, 19, 3, 1, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
-	warp_def 30, 25, 3, 2, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
-	warp_def 14, 33, 5, 2, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
-	warp_def 40, 33, 5, 3, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
-
-ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338
-	bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23708C
-	bg_event 14, 26, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2370C8
-	bg_event 41, 20, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_236FBA
-	bg_event 41, 10, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_236FF6
-	bg_event 6, 9, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_237028
-	bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23705A
-
-ShoalCave_LowTideInnerRoom_MapEvents:: @ 8536380
-	map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents
-
diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
deleted file mode 100644
index d3484961e..000000000
--- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 25, 3, 3, 1, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 4, 3, 2, 17, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0, 0, 0
-
-ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C
-	warp_def 7, 2, 3, 3, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-	warp_def 2, 6, 3, 4, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-	warp_def 19, 11, 3, 5, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-	warp_def 28, 11, 3, 0, SHOAL_CAVE_LOW_TIDE_ICE_ROOM
-
-ShoalCave_LowTideLowerRoom_MapBGEvents: @ 853642C
-	bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_237176
-
-ShoalCave_LowTideLowerRoom_MapEvents:: @ 8536438
-	map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents
-
diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc
deleted file mode 100644
index 556524f05..000000000
--- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083, 0, 0
-
-ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC
-	warp_def 3, 12, 3, 1, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-	warp_def 7, 4, 3, 2, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-
-ShoalCave_LowTideStairsRoom_MapBGEvents: @ 85363BC
-	bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_23711A
-
-ShoalCave_LowTideStairsRoom_MapEvents:: @ 85363C8
-	map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents
-
diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc
deleted file mode 100644
index 382cafe16..000000000
--- a/data/maps/events/SingleBattleColosseum.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SingleBattleColosseum_EventObjects: @ 8539D44
-	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0, 0, 0
-
-SingleBattleColosseum_MapWarps: @ 8539D5C
-	warp_def 6, 8, 3, 127, NONE
-	warp_def 7, 8, 3, 127, NONE
-
-SingleBattleColosseum_MapCoordEvents: @ 8539D6C
-	coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277374
-	coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827737E
-
-SingleBattleColosseum_MapEvents:: @ 8539D8C
-	map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/events/SkyPillar_1F.inc
deleted file mode 100644
index c9eda68b0..000000000
--- a/data/maps/events/SkyPillar_1F.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SkyPillar_1F_MapWarps: @ 8537058
-	warp_def 6, 13, 3, 1, SKY_PILLAR_OUTSIDE
-	warp_def 7, 13, 3, 1, SKY_PILLAR_OUTSIDE
-	warp_def 10, 1, 3, 0, SKY_PILLAR_2F
-
-SkyPillar_1F_MapEvents:: @ 8537070
-	map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/events/SkyPillar_2F.inc
deleted file mode 100644
index 1c81f7838..000000000
--- a/data/maps/events/SkyPillar_2F.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SkyPillar_2F_MapWarps: @ 8537084
-	warp_def 10, 1, 3, 2, SKY_PILLAR_1F
-	warp_def 3, 1, 3, 0, SKY_PILLAR_3F
-
-SkyPillar_2F_MapEvents:: @ 8537094
-	map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/events/SkyPillar_3F.inc
deleted file mode 100644
index c8a97565b..000000000
--- a/data/maps/events/SkyPillar_3F.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SkyPillar_3F_MapWarps: @ 85370A8
-	warp_def 3, 1, 3, 1, SKY_PILLAR_2F
-	warp_def 11, 1, 3, 0, SKY_PILLAR_4F
-	warp_def 7, 1, 3, 1, SKY_PILLAR_4F
-
-SkyPillar_3F_MapEvents:: @ 85370C0
-	map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/events/SkyPillar_4F.inc
deleted file mode 100644
index a399d1364..000000000
--- a/data/maps/events/SkyPillar_4F.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SkyPillar_4F_MapWarps: @ 85370D4
-	warp_def 11, 1, 3, 1, SKY_PILLAR_3F
-	warp_def 7, 1, 3, 2, SKY_PILLAR_3F
-	warp_def 3, 1, 3, 0, SKY_PILLAR_5F
-
-SkyPillar_4F_MapEvents:: @ 85370EC
-	map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/events/SkyPillar_5F.inc
deleted file mode 100644
index d6ce944cb..000000000
--- a/data/maps/events/SkyPillar_5F.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SkyPillar_5F_MapWarps: @ 853714C
-	warp_def 3, 1, 3, 2, SKY_PILLAR_4F
-	warp_def 10, 1, 3, 0, SKY_PILLAR_TOP
-
-SkyPillar_5F_MapEvents:: @ 853715C
-	map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/events/SkyPillar_Entrance.inc
deleted file mode 100644
index 5a63e2496..000000000
--- a/data/maps/events/SkyPillar_Entrance.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SkyPillar_Entrance_MapWarps: @ 8536FF8
-	warp_def 6, 16, 3, 0, ROUTE_131
-	warp_def 14, 4, 3, 0, SKY_PILLAR_OUTSIDE
-
-SkyPillar_Entrance_MapEvents:: @ 8537008
-	map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/events/SkyPillar_Outside.inc
deleted file mode 100644
index 78991499c..000000000
--- a/data/maps/events/SkyPillar_Outside.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SkyPillar_Outside_EventObjects: @ 853701C
-	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 13, 7, 3, 8, 17, 0, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855, 0, 0
-
-SkyPillar_Outside_MapWarps: @ 8537034
-	warp_def 17, 13, 3, 1, SKY_PILLAR_ENTRANCE
-	warp_def 14, 5, 0, 0, SKY_PILLAR_1F
-
-SkyPillar_Outside_MapEvents:: @ 8537044
-	map_events SkyPillar_Outside_EventObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc
deleted file mode 100644
index 792f350b8..000000000
--- a/data/maps/events/SkyPillar_Top.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SkyPillar_Top_EventObjects: @ 8537170
-	object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 0, 14, 7, 3, 8, 17, 0, 0, 0, 0x0, 773, 0, 0
-	object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 0, 14, 6, 3, 8, 17, 0, 0, 0, SkyPillar_Top_EventScript_239722, 80, 0, 0
-
-SkyPillar_Top_MapWarps: @ 85371A0
-	warp_def 16, 14, 3, 1, SKY_PILLAR_5F
-
-SkyPillar_Top_MapCoordEvents: @ 85371A8
-	coord_event 14, 9, 3, 0, VAR_0x40D7, 0, 0, SkyPillar_Top_EventScript_23979A
-
-SkyPillar_Top_MapEvents:: @ 85371B8
-	map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc
deleted file mode 100644
index c429ae7f5..000000000
--- a/data/maps/events/SlateportCity.inc
+++ /dev/null
@@ -1,71 +0,0 @@
-SlateportCity_EventObjects: @ 85261CC
-	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 21, 11, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCED9, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 34, 29, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 13, 3, 2, 33, 0, 0, 0, SlateportCity_EventScript_1DCEB8, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882, 0, 0
-	object_event 6, EVENT_OBJ_GFX_COOK, 0, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 20, 37, 3, 1, 17, 0, 0, 0, SlateportCity_EventScript_1DCE63, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 0, 8, 42, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCE84, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835, 0, 0
-	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835, 0, 0
-	object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840, 0, 0
-	object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 0, 37, 41, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0, 0, 0
-	object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0, 0, 0
-	object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 9, 50, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFF7, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 0, 16, 46, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DD000, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 24, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFBB, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0, 0, 0
-	object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882, 0, 0
-	object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882, 0, 0
-	object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0, 0, 0
-	object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0, 0, 0
-	object_event 22, EVENT_OBJ_GFX_MAN_6, 0, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0, 0, 0
-	object_event 23, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0, 0, 0
-	object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 11, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DD1D8, 948, 0, 0
-	object_event 25, EVENT_OBJ_GFX_MAN_3, 0, 0, 5, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DCDBD, 0, 0, 0
-	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 22, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD04E, 882, 0, 0
-	object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD065, 882, 0, 0
-	object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 24, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD07C, 882, 0, 0
-	object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD093, 882, 0, 0
-	object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD0AA, 882, 0, 0
-	object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD0C1, 882, 0, 0
-	object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD14A, 882, 0, 0
-	object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD153, 882, 0, 0
-	object_event 34, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 11, 37, 3, 9, 33, 0, 0, 0, SlateportCity_EventScript_1DD36E, 0, 0, 0
-	object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 12, 0, 8, 33, 0, 0, 0, 0x0, 749, 0, 0
-
-SlateportCity_MapWarps: @ 8526514
-	warp_def 19, 19, 0, 0, SLATEPORT_CITY_POKEMON_CENTER_1F
-	warp_def 13, 26, 0, 0, SLATEPORT_CITY_MART
-	warp_def 26, 38, 0, 0, SLATEPORT_CITY_STERNS_SHIPYARD_1F
-	warp_def 10, 12, 0, 0, SLATEPORT_CITY_BATTLE_TENT_LOBBY
-	warp_def 4, 26, 0, 0, SLATEPORT_CITY_POKEMON_FAN_CLUB
-	warp_def 30, 26, 0, 0, SLATEPORT_CITY_OCEANIC_MUSEUM_1F
-	warp_def 5, 19, 0, 0, SLATEPORT_CITY_HOUSE_1
-	warp_def 31, 26, 0, 1, SLATEPORT_CITY_OCEANIC_MUSEUM_1F
-	warp_def 28, 12, 0, 0, SLATEPORT_CITY_HARBOR
-	warp_def 40, 7, 0, 2, SLATEPORT_CITY_HARBOR
-	warp_def 21, 44, 0, 0, SLATEPORT_CITY_HOUSE_2
-
-SlateportCity_MapCoordEvents: @ 852656C
-	coord_event 10, 13, 3, 0, VAR_0x40D2, 2, 0, SlateportCity_EventScript_1DD5DC
-
-SlateportCity_MapBGEvents: @ 852657C
-	bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_1DCFB2
-	bg_event 20, 19, 0, 1, 0, SlateportCity_EventScript_271E73
-	bg_event 21, 19, 0, 1, 0, SlateportCity_EventScript_271E73
-	bg_event 14, 26, 0, 1, 0, SlateportCity_EventScript_271E6A
-	bg_event 24, 12, 0, 0, 0, SlateportCity_EventScript_1DCF94
-	bg_event 15, 26, 0, 1, 0, SlateportCity_EventScript_271E6A
-	bg_event 14, 51, 0, 0, 0, SlateportCity_EventScript_1DCF8B
-	bg_event 26, 26, 0, 0, 0, SlateportCity_EventScript_1DCF79
-	bg_event 16, 22, 0, 0, 0, SlateportCity_EventScript_1DCF82
-	bg_event 8, 26, 0, 0, 0, SlateportCity_EventScript_1DCF70
-	bg_event 7, 13, 0, 0, 0, SlateportCity_EventScript_1DCF36
-	bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_1DCF3F
-	bg_event 10, 36, 0, 1, 0, SlateportCity_EventScript_1DD643
-
-SlateportCity_MapEvents:: @ 8526618
-	map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents
-
diff --git a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc b/data/maps/events/SlateportCity_BattleTentBattleRoom.inc
deleted file mode 100644
index f22969d2a..000000000
--- a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SlateportCity_BattleTentBattleRoom_EventObjects: @ 852F4DC
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524
-	map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/SlateportCity_BattleTentCorridor.inc b/data/maps/events/SlateportCity_BattleTentCorridor.inc
deleted file mode 100644
index 6b45c8e26..000000000
--- a/data/maps/events/SlateportCity_BattleTentCorridor.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-SlateportCity_BattleTentCorridor_MapEvents:: @ 852F4C8
-	map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/SlateportCity_BattleTentLobby.inc b/data/maps/events/SlateportCity_BattleTentLobby.inc
deleted file mode 100644
index 3368d1ba2..000000000
--- a/data/maps/events/SlateportCity_BattleTentLobby.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SlateportCity_BattleTentLobby_EventObjects: @ 852F408
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 1, 5, 3, 2, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 7, 3, 7, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 0, 1, 8, 3, 1, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 8, 3, 9, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0, 0, 0
-
-SlateportCity_BattleTentLobby_MapWarps: @ 852F480
-	warp_def 6, 9, 0, 3, SLATEPORT_CITY
-	warp_def 7, 9, 0, 3, SLATEPORT_CITY
-
-SlateportCity_BattleTentLobby_MapBGEvents: @ 852F490
-	bg_event 4, 5, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A99
-
-SlateportCity_BattleTentLobby_MapEvents:: @ 852F49C
-	map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents
-
diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc
deleted file mode 100644
index b7a767f3c..000000000
--- a/data/maps/events/SlateportCity_Harbor.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SlateportCity_Harbor_EventObjects: @ 852FA68
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905, 0, 0
-	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905, 0, 0
-	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 860, 0, 0
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, 845, 0, 0
-	object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, 846, 0, 0
-	object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848, 0, 0
-
-SlateportCity_Harbor_MapWarps: @ 852FB28
-	warp_def 11, 14, 0, 8, SLATEPORT_CITY
-	warp_def 12, 14, 0, 8, SLATEPORT_CITY
-	warp_def 19, 15, 0, 9, SLATEPORT_CITY
-	warp_def 20, 15, 0, 9, SLATEPORT_CITY
-
-SlateportCity_Harbor_MapCoordEvents: @ 852FB48
-	coord_event 8, 11, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9BB
-	coord_event 8, 12, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9C7
-	coord_event 8, 13, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9D3
-	coord_event 8, 14, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9DF
-
-SlateportCity_Harbor_MapEvents:: @ 852FB88
-	map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc
deleted file mode 100644
index 96bf5fba9..000000000
--- a/data/maps/events/SlateportCity_House1.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SlateportCity_House1_EventObjects: @ 852F538
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0, 0, 0
-
-SlateportCity_House1_MapWarps: @ 852F550
-	warp_def 3, 7, 0, 6, SLATEPORT_CITY
-	warp_def 4, 7, 0, 6, SLATEPORT_CITY
-
-SlateportCity_House1_MapEvents:: @ 852F560
-	map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc
deleted file mode 100644
index 4bd43a5d4..000000000
--- a/data/maps/events/SlateportCity_House2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SlateportCity_House2_EventObjects: @ 852FB9C
-	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0, 0, 0
-
-SlateportCity_House2_MapWarps: @ 852FBCC
-	warp_def 3, 7, 0, 10, SLATEPORT_CITY
-	warp_def 4, 7, 0, 10, SLATEPORT_CITY
-
-SlateportCity_House2_MapEvents:: @ 852FBDC
-	map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc
deleted file mode 100644
index c952cf34e..000000000
--- a/data/maps/events/SlateportCity_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SlateportCity_Mart_EventObjects: @ 852FCF0
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0, 0, 0
-
-SlateportCity_Mart_MapWarps: @ 852FD38
-	warp_def 3, 7, 0, 1, SLATEPORT_CITY
-	warp_def 4, 7, 0, 1, SLATEPORT_CITY
-
-SlateportCity_Mart_MapEvents:: @ 852FD48
-	map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
deleted file mode 100644
index 9f97d892d..000000000
--- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670
-	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883, 0, 0
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883, 0, 0
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883, 0, 0
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883, 0, 0
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883, 0, 0
-	object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883, 0, 0
-	object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 2, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961, 0, 0
-	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961, 0, 0
-	object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 0, 17, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961, 0, 0
-	object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 18, 8, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961, 0, 0
-	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 4, 3, 21, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965, 0, 0
-	object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961, 0, 0
-
-SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0
-	warp_def 9, 8, 0, 5, SLATEPORT_CITY
-	warp_def 10, 8, 0, 7, SLATEPORT_CITY
-	warp_def 6, 1, 0, 0, SLATEPORT_CITY_OCEANIC_MUSEUM_2F
-
-SlateportCity_OceanicMuseum_1F_MapCoordEvents: @ 852F7D8
-	coord_event 9, 7, 3, 0, VAR_0x40AA, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F
-	coord_event 10, 7, 3, 0, VAR_0x40AA, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20ADB0
-
-SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8
-	bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE83
-	bg_event 2, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE8C
-	bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE95
-	bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E
-	bg_event 10, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE95
-	bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E
-	bg_event 15, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEA7
-	bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEB0
-	bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEB9
-	bg_event 2, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2
-	bg_event 3, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2
-	bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AECB
-	bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AECB
-
-SlateportCity_OceanicMuseum_1F_MapEvents:: @ 852F894
-	map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents
-
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
deleted file mode 100644
index 4bad8a43d..000000000
--- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887, 0, 0
-	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 886, 0, 0
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 884, 0, 0
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 885, 0, 0
-	object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 12, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961, 0, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 9, 6, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961, 0, 0
-	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961, 0, 0
-
-SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950
-	warp_def 6, 1, 0, 2, SLATEPORT_CITY_OCEANIC_MUSEUM_1F
-
-SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958
-	bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A
-	bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD13
-	bg_event 4, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD52
-	bg_event 4, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD52
-	bg_event 3, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
-	bg_event 2, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
-	bg_event 3, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
-	bg_event 3, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
-	bg_event 4, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
-	bg_event 13, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B
-	bg_event 14, 7, 3, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B
-	bg_event 18, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD37
-	bg_event 19, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD37
-	bg_event 15, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E
-	bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E
-	bg_event 8, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD25
-	bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD25
-	bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C
-	bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C
-	bg_event 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
-	bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
-
-SlateportCity_OceanicMuseum_2F_MapEvents:: @ 852FA54
-	map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents
-
diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc
deleted file mode 100644
index 4a6335695..000000000
--- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0, 0, 0
-
-SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38
-	warp_def 7, 8, 3, 0, SLATEPORT_CITY
-	warp_def 6, 8, 3, 0, SLATEPORT_CITY
-	warp_def 1, 6, 4, 0, SLATEPORT_CITY_POKEMON_CENTER_2F
-
-SlateportCity_PokemonCenter_1F_MapEvents:: @ 852FC50
-	map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/events/SlateportCity_PokemonCenter_2F.inc
deleted file mode 100644
index 43938e550..000000000
--- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-
-SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4
-	warp_def 1, 6, 4, 2, SLATEPORT_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-SlateportCity_PokemonCenter_2F_MapEvents:: @ 852FCDC
-	map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc
deleted file mode 100644
index db5a8b97c..000000000
--- a/data/maps/events/SlateportCity_PokemonFanClub.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SlateportCity_PokemonFanClub_EventObjects: @ 852F574
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 1, 5, 0, 3, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 3, 9, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 0, 11, 8, 0, 9, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0, 0, 0
-
-SlateportCity_PokemonFanClub_MapWarps: @ 852F64C
-	warp_def 6, 10, 0, 4, SLATEPORT_CITY
-	warp_def 7, 10, 0, 4, SLATEPORT_CITY
-
-SlateportCity_PokemonFanClub_MapEvents:: @ 852F65C
-	map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc
deleted file mode 100644
index 6169dad1b..000000000
--- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 11, 3, 2, 33, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869, 0, 0
-
-SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378
-	warp_def 2, 14, 0, 2, SLATEPORT_CITY
-	warp_def 3, 14, 0, 2, SLATEPORT_CITY
-	warp_def 3, 1, 0, 0, SLATEPORT_CITY_STERNS_SHIPYARD_2F
-
-SlateportCity_SternsShipyard_1F_MapEvents:: @ 852F390
-	map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/events/SlateportCity_SternsShipyard_2F.inc
deleted file mode 100644
index 8224ed8ff..000000000
--- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0, 0, 0
-
-SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC
-	warp_def 3, 1, 0, 2, SLATEPORT_CITY_STERNS_SHIPYARD_1F
-
-SlateportCity_SternsShipyard_2F_MapEvents:: @ 852F3F4
-	map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc
deleted file mode 100644
index acb70f285..000000000
--- a/data/maps/events/SootopolisCity.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-SootopolisCity_EventObjects: @ 8527314
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 31, 18, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 47, 33, 0, 9, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839, 0, 0
-	object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 0, 20, 36, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6166, 973, 0, 0
-	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 49, 34, 3, 3, 17, 0, 0, 0, SootopolisCity_EventScript_1E6038, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 0, 28, 44, 0, 80, 17, 0, 0, 0, 0x0, 998, 0, 0
-	object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 0, 34, 44, 1, 79, 17, 0, 0, 0, 0x0, 997, 0, 0
-	object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 0, 31, 41, 1, 10, 17, 0, 0, 0, 0x0, 996, 0, 0
-	object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 0, 17, 44, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6411, 854, 0, 0
-	object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 0, 14, 42, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E63DB, 854, 0, 0
-	object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 17, 40, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6393, 854, 0, 0
-	object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 0, 19, 37, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E635D, 854, 0, 0
-	object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 0, 29, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E64F2, 827, 0, 0
-	object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 0, 31, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E651F, 826, 0, 0
-	object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 0, 31, 18, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6446, 816, 0, 0
-
-SootopolisCity_MapWarps: @ 85274C4
-	warp_def 43, 31, 0, 0, SOOTOPOLIS_CITY_POKEMON_CENTER_1F
-	warp_def 17, 29, 0, 0, SOOTOPOLIS_CITY_MART
-	warp_def 31, 32, 0, 0, SOOTOPOLIS_CITY_GYM_1F
-	warp_def 31, 16, 3, 0, CAVE_OF_ORIGIN_ENTRANCE
-	warp_def 9, 6, 0, 0, SOOTOPOLIS_CITY_HOUSE_1
-	warp_def 45, 6, 0, 0, SOOTOPOLIS_CITY_HOUSE_2
-	warp_def 9, 17, 0, 0, SOOTOPOLIS_CITY_HOUSE_3
-	warp_def 44, 17, 0, 0, SOOTOPOLIS_CITY_HOUSE_4
-	warp_def 9, 26, 0, 0, SOOTOPOLIS_CITY_HOUSE_5
-	warp_def 53, 28, 0, 0, SOOTOPOLIS_CITY_HOUSE_6
-	warp_def 8, 35, 0, 0, SOOTOPOLIS_CITY_HOUSE_7
-	warp_def 48, 25, 0, 0, SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE
-	warp_def 51, 36, 0, 0, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F
-
-SootopolisCity_MapBGEvents: @ 852752C
-	bg_event 33, 34, 3, 0, 0, SootopolisCity_EventScript_1E614B
-	bg_event 19, 29, 0, 1, 0, SootopolisCity_EventScript_271E6A
-	bg_event 44, 31, 0, 1, 0, SootopolisCity_EventScript_271E73
-	bg_event 45, 31, 0, 1, 0, SootopolisCity_EventScript_271E73
-	bg_event 18, 29, 0, 1, 0, SootopolisCity_EventScript_271E6A
-	bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_1E6154
-
-SootopolisCity_MapEvents:: @ 8527574
-	map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents
-
diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc
deleted file mode 100644
index 60e02f3fb..000000000
--- a/data/maps/events/SootopolisCity_Gym_1F.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SootopolisCity_Gym_1F_EventObjects: @ 8532FF4
-	object_event 1, EVENT_OBJ_GFX_JUAN, 0, 0, 8, 2, 0, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0, 0, 0
-
-SootopolisCity_Gym_1F_MapWarps: @ 8533024
-	warp_def 8, 25, 0, 2, SOOTOPOLIS_CITY
-	warp_def 9, 25, 0, 2, SOOTOPOLIS_CITY
-	warp_def 11, 22, 3, 0, SOOTOPOLIS_CITY_GYM_B1F
-
-SootopolisCity_Gym_1F_MapBGEvents: @ 853303C
-	bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_22505F
-	bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_22506F
-
-SootopolisCity_Gym_1F_MapEvents:: @ 8533054
-	map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents
-
diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc
deleted file mode 100644
index 1d490490d..000000000
--- a/data/maps/events/SootopolisCity_Gym_B1F.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SootopolisCity_Gym_B1F_EventObjects: @ 8533068
-	object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 7, 17, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 0, 9, 19, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 11, 9, 0, 7, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 0, 5, 6, 3, 8, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0, 0, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 4, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 0, 9, 7, 3, 8, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 13, 3, 10, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0, 0, 0
-	object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 13, 3, 9, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0, 0, 0
-
-SootopolisCity_Gym_B1F_MapWarps: @ 8533158
-	warp_def 11, 22, 3, 2, SOOTOPOLIS_CITY_GYM_1F
-
-SootopolisCity_Gym_B1F_MapEvents:: @ 8533160
-	map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc
deleted file mode 100644
index eaaf2d334..000000000
--- a/data/maps/events/SootopolisCity_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_House1_EventObjects: @ 85332F8
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0, 0, 0
-
-SootopolisCity_House1_MapWarps: @ 8533328
-	warp_def 3, 6, 0, 4, SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 4, SOOTOPOLIS_CITY
-
-SootopolisCity_House1_MapEvents:: @ 8533338
-	map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc
deleted file mode 100644
index d00a1fa5f..000000000
--- a/data/maps/events/SootopolisCity_House2.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SootopolisCity_House2_EventObjects: @ 853334C
-	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0, 0, 0
-
-SootopolisCity_House2_MapWarps: @ 8533364
-	warp_def 3, 6, 0, 5, SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 5, SOOTOPOLIS_CITY
-
-SootopolisCity_House2_MapEvents:: @ 8533374
-	map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc
deleted file mode 100644
index b6407478c..000000000
--- a/data/maps/events/SootopolisCity_House3.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_House3_EventObjects: @ 8533388
-	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0, 0, 0
-
-SootopolisCity_House3_MapWarps: @ 85333B8
-	warp_def 3, 6, 0, 6, SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 6, SOOTOPOLIS_CITY
-
-SootopolisCity_House3_MapEvents:: @ 85333C8
-	map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc
deleted file mode 100644
index 223cc4f0d..000000000
--- a/data/maps/events/SootopolisCity_House4.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SootopolisCity_House4_EventObjects: @ 85333DC
-	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 5, 2, 3, 7, 33, 0, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, SootopolisCity_House4_EventScript_226D28, 0, 0, 0
-
-SootopolisCity_House4_MapWarps: @ 8533424
-	warp_def 3, 6, 0, 7, SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 7, SOOTOPOLIS_CITY
-
-SootopolisCity_House4_MapEvents:: @ 8533434
-	map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc
deleted file mode 100644
index 66a804c1a..000000000
--- a/data/maps/events/SootopolisCity_House5.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_House5_EventObjects: @ 8533448
-	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0, 0, 0
-
-SootopolisCity_House5_MapWarps: @ 8533478
-	warp_def 3, 6, 0, 8, SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 8, SOOTOPOLIS_CITY
-
-SootopolisCity_House5_MapEvents:: @ 8533488
-	map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc
deleted file mode 100644
index 2c27b4ef2..000000000
--- a/data/maps/events/SootopolisCity_House6.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SootopolisCity_House6_EventObjects: @ 853349C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 4, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0, 0, 0
-
-SootopolisCity_House6_MapWarps: @ 85334B4
-	warp_def 3, 6, 0, 9, SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 9, SOOTOPOLIS_CITY
-
-SootopolisCity_House6_MapEvents:: @ 85334C4
-	map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc
deleted file mode 100644
index fbbbc5579..000000000
--- a/data/maps/events/SootopolisCity_House7.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_House7_EventObjects: @ 85334D8
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0, 0, 0
-
-SootopolisCity_House7_MapWarps: @ 8533508
-	warp_def 3, 6, 0, 10, SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 10, SOOTOPOLIS_CITY
-
-SootopolisCity_House7_MapEvents:: @ 8533518
-	map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc
deleted file mode 100644
index ffd6fe203..000000000
--- a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C
-	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0, 0, 0
-
-SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C
-	warp_def 3, 6, 0, 11, SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 11, SOOTOPOLIS_CITY
-
-SootopolisCity_LotadAndSeedotHouse_MapBGEvents: @ 853356C
-	bg_event 5, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D
-	bg_event 2, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B
-
-SootopolisCity_LotadAndSeedotHouse_MapEvents:: @ 8533584
-	map_events SootopolisCity_LotadAndSeedotHouse_EventObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents
-
diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc
deleted file mode 100644
index 30ff85620..000000000
--- a/data/maps/events/SootopolisCity_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SootopolisCity_Mart_EventObjects: @ 853328C
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0, 0, 0
-
-SootopolisCity_Mart_MapWarps: @ 85332D4
-	warp_def 3, 7, 0, 1, SOOTOPOLIS_CITY
-	warp_def 4, 7, 0, 1, SOOTOPOLIS_CITY
-
-SootopolisCity_Mart_MapEvents:: @ 85332E4
-	map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc
deleted file mode 100644
index f6efd8225..000000000
--- a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0, 0, 0
-
-SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0
-	warp_def 3, 7, 0, 12, SOOTOPOLIS_CITY
-	warp_def 4, 7, 0, 12, SOOTOPOLIS_CITY
-	warp_def 3, 1, 3, 0, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F
-
-SootopolisCity_MysteryEventsHouse_1F_MapEvents:: @ 85335C8
-	map_events SootopolisCity_MysteryEventsHouse_1F_EventObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc
deleted file mode 100644
index faec348c2..000000000
--- a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC
-	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4
-	warp_def 3, 1, 0, 2, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F
-
-SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: @ 85335FC
-	map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
deleted file mode 100644
index afb2d586b..000000000
--- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 2, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0, 0, 0
-
-SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4
-	warp_def 7, 8, 3, 0, SOOTOPOLIS_CITY
-	warp_def 6, 8, 3, 0, SOOTOPOLIS_CITY
-	warp_def 1, 6, 4, 0, SOOTOPOLIS_CITY_POKEMON_CENTER_2F
-
-SootopolisCity_PokemonCenter_1F_MapEvents:: @ 85331EC
-	map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
deleted file mode 100644
index 21be152fa..000000000
--- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-
-SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260
-	warp_def 1, 6, 4, 2, SOOTOPOLIS_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-SootopolisCity_PokemonCenter_2F_MapEvents:: @ 8533278
-	map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc
deleted file mode 100644
index 11cc35658..000000000
--- a/data/maps/events/SouthernIsland_Exterior.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SouthernIsland_Exterior_EventObjects: @ 853B83C
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-SouthernIsland_Exterior_MapWarps: @ 853B86C
-	warp_def 14, 5, 3, 0, SOUTHERN_ISLAND_INTERIOR
-	warp_def 15, 5, 3, 1, SOUTHERN_ISLAND_INTERIOR
-
-SouthernIsland_Exterior_MapBGEvents: @ 853B87C
-	bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_242A3C
-
-SouthernIsland_Exterior_MapEvents:: @ 853B888
-	map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents
-
diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc
deleted file mode 100644
index 6a89414b2..000000000
--- a/data/maps/events/SouthernIsland_Interior.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SouthernIsland_Interior_EventObjects: @ 853B89C
-	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, 910, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TRADER, 0, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911, 0, 0
-
-SouthernIsland_Interior_MapWarps: @ 853B8CC
-	warp_def 13, 18, 3, 0, SOUTHERN_ISLAND_EXTERIOR
-	warp_def 14, 18, 3, 1, SOUTHERN_ISLAND_EXTERIOR
-
-SouthernIsland_Interior_MapBGEvents: @ 853B8DC
-	bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_242AC4
-
-SouthernIsland_Interior_MapEvents:: @ 853B8E8
-	map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents
-
diff --git a/data/maps/events/TerraCave_End.inc b/data/maps/events/TerraCave_End.inc
deleted file mode 100644
index 88dbdf09a..000000000
--- a/data/maps/events/TerraCave_End.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-TerraCave_End_EventObjects: @ 8537850
-	object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 0, 17, 22, 1, 8, 17, 0, 0, 0, 0x0, 783, 0, 0
-
-TerraCave_End_MapWarps: @ 8537868
-	warp_def 5, 4, 3, 1, TERRA_CAVE_ENTRANCE
-
-TerraCave_End_MapCoordEvents: @ 8537870
-	coord_event 17, 26, 3, 0, VAR_TEMP_1, 1, 0, TerraCave_End_EventScript_23B0EC
-
-TerraCave_End_MapEvents:: @ 8537880
-	map_events TerraCave_End_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/TerraCave_Entrance.inc b/data/maps/events/TerraCave_Entrance.inc
deleted file mode 100644
index 3cea5a7c6..000000000
--- a/data/maps/events/TerraCave_Entrance.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-TerraCave_Entrance_MapWarps: @ 853782C
-	warp_def 8, 18, 0, 127, NONE
-	warp_def 14, 1, 3, 0, TERRA_CAVE_END
-
-TerraCave_Entrance_MapEvents:: @ 853783C
-	map_events 0x0, TerraCave_Entrance_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc
deleted file mode 100644
index 25dbd3139..000000000
--- a/data/maps/events/TradeCenter.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-TradeCenter_EventObjects: @ 8539DA0
-	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0, 0, 0
-
-TradeCenter_MapWarps: @ 8539DB8
-	warp_def 5, 8, 3, 127, NONE
-	warp_def 6, 8, 3, 127, NONE
-
-TradeCenter_MapCoordEvents: @ 8539DC8
-	coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773F5
-	coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773FF
-
-TradeCenter_MapEvents:: @ 8539DE8
-	map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/TrainerHill_1F.inc b/data/maps/events/TrainerHill_1F.inc
deleted file mode 100644
index ae8fecee7..000000000
--- a/data/maps/events/TrainerHill_1F.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-TrainerHill_1F_MapWarps: @ 853D934
-	warp_def 2, 1, 3, 2, TRAINER_HILL_ENTRANCE
-	warp_def 12, 1, 3, 0, TRAINER_HILL_2F
-
-TrainerHill_1F_MapEvents:: @ 853D944
-	map_events 0x0, TrainerHill_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/TrainerHill_2F.inc b/data/maps/events/TrainerHill_2F.inc
deleted file mode 100644
index dc0e071a2..000000000
--- a/data/maps/events/TrainerHill_2F.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-TrainerHill_2F_MapWarps: @ 853D958
-	warp_def 2, 1, 3, 1, TRAINER_HILL_1F
-	warp_def 12, 1, 3, 0, TRAINER_HILL_3F
-
-TrainerHill_2F_MapEvents:: @ 853D968
-	map_events 0x0, TrainerHill_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/TrainerHill_3F.inc b/data/maps/events/TrainerHill_3F.inc
deleted file mode 100644
index c022f16d2..000000000
--- a/data/maps/events/TrainerHill_3F.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-TrainerHill_3F_MapWarps: @ 853D97C
-	warp_def 2, 1, 3, 1, TRAINER_HILL_2F
-	warp_def 12, 1, 3, 0, TRAINER_HILL_4F
-
-TrainerHill_3F_MapEvents:: @ 853D98C
-	map_events 0x0, TrainerHill_3F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/TrainerHill_4F.inc b/data/maps/events/TrainerHill_4F.inc
deleted file mode 100644
index 7007a69a7..000000000
--- a/data/maps/events/TrainerHill_4F.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-TrainerHill_4F_MapWarps: @ 853D9A0
-	warp_def 2, 1, 3, 1, TRAINER_HILL_3F
-	warp_def 12, 1, 3, 0, TRAINER_HILL_ROOF
-
-TrainerHill_4F_MapEvents:: @ 853D9B0
-	map_events 0x0, TrainerHill_4F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/TrainerHill_Elevator.inc b/data/maps/events/TrainerHill_Elevator.inc
deleted file mode 100644
index 0a84d3b51..000000000
--- a/data/maps/events/TrainerHill_Elevator.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-TrainerHill_Elevator_EventObjects: @ 853DD84
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 6, 3, 8, 17, 0, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0, 0, 0
-
-TrainerHill_Elevator_MapWarps: @ 853DD9C
-	warp_def 1, 6, 3, 1, TRAINER_HILL_ROOF
-	warp_def 2, 6, 3, 1, TRAINER_HILL_ROOF
-
-TrainerHill_Elevator_MapEvents:: @ 853DDAC
-	map_events TrainerHill_Elevator_EventObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/TrainerHill_Entrance.inc b/data/maps/events/TrainerHill_Entrance.inc
deleted file mode 100644
index 832ab5838..000000000
--- a/data/maps/events/TrainerHill_Entrance.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-TrainerHill_Entrance_EventObjects: @ 853D874
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 6, 3, 9, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_NURSE, 0, 0, 4, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 14, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 14, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 15, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_268391, 0, 0, 0
-
-TrainerHill_Entrance_MapWarps: @ 853D8EC
-	warp_def 9, 16, 3, 4, ROUTE_111
-	warp_def 10, 16, 3, 4, ROUTE_111
-	warp_def 9, 1, 3, 0, TRAINER_HILL_1F
-
-TrainerHill_Entrance_MapCoordEvents: @ 853D904
-	coord_event 9, 6, 3, 0, VAR_0x40D6, 0, 0, TrainerHill_Entrance_EventScript_268229
-
-TrainerHill_Entrance_MapBGEvents: @ 853D914
-	bg_event 8, 10, 0, 1, 0, TrainerHill_Entrance_EventScript_268388
-
-TrainerHill_Entrance_MapEvents:: @ 853D920
-	map_events TrainerHill_Entrance_EventObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents
-
diff --git a/data/maps/events/TrainerHill_Roof.inc b/data/maps/events/TrainerHill_Roof.inc
deleted file mode 100644
index 1ae00b9a2..000000000
--- a/data/maps/events/TrainerHill_Roof.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-TrainerHill_Roof_EventObjects: @ 853D9C4
-	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 7, 3, 8, 17, 0, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0, 0, 0
-
-TrainerHill_Roof_MapWarps: @ 853D9DC
-	warp_def 9, 5, 3, 1, TRAINER_HILL_4F
-	warp_def 15, 5, 0, 1, TRAINER_HILL_ELEVATOR
-
-TrainerHill_Roof_MapEvents:: @ 853D9EC
-	map_events TrainerHill_Roof_EventObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Underwater2.inc b/data/maps/events/Underwater2.inc
deleted file mode 100644
index 097dbdc65..000000000
--- a/data/maps/events/Underwater2.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Underwater2_MapWarps: @ 852CF1C
-	warp_def 45, 65, 0, 0, UNDERWATER_SOOTOPOLIS_CITY
-
-Underwater2_MapBGEvents: @ 852CF24
-	bg_event 30, 17, 3, 7, 0, ITEM_HEART_SCALE, 14, 0
-	bg_event 41, 19, 3, 7, 0, ITEM_ULTRA_BALL, 15, 0
-	bg_event 63, 19, 3, 7, 0, ITEM_STARDUST, 16, 0
-	bg_event 10, 36, 3, 7, 0, ITEM_PEARL, 17, 0
-	bg_event 11, 39, 3, 7, 0, ITEM_IRON, 19, 0
-	bg_event 12, 35, 3, 7, 0, ITEM_YELLOW_SHARD, 18, 0
-	bg_event 65, 60, 3, 7, 0, ITEM_BIG_PEARL, 20, 0
-	bg_event 9, 77, 3, 7, 0, ITEM_BLUE_SHARD, 12, 0
-
-Underwater2_MapEvents:: @ 852CF84
-	map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents
-
diff --git a/data/maps/events/Underwater3.inc b/data/maps/events/Underwater3.inc
deleted file mode 100644
index 66b7b8758..000000000
--- a/data/maps/events/Underwater3.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-Underwater3_MapWarps: @ 852CF98
-	warp_def 57, 5, 0, 0, UNDERWATER_MARINE_CAVE
-	warp_def 67, 38, 0, 0, UNDERWATER_MARINE_CAVE
-
-Underwater3_MapBGEvents: @ 852CFA8
-	bg_event 12, 42, 3, 7, 0, ITEM_STAR_PIECE, 21, 0
-	bg_event 50, 36, 3, 7, 0, ITEM_HP_UP, 22, 0
-	bg_event 34, 72, 3, 7, 0, ITEM_HEART_SCALE, 23, 0
-	bg_event 72, 20, 3, 7, 0, ITEM_RED_SHARD, 24, 0
-
-Underwater3_MapEvents:: @ 852CFD8
-	map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents
-
diff --git a/data/maps/events/Underwater4.inc b/data/maps/events/Underwater4.inc
deleted file mode 100644
index b1846f1aa..000000000
--- a/data/maps/events/Underwater4.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Underwater4_MapWarps: @ 852CFEC
-	warp_def 38, 26, 3, 0, UNDERWATER_SEAFLOOR_CAVERN
-
-Underwater4_MapBGEvents: @ 852CFF4
-	bg_event 38, 19, 3, 7, 0, ITEM_PROTEIN, 25, 0
-	bg_event 69, 18, 3, 7, 0, ITEM_PEARL, 26, 0
-
-Underwater4_MapEvents:: @ 852D00C
-	map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents
-
diff --git a/data/maps/events/Underwater5.inc b/data/maps/events/Underwater5.inc
deleted file mode 100644
index 7f72f3771..000000000
--- a/data/maps/events/Underwater5.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Underwater5_MapWarps: @ 852D020
-	warp_def 26, 3, 0, 0, UNDERWATER_MARINE_CAVE
-	warp_def 32, 21, 0, 0, UNDERWATER_MARINE_CAVE
-
-Underwater5_MapEvents:: @ 852D030
-	map_events 0x0, Underwater5_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Underwater6.inc b/data/maps/events/Underwater6.inc
deleted file mode 100644
index ba5883d7c..000000000
--- a/data/maps/events/Underwater6.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Underwater6_MapWarps: @ 852D044
-	warp_def 13, 4, 0, 0, UNDERWATER_MARINE_CAVE
-	warp_def 17, 66, 0, 0, UNDERWATER_MARINE_CAVE
-
-Underwater6_MapEvents:: @ 852D054
-	map_events 0x0, Underwater6_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Underwater7.inc b/data/maps/events/Underwater7.inc
deleted file mode 100644
index 0841a343e..000000000
--- a/data/maps/events/Underwater7.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Underwater7_MapWarps: @ 852D068
-	warp_def 22, 10, 0, 0, UNDERWATER_MARINE_CAVE
-	warp_def 45, 30, 0, 0, UNDERWATER_MARINE_CAVE
-
-Underwater7_MapEvents:: @ 852D078
-	map_events 0x0, Underwater7_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Underwater_MarineCave.inc b/data/maps/events/Underwater_MarineCave.inc
deleted file mode 100644
index 9266cc5c3..000000000
--- a/data/maps/events/Underwater_MarineCave.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-Underwater_MarineCave_MapWarps: @ 85377B0
-	warp_def 9, 8, 0, 127, NONE
-
-Underwater_MarineCave_MapEvents:: @ 85377B8
-	map_events 0x0, Underwater_MarineCave_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/events/Underwater_Route134.inc
deleted file mode 100644
index 03ed08535..000000000
--- a/data/maps/events/Underwater_Route134.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-Underwater_Route134_MapWarps: @ 8536D44
-	warp_def 8, 8, 0, 0, UNDERWATER_SEALED_CHAMBER
-
-Underwater_Route134_MapEvents:: @ 8536D4C
-	map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc
deleted file mode 100644
index 0bf82c217..000000000
--- a/data/maps/events/Underwater_SeafloorCavern.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Underwater_SeafloorCavern_EventObjects: @ 8535640
-	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
-	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
-	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
-	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
-
-Underwater_SeafloorCavern_MapWarps: @ 85356A0
-	warp_def 6, 7, 0, 0, UNDERWATER_4
-
-Underwater_SeafloorCavern_MapEvents:: @ 85356A8
-	map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/events/Underwater_SealedChamber.inc
deleted file mode 100644
index 9ef7be29e..000000000
--- a/data/maps/events/Underwater_SealedChamber.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Underwater_SealedChamber_MapWarps: @ 8536D60
-	warp_def 7, 1, 0, 0, UNDERWATER_ROUTE_134
-
-Underwater_SealedChamber_MapBGEvents: @ 8536D68
-	bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_2390FC
-
-Underwater_SealedChamber_MapEvents:: @ 8536D74
-	map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents
-
diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/events/Underwater_SootopolisCity.inc
deleted file mode 100644
index 4b0cda4eb..000000000
--- a/data/maps/events/Underwater_SootopolisCity.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Underwater_SootopolisCity_MapWarps: @ 8534330
-	warp_def 9, 8, 0, 0, UNDERWATER_2
-	warp_def 10, 8, 0, 0, UNDERWATER_2
-
-Underwater_SootopolisCity_MapEvents:: @ 8534340
-	map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/UnionRoom.inc b/data/maps/events/UnionRoom.inc
deleted file mode 100644
index c79b11f5d..000000000
--- a/data/maps/events/UnionRoom.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-UnionRoom_EventObjects: @ 853B020
-	object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 0, 1, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D204, 706, 0, 0
-	object_event 3, 247, 0, 0, 7, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D22C, 710, 0, 0
-	object_event 4, 246, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D222, 709, 0, 0
-	object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D218, 708, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D20E, 707, 0, 0
-	object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 10, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1FA, 705, 0, 0
-	object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 13, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1F0, 704, 0, 0
-	object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1E6, 703, 0, 0
-
-UnionRoom_MapWarps: @ 853B0F8
-	warp_def 7, 11, 3, 127, NONE
-	warp_def 8, 11, 3, 127, NONE
-
-UnionRoom_MapEvents:: @ 853B108
-	map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc
deleted file mode 100644
index c30969657..000000000
--- a/data/maps/events/VerdanturfTown.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-VerdanturfTown_EventObjects: @ 8527CDC
-	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 7, 11, 3, 3, 16, 0, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0, 0, 0
-
-VerdanturfTown_MapWarps: @ 8527D3C
-	warp_def 3, 7, 0, 0, VERDANTURF_TOWN_BATTLE_TENT_LOBBY
-	warp_def 12, 3, 0, 0, VERDANTURF_TOWN_MART
-	warp_def 16, 3, 0, 0, VERDANTURF_TOWN_POKEMON_CENTER_1F
-	warp_def 10, 14, 0, 0, VERDANTURF_TOWN_WANDAS_HOUSE
-	warp_def 8, 1, 0, 1, RUSTURF_TUNNEL
-	warp_def 1, 14, 0, 0, VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE
-	warp_def 17, 15, 0, 0, VERDANTURF_TOWN_HOUSE
-
-VerdanturfTown_MapBGEvents: @ 8527D74
-	bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_271E6A
-	bg_event 14, 6, 0, 0, 0, VerdanturfTown_EventScript_1EB5D9
-	bg_event 17, 3, 0, 1, 0, VerdanturfTown_EventScript_271E73
-	bg_event 7, 14, 0, 0, 0, VerdanturfTown_EventScript_1EB5E2
-	bg_event 13, 3, 0, 1, 0, VerdanturfTown_EventScript_271E6A
-	bg_event 18, 3, 0, 1, 0, VerdanturfTown_EventScript_271E73
-	bg_event 1, 8, 0, 0, 0, VerdanturfTown_EventScript_1EB5EB
-	bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_1EB5F4
-
-VerdanturfTown_MapEvents:: @ 8527DD4
-	map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents
-
diff --git a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc b/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc
deleted file mode 100644
index 20597089a..000000000
--- a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734
-	object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C
-	map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc b/data/maps/events/VerdanturfTown_BattleTentCorridor.inc
deleted file mode 100644
index 539cf8b11..000000000
--- a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-
-VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720
-	map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/VerdanturfTown_BattleTentLobby.inc b/data/maps/events/VerdanturfTown_BattleTentLobby.inc
deleted file mode 100644
index 3f5ea9c68..000000000
--- a/data/maps/events/VerdanturfTown_BattleTentLobby.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648
-	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 0, 9, 7, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 1, 8, 3, 10, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 12, 6, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766, 0, 0
-	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 2, 8, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0, 0, 0
-
-VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8
-	warp_def 6, 9, 0, 0, VERDANTURF_TOWN
-	warp_def 7, 9, 0, 0, VERDANTURF_TOWN
-
-VerdanturfTown_BattleTentLobby_MapBGEvents: @ 852E6E8
-	bg_event 4, 5, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201B02
-
-VerdanturfTown_BattleTentLobby_MapEvents:: @ 852E6F4
-	map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents
-
diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
deleted file mode 100644
index 03cf2de7a..000000000
--- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8
-	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0, 0, 0
-
-VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8
-	warp_def 3, 7, 0, 5, VERDANTURF_TOWN
-	warp_def 4, 7, 0, 5, VERDANTURF_TOWN
-
-VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 852EA08
-	map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc
deleted file mode 100644
index 0f37fe20b..000000000
--- a/data/maps/events/VerdanturfTown_House.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-VerdanturfTown_House_EventObjects: @ 852EA1C
-	object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0, 0, 0
-
-VerdanturfTown_House_MapWarps: @ 852EA4C
-	warp_def 3, 8, 0, 6, VERDANTURF_TOWN
-	warp_def 4, 8, 0, 6, VERDANTURF_TOWN
-
-VerdanturfTown_House_MapEvents:: @ 852EA5C
-	map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc
deleted file mode 100644
index 551126235..000000000
--- a/data/maps/events/VerdanturfTown_Mart.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-VerdanturfTown_Mart_EventObjects: @ 852E790
-	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 3, 2, 3, 9, 17, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0, 0, 0
-
-VerdanturfTown_Mart_MapWarps: @ 852E7F0
-	warp_def 3, 7, 0, 1, VERDANTURF_TOWN
-	warp_def 4, 7, 0, 1, VERDANTURF_TOWN
-
-VerdanturfTown_Mart_MapEvents:: @ 852E800
-	map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
deleted file mode 100644
index d17513fd5..000000000
--- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814
-	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0, 0, 0
-
-VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874
-	warp_def 7, 8, 3, 2, VERDANTURF_TOWN
-	warp_def 6, 8, 3, 2, VERDANTURF_TOWN
-	warp_def 1, 6, 4, 0, VERDANTURF_TOWN_POKEMON_CENTER_2F
-
-VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 852E88C
-	map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
deleted file mode 100644
index 4fcbd0e08..000000000
--- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0
-	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-
-VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900
-	warp_def 1, 6, 4, 2, VERDANTURF_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, UNION_ROOM
-	warp_def 9, 1, 3, 0, TRADE_CENTER
-
-VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 852E918
-	map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc
deleted file mode 100644
index 070092679..000000000
--- a/data/maps/events/VerdanturfTown_WandasHouse.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-VerdanturfTown_WandasHouse_EventObjects: @ 852E92C
-	object_event 1, EVENT_OBJ_GFX_WALLY, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806, 0, 0
-	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984, 0, 0
-
-VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4
-	warp_def 7, 7, 0, 3, VERDANTURF_TOWN
-	warp_def 8, 7, 0, 3, VERDANTURF_TOWN
-
-VerdanturfTown_WandasHouse_MapEvents:: @ 852E9B4
-	map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc
deleted file mode 100644
index 511782688..000000000
--- a/data/maps/events/VictoryRoad_1F.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-VictoryRoad_1F_EventObjects: @ 8535E04
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WALLY, 0, 0, 12, 25, 4, 8, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 40, 26, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291483, 1084, 0, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 39, 4, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291490, 1085, 0, 0
-	object_event 7, EVENT_OBJ_GFX_WALLY, 0, 0, 31, 9, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E35, 751, 0, 0
-	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 29, 17, 3, 10, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0, 0, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 32, 17, 3, 9, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0, 0, 0
-
-VictoryRoad_1F_MapWarps: @ 8535EDC
-	warp_def 15, 40, 3, 2, EVER_GRANDE_CITY
-	warp_def 39, 5, 3, 3, EVER_GRANDE_CITY
-	warp_def 21, 32, 3, 5, VICTORY_ROAD_B1F
-	warp_def 42, 38, 4, 2, VICTORY_ROAD_B1F
-	warp_def 9, 14, 4, 4, VICTORY_ROAD_B1F
-
-VictoryRoad_1F_MapCoordEvents: @ 8535F04
-	coord_event 2, 23, 4, 0, VAR_0x40C3, 0, 0, VictoryRoad_1F_EventScript_235DAF
-	coord_event 3, 23, 4, 0, VAR_0x40C3, 0, 0, VictoryRoad_1F_EventScript_235DC8
-
-VictoryRoad_1F_MapBGEvents: @ 8535F24
-	bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0
-
-VictoryRoad_1F_MapEvents:: @ 8535F30
-	map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents
-
diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc
deleted file mode 100644
index b251959ae..000000000
--- a/data/maps/events/VictoryRoad_B1F.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-VictoryRoad_B1F_EventObjects: @ 8535F44
-	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19, 0, 0
-	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20, 0, 0
-	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17, 0, 0
-	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 10, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18, 0, 0
-	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23, 0, 0
-	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22, 0, 0
-	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 35, 6, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30, 0, 0
-	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25, 0, 0
-	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26, 0, 0
-	object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 12, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27, 0, 0
-	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28, 0, 0
-	object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 21, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29, 0, 0
-	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 34, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31, 0, 0
-	object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0, 0, 0
-	object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0, 0, 0
-	object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0, 0, 0
-	object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 34, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21, 0, 0
-	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 42, 8, 4, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086, 0, 0
-	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087, 0, 0
-	object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 16, 3, 8, 17, 0, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0, 0, 0
-	object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 14, 20, 3, 16, 17, 0, 1, 3, VictoryRoad_B1F_EventScript_236541, 0, 0, 0
-
-VictoryRoad_B1F_MapWarps: @ 853613C
-	warp_def 30, 25, 3, 0, VICTORY_ROAD_B2F
-	warp_def 17, 16, 3, 2, VICTORY_ROAD_B2F
-	warp_def 42, 25, 3, 3, VICTORY_ROAD_1F
-	warp_def 42, 2, 4, 1, VICTORY_ROAD_B2F
-	warp_def 8, 3, 3, 4, VICTORY_ROAD_1F
-	warp_def 20, 21, 3, 2, VICTORY_ROAD_1F
-	warp_def 5, 26, 3, 3, VICTORY_ROAD_B2F
-
-VictoryRoad_B1F_MapEvents:: @ 8536174
-	map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc
deleted file mode 100644
index 5e702c0c3..000000000
--- a/data/maps/events/VictoryRoad_B2F.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-VictoryRoad_B2F_EventObjects: @ 8536188
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 15, 6, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0, 0, 0
-	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 43, 14, 3, 7, 17, 0, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0, 0, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 2, 17, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236903, 0, 0, 0
-	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 35, 22, 3, 9, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0, 0, 0
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 8, 3, 1, 17, 0, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088, 0, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 25, 18, 4, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236948, 0, 0, 0
-	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 25, 21, 4, 7, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236931, 0, 0, 0
-
-VictoryRoad_B2F_MapWarps: @ 8536230
-	warp_def 30, 25, 3, 0, VICTORY_ROAD_B1F
-	warp_def 43, 2, 3, 3, VICTORY_ROAD_B1F
-	warp_def 19, 12, 3, 1, VICTORY_ROAD_B1F
-	warp_def 5, 26, 3, 6, VICTORY_ROAD_B1F
-
-VictoryRoad_B2F_MapBGEvents: @ 8536250
-	bg_event 28, 5, 3, 7, 0, ITEM_ELIXIR, 82, 0
-	bg_event 37, 1, 3, 7, 0, ITEM_MAX_REPEL, 83, 0
-
-VictoryRoad_B2F_MapEvents:: @ 8536268
-	map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents
-
diff --git a/data/maps/groups.inc b/data/maps/groups.inc
new file mode 100644
index 000000000..77f9c4441
--- /dev/null
+++ b/data/maps/groups.inc
@@ -0,0 +1,623 @@
+gMapGroup0: @ 8485D60
+	.4byte PetalburgCity
+	.4byte SlateportCity
+	.4byte MauvilleCity
+	.4byte RustboroCity
+	.4byte FortreeCity
+	.4byte LilycoveCity
+	.4byte MossdeepCity
+	.4byte SootopolisCity
+	.4byte EverGrandeCity
+	.4byte LittlerootTown
+	.4byte OldaleTown
+	.4byte DewfordTown
+	.4byte LavaridgeTown
+	.4byte FallarborTown
+	.4byte VerdanturfTown
+	.4byte PacifidlogTown
+	.4byte Route101
+	.4byte Route102
+	.4byte Route103
+	.4byte Route104
+	.4byte Route105
+	.4byte Route106
+	.4byte Route107
+	.4byte Route108
+	.4byte Route109
+	.4byte Route110
+	.4byte Route111
+	.4byte Route112
+	.4byte Route113
+	.4byte Route114
+	.4byte Route115
+	.4byte Route116
+	.4byte Route117
+	.4byte Route118
+	.4byte Route119
+	.4byte Route120
+	.4byte Route121
+	.4byte Route122
+	.4byte Route123
+	.4byte Route124
+	.4byte Route125
+	.4byte Route126
+	.4byte Route127
+	.4byte Route128
+	.4byte Route129
+	.4byte Route130
+	.4byte Route131
+	.4byte Route132
+	.4byte Route133
+	.4byte Route134
+	.4byte Underwater1
+	.4byte Underwater2
+	.4byte Underwater3
+	.4byte Underwater4
+	.4byte Underwater5
+	.4byte Underwater6
+	.4byte Underwater7
+
+gMapGroup1: @ 8485E44
+	.4byte LittlerootTown_BrendansHouse_1F
+	.4byte LittlerootTown_BrendansHouse_2F
+	.4byte LittlerootTown_MaysHouse_1F
+	.4byte LittlerootTown_MaysHouse_2F
+	.4byte LittlerootTown_ProfessorBirchsLab
+
+gMapGroup2: @ 8485E58
+	.4byte OldaleTown_House1
+	.4byte OldaleTown_House2
+	.4byte OldaleTown_PokemonCenter_1F
+	.4byte OldaleTown_PokemonCenter_2F
+	.4byte OldaleTown_Mart
+
+gMapGroup3: @ 8485E6C
+	.4byte DewfordTown_House1
+	.4byte DewfordTown_PokemonCenter_1F
+	.4byte DewfordTown_PokemonCenter_2F
+	.4byte DewfordTown_Gym
+	.4byte DewfordTown_Hall
+	.4byte DewfordTown_House2
+
+gMapGroup4: @ 8485E84
+	.4byte LavaridgeTown_HerbShop
+	.4byte LavaridgeTown_Gym_1F
+	.4byte LavaridgeTown_Gym_B1F
+	.4byte LavaridgeTown_House
+	.4byte LavaridgeTown_Mart
+	.4byte LavaridgeTown_PokemonCenter_1F
+	.4byte LavaridgeTown_PokemonCenter_2F
+
+gMapGroup5: @ 8485EA0
+	.4byte FallarborTown_Mart
+	.4byte FallarborTown_BattleTentLobby
+	.4byte FallarborTown_BattleTentCorridor
+	.4byte FallarborTown_BattleTentBattleRoom
+	.4byte FallarborTown_PokemonCenter_1F
+	.4byte FallarborTown_PokemonCenter_2F
+	.4byte FallarborTown_House1
+	.4byte FallarborTown_House2
+
+gMapGroup6: @ 8485EC0
+	.4byte VerdanturfTown_BattleTentLobby
+	.4byte VerdanturfTown_BattleTentCorridor
+	.4byte VerdanturfTown_BattleTentBattleRoom
+	.4byte VerdanturfTown_Mart
+	.4byte VerdanturfTown_PokemonCenter_1F
+	.4byte VerdanturfTown_PokemonCenter_2F
+	.4byte VerdanturfTown_WandasHouse
+	.4byte VerdanturfTown_FriendshipRatersHouse
+	.4byte VerdanturfTown_House
+
+gMapGroup7: @ 8485EE4
+	.4byte PacifidlogTown_PokemonCenter_1F
+	.4byte PacifidlogTown_PokemonCenter_2F
+	.4byte PacifidlogTown_House1
+	.4byte PacifidlogTown_House2
+	.4byte PacifidlogTown_House3
+	.4byte PacifidlogTown_House4
+	.4byte PacifidlogTown_House5
+
+gMapGroup8: @ 8485F00
+	.4byte PetalburgCity_WallysHouse
+	.4byte PetalburgCity_Gym
+	.4byte PetalburgCity_House1
+	.4byte PetalburgCity_House2
+	.4byte PetalburgCity_PokemonCenter_1F
+	.4byte PetalburgCity_PokemonCenter_2F
+	.4byte PetalburgCity_Mart
+
+gMapGroup9: @ 8485F1C
+	.4byte SlateportCity_SternsShipyard_1F
+	.4byte SlateportCity_SternsShipyard_2F
+	.4byte SlateportCity_BattleTentLobby
+	.4byte SlateportCity_BattleTentCorridor
+	.4byte SlateportCity_BattleTentBattleRoom
+	.4byte SlateportCity_House1
+	.4byte SlateportCity_PokemonFanClub
+	.4byte SlateportCity_OceanicMuseum_1F
+	.4byte SlateportCity_OceanicMuseum_2F
+	.4byte SlateportCity_Harbor
+	.4byte SlateportCity_House2
+	.4byte SlateportCity_PokemonCenter_1F
+	.4byte SlateportCity_PokemonCenter_2F
+	.4byte SlateportCity_Mart
+
+gMapGroup10: @ 8485F54
+	.4byte MauvilleCity_Gym
+	.4byte MauvilleCity_BikeShop
+	.4byte MauvilleCity_House1
+	.4byte MauvilleCity_GameCorner
+	.4byte MauvilleCity_House2
+	.4byte MauvilleCity_PokemonCenter_1F
+	.4byte MauvilleCity_PokemonCenter_2F
+	.4byte MauvilleCity_Mart
+
+gMapGroup11: @ 8485F74
+	.4byte RustboroCity_DevonCorp_1F
+	.4byte RustboroCity_DevonCorp_2F
+	.4byte RustboroCity_DevonCorp_3F
+	.4byte RustboroCity_Gym
+	.4byte RustboroCity_PokemonSchool
+	.4byte RustboroCity_PokemonCenter_1F
+	.4byte RustboroCity_PokemonCenter_2F
+	.4byte RustboroCity_Mart
+	.4byte RustboroCity_Flat1_1F
+	.4byte RustboroCity_Flat1_2F
+	.4byte RustboroCity_House1
+	.4byte RustboroCity_CuttersHouse
+	.4byte RustboroCity_House2
+	.4byte RustboroCity_Flat2_1F
+	.4byte RustboroCity_Flat2_2F
+	.4byte RustboroCity_Flat2_3F
+	.4byte RustboroCity_House3
+
+gMapGroup12: @ 8485FB8
+	.4byte FortreeCity_House1
+	.4byte FortreeCity_Gym
+	.4byte FortreeCity_PokemonCenter_1F
+	.4byte FortreeCity_PokemonCenter_2F
+	.4byte FortreeCity_Mart
+	.4byte FortreeCity_House2
+	.4byte FortreeCity_House3
+	.4byte FortreeCity_House4
+	.4byte FortreeCity_House5
+	.4byte FortreeCity_DecorationShop
+
+gMapGroup13: @ 8485FE0
+	.4byte LilycoveCity_CoveLilyMotel_1F
+	.4byte LilycoveCity_CoveLilyMotel_2F
+	.4byte LilycoveCity_LilycoveMuseum_1F
+	.4byte LilycoveCity_LilycoveMuseum_2F
+	.4byte LilycoveCity_ContestLobby
+	.4byte LilycoveCity_ContestHall
+	.4byte LilycoveCity_PokemonCenter_1F
+	.4byte LilycoveCity_PokemonCenter_2F
+	.4byte LilycoveCity_UnusedMart
+	.4byte LilycoveCity_PokemonTrainerFanClub
+	.4byte LilycoveCity_Harbor
+	.4byte LilycoveCity_MoveDeletersHouse
+	.4byte LilycoveCity_House1
+	.4byte LilycoveCity_House2
+	.4byte LilycoveCity_House3
+	.4byte LilycoveCity_House4
+	.4byte LilycoveCity_DepartmentStore_1F
+	.4byte LilycoveCity_DepartmentStore_2F
+	.4byte LilycoveCity_DepartmentStore_3F
+	.4byte LilycoveCity_DepartmentStore_4F
+	.4byte LilycoveCity_DepartmentStore_5F
+	.4byte LilycoveCity_DepartmentStoreRooftop
+	.4byte LilycoveCity_DepartmentStoreElevator
+
+gMapGroup14: @ 848603C
+	.4byte MossdeepCity_Gym
+	.4byte MossdeepCity_House1
+	.4byte MossdeepCity_House2
+	.4byte MossdeepCity_PokemonCenter_1F
+	.4byte MossdeepCity_PokemonCenter_2F
+	.4byte MossdeepCity_Mart
+	.4byte MossdeepCity_House3
+	.4byte MossdeepCity_StevensHouse
+	.4byte MossdeepCity_House4
+	.4byte MossdeepCity_SpaceCenter_1F
+	.4byte MossdeepCity_SpaceCenter_2F
+	.4byte MossdeepCity_GameCorner_1F
+	.4byte MossdeepCity_GameCorner_B1F
+
+gMapGroup15: @ 8486070
+	.4byte SootopolisCity_Gym_1F
+	.4byte SootopolisCity_Gym_B1F
+	.4byte SootopolisCity_PokemonCenter_1F
+	.4byte SootopolisCity_PokemonCenter_2F
+	.4byte SootopolisCity_Mart
+	.4byte SootopolisCity_House1
+	.4byte SootopolisCity_House2
+	.4byte SootopolisCity_House3
+	.4byte SootopolisCity_House4
+	.4byte SootopolisCity_House5
+	.4byte SootopolisCity_House6
+	.4byte SootopolisCity_House7
+	.4byte SootopolisCity_LotadAndSeedotHouse
+	.4byte SootopolisCity_MysteryEventsHouse_1F
+	.4byte SootopolisCity_MysteryEventsHouse_B1F
+
+gMapGroup16: @ 84860AC
+	.4byte EverGrandeCity_SidneysRoom
+	.4byte EverGrandeCity_PhoebesRoom
+	.4byte EverGrandeCity_GlaciasRoom
+	.4byte EverGrandeCity_DrakesRoom
+	.4byte EverGrandeCity_ChampionsRoom
+	.4byte EverGrandeCity_Hall1
+	.4byte EverGrandeCity_Hall2
+	.4byte EverGrandeCity_Hall3
+	.4byte EverGrandeCity_Hall4
+	.4byte EverGrandeCity_Hall5
+	.4byte EverGrandeCity_PokemonLeague_1F
+	.4byte EverGrandeCity_HallOfFame
+	.4byte EverGrandeCity_PokemonCenter_1F
+	.4byte EverGrandeCity_PokemonCenter_2F
+	.4byte EverGrandeCity_PokemonLeague_2F
+
+gMapGroup17: @ 84860E8
+	.4byte Route104_MrBrineysHouse
+	.4byte Route104_PrettyPetalFlowerShop
+
+gMapGroup18: @ 84860F0
+	.4byte Route111_WinstrateFamilysHouse
+	.4byte Route111_OldLadysRestStop
+
+gMapGroup19: @ 84860F8
+	.4byte Route112_CableCarStation
+	.4byte MtChimney_CableCarStation
+
+gMapGroup20: @ 8486100
+	.4byte Route114_FossilManiacsHouse
+	.4byte Route114_FossilManiacsTunnel
+	.4byte Route114_LanettesHouse
+
+gMapGroup21: @ 848610C
+	.4byte Route116_TunnelersRestHouse
+
+gMapGroup22: @ 8486110
+	.4byte Route117_PokemonDayCare
+
+gMapGroup23: @ 8486114
+	.4byte Route121_SafariZoneEntrance
+
+gMapGroup24: @ 8486118
+	.4byte MeteorFalls_1F_1R
+	.4byte MeteorFalls_1F_2R
+	.4byte MeteorFalls_B1F_1R
+	.4byte MeteorFalls_B1F_2R
+	.4byte RusturfTunnel
+	.4byte Underwater_SootopolisCity
+	.4byte DesertRuins
+	.4byte GraniteCave_1F
+	.4byte GraniteCave_B1F
+	.4byte GraniteCave_B2F
+	.4byte GraniteCave_StevensRoom
+	.4byte PetalburgWoods
+	.4byte MtChimney
+	.4byte JaggedPass
+	.4byte FieryPath
+	.4byte MtPyre_1F
+	.4byte MtPyre_2F
+	.4byte MtPyre_3F
+	.4byte MtPyre_4F
+	.4byte MtPyre_5F
+	.4byte MtPyre_6F
+	.4byte MtPyre_Exterior
+	.4byte MtPyre_Summit
+	.4byte AquaHideout_1F
+	.4byte AquaHideout_B1F
+	.4byte AquaHideout_B2F
+	.4byte Underwater_SeafloorCavern
+	.4byte SeafloorCavern_Entrance
+	.4byte SeafloorCavern_Room1
+	.4byte SeafloorCavern_Room2
+	.4byte SeafloorCavern_Room3
+	.4byte SeafloorCavern_Room4
+	.4byte SeafloorCavern_Room5
+	.4byte SeafloorCavern_Room6
+	.4byte SeafloorCavern_Room7
+	.4byte SeafloorCavern_Room8
+	.4byte SeafloorCavern_Room9
+	.4byte CaveOfOrigin_Entrance
+	.4byte CaveOfOrigin_1F
+	.4byte CaveOfOrigin_UnusedRubySapphireMap1
+	.4byte CaveOfOrigin_UnusedRubySapphireMap2
+	.4byte CaveOfOrigin_UnusedRubySapphireMap3
+	.4byte CaveOfOrigin_B1F
+	.4byte VictoryRoad_1F
+	.4byte VictoryRoad_B1F
+	.4byte VictoryRoad_B2F
+	.4byte ShoalCave_LowTideEntranceRoom
+	.4byte ShoalCave_LowTideInnerRoom
+	.4byte ShoalCave_LowTideStairsRoom
+	.4byte ShoalCave_LowTideLowerRoom
+	.4byte ShoalCave_HighTideEntranceRoom
+	.4byte ShoalCave_HighTideInnerRoom
+	.4byte NewMauville_Entrance
+	.4byte NewMauville_Inside
+	.4byte AbandonedShip_Deck
+	.4byte AbandonedShip_Corridors_1F
+	.4byte AbandonedShip_Rooms_1F
+	.4byte AbandonedShip_Corridors_B1F
+	.4byte AbandonedShip_Rooms_B1F
+	.4byte AbandonedShip_Rooms2_B1F
+	.4byte AbandonedShip_Underwater1
+	.4byte AbandonedShip_Room_B1F
+	.4byte AbandonedShip_Rooms2_1F
+	.4byte AbandonedShip_CaptainsOffice
+	.4byte AbandonedShip_Underwater2
+	.4byte AbandonedShip_HiddenFloorCorridors
+	.4byte AbandonedShip_HiddenFloorRooms
+	.4byte IslandCave
+	.4byte AncientTomb
+	.4byte Underwater_Route134
+	.4byte Underwater_SealedChamber
+	.4byte SealedChamber_OuterRoom
+	.4byte SealedChamber_InnerRoom
+	.4byte ScorchedSlab
+	.4byte AquaHideout_UnusedRubyMap1
+	.4byte AquaHideout_UnusedRubyMap2
+	.4byte AquaHideout_UnusedRubyMap3
+	.4byte SkyPillar_Entrance
+	.4byte SkyPillar_Outside
+	.4byte SkyPillar_1F
+	.4byte SkyPillar_2F
+	.4byte SkyPillar_3F
+	.4byte SkyPillar_4F
+	.4byte ShoalCave_LowTideIceRoom
+	.4byte SkyPillar_5F
+	.4byte SkyPillar_Top
+	.4byte MagmaHideout_1F
+	.4byte MagmaHideout_2F_1R
+	.4byte MagmaHideout_2F_2R
+	.4byte MagmaHideout_3F_1R
+	.4byte MagmaHideout_3F_2R
+	.4byte MagmaHideout_4F
+	.4byte MagmaHideout_3F_3R
+	.4byte MagmaHideout_2F_3R
+	.4byte MirageTower_1F
+	.4byte MirageTower_2F
+	.4byte MirageTower_3F
+	.4byte MirageTower_4F
+	.4byte DesertUnderpass
+	.4byte ArtisanCave_B1F
+	.4byte ArtisanCave_1F
+	.4byte Underwater_MarineCave
+	.4byte MarineCave_Entrance
+	.4byte MarineCave_End
+	.4byte TerraCave_Entrance
+	.4byte TerraCave_End
+	.4byte AlteringCave
+	.4byte MeteorFalls_StevensCave
+
+gMapGroup25: @ 84862C8
+	.4byte SecretBase_RedCave1
+	.4byte SecretBase_BrownCave1
+	.4byte SecretBase_BlueCave1
+	.4byte SecretBase_YellowCave1
+	.4byte SecretBase_Tree1
+	.4byte SecretBase_Shrub1
+	.4byte SecretBase_RedCave2
+	.4byte SecretBase_BrownCave2
+	.4byte SecretBase_BlueCave2
+	.4byte SecretBase_YellowCave2
+	.4byte SecretBase_Tree2
+	.4byte SecretBase_Shrub2
+	.4byte SecretBase_RedCave3
+	.4byte SecretBase_BrownCave3
+	.4byte SecretBase_BlueCave3
+	.4byte SecretBase_YellowCave3
+	.4byte SecretBase_Tree3
+	.4byte SecretBase_Shrub3
+	.4byte SecretBase_RedCave4
+	.4byte SecretBase_BrownCave4
+	.4byte SecretBase_BlueCave4
+	.4byte SecretBase_YellowCave4
+	.4byte SecretBase_Tree4
+	.4byte SecretBase_Shrub4
+	.4byte SingleBattleColosseum
+	.4byte TradeCenter
+	.4byte RecordCorner
+	.4byte DoubleBattleColosseum
+	.4byte LinkContestRoom1
+	.4byte UnknownMap_25_29
+	.4byte UnknownMap_25_30
+	.4byte UnknownMap_25_31
+	.4byte UnknownMap_25_32
+	.4byte UnknownMap_25_33
+	.4byte UnknownMap_25_34
+	.4byte LinkContestRoom2
+	.4byte LinkContestRoom3
+	.4byte LinkContestRoom4
+	.4byte LinkContestRoom5
+	.4byte LinkContestRoom6
+	.4byte InsideOfTruck
+	.4byte SSTidalCorridor
+	.4byte SSTidalLowerDeck
+	.4byte SSTidalRooms
+	.4byte BattlePyramidSquare01
+	.4byte BattlePyramidSquare02
+	.4byte BattlePyramidSquare03
+	.4byte BattlePyramidSquare04
+	.4byte BattlePyramidSquare05
+	.4byte BattlePyramidSquare06
+	.4byte BattlePyramidSquare07
+	.4byte BattlePyramidSquare08
+	.4byte BattlePyramidSquare09
+	.4byte BattlePyramidSquare10
+	.4byte BattlePyramidSquare11
+	.4byte BattlePyramidSquare12
+	.4byte BattlePyramidSquare13
+	.4byte BattlePyramidSquare14
+	.4byte BattlePyramidSquare15
+	.4byte BattlePyramidSquare16
+	.4byte UnionRoom
+
+gMapGroup26: @ 84863BC
+	.4byte SafariZone_Northwest
+	.4byte SafariZone_North
+	.4byte SafariZone_Southwest
+	.4byte SafariZone_South
+	.4byte BattleFrontier_OutsideWest
+	.4byte BattleFrontier_BattleTowerLobby
+	.4byte BattleFrontier_BattleTowerElevator
+	.4byte BattleFrontier_BattleTowerCorridor
+	.4byte BattleFrontier_BattleTowerBattleRoom
+	.4byte SouthernIsland_Exterior
+	.4byte SouthernIsland_Interior
+	.4byte SafariZone_RestHouse
+	.4byte SafariZone_Northeast
+	.4byte SafariZone_Southeast
+	.4byte BattleFrontier_OutsideEast
+	.4byte BattleFrontier_BattleTowerMultiBattleRoom
+	.4byte BattleFrontier_BattleTowerCorridor2
+	.4byte BattleFrontier_BattleTowerBattleRoom2
+	.4byte BattleFrontier_BattleDomeLobby
+	.4byte BattleFrontier_BattleDomeCorridor
+	.4byte BattleFrontier_BattleDomePreBattleRoom
+	.4byte BattleFrontier_BattleDomeBattleRoom
+	.4byte BattleFrontier_BattlePalaceLobby
+	.4byte BattleFrontier_BattlePalaceCorridor
+	.4byte BattleFrontier_BattlePalaceBattleRoom
+	.4byte BattleFrontier_BattlePyramidLobby
+	.4byte BattleFrontier_BattlePyramidEmptySquare
+	.4byte BattleFrontier_BattlePyramidTop
+	.4byte BattleFrontier_BattleArenaLobby
+	.4byte BattleFrontier_BattleArenaCorridor
+	.4byte BattleFrontier_BattleArenaBattleRoom
+	.4byte BattleFrontier_BattleFactoryLobby
+	.4byte BattleFrontier_BattleFactoryPreBattleRoom
+	.4byte BattleFrontier_BattleFactoryBattleRoom
+	.4byte BattleFrontier_BattlePikeLobby
+	.4byte BattleFrontier_BattlePikeCorridor
+	.4byte BattleFrontier_BattlePikeThreePathRoom
+	.4byte BattleFrontier_BattlePikeRandomRoom1
+	.4byte BattleFrontier_BattlePikeRandomRoom2
+	.4byte BattleFrontier_BattlePikeRandomRoom3
+	.4byte BattleFrontier_RankingHall
+	.4byte BattleFrontier_Lounge1
+	.4byte BattleFrontier_BattlePointExchangeServiceCorner
+	.4byte BattleFrontier_Lounge2
+	.4byte BattleFrontier_Lounge3
+	.4byte BattleFrontier_Lounge4
+	.4byte BattleFrontier_ScottsHouse
+	.4byte BattleFrontier_Lounge5
+	.4byte BattleFrontier_Lounge6
+	.4byte BattleFrontier_Lounge7
+	.4byte BattleFrontier_ReceptionGate
+	.4byte BattleFrontier_Lounge8
+	.4byte BattleFrontier_Lounge9
+	.4byte BattleFrontier_PokemonCenter_1F
+	.4byte BattleFrontier_PokemonCenter_2F
+	.4byte BattleFrontier_Mart
+	.4byte FarawayIsland_Entrance
+	.4byte FarawayIsland_Interior
+	.4byte BirthIsland_Exterior
+	.4byte BirthIsland_Harbor
+	.4byte TrainerHill_Entrance
+	.4byte TrainerHill_1F
+	.4byte TrainerHill_2F
+	.4byte TrainerHill_3F
+	.4byte TrainerHill_4F
+	.4byte TrainerHill_Roof
+	.4byte NavelRock_Exterior
+	.4byte NavelRock_Harbor
+	.4byte NavelRock_Entrance
+	.4byte NavelRock_B1F
+	.4byte NavelRock_Fork
+	.4byte NavelRock_Up1
+	.4byte NavelRock_Up2
+	.4byte NavelRock_Up3
+	.4byte NavelRock_Up4
+	.4byte NavelRock_Top
+	.4byte NavelRock_Down01
+	.4byte NavelRock_Down02
+	.4byte NavelRock_Down03
+	.4byte NavelRock_Down04
+	.4byte NavelRock_Down05
+	.4byte NavelRock_Down06
+	.4byte NavelRock_Down07
+	.4byte NavelRock_Down08
+	.4byte NavelRock_Down09
+	.4byte NavelRock_Down10
+	.4byte NavelRock_Down11
+	.4byte NavelRock_Bottom
+	.4byte TrainerHill_Elevator
+
+gMapGroup27: @ 8486520
+	.4byte Route104_Prototype
+	.4byte Route104_PrototypePrettyPetalFlowerShop
+
+gMapGroup28: @ 8486528
+	.4byte Route109_SeashoreHouse
+
+gMapGroup29: @ 848652C
+	.4byte Route110_TrickHouseEntrance
+	.4byte Route110_TrickHouseEnd
+	.4byte Route110_TrickHouseCorridor
+	.4byte Route110_TrickHousePuzzle1
+	.4byte Route110_TrickHousePuzzle2
+	.4byte Route110_TrickHousePuzzle3
+	.4byte Route110_TrickHousePuzzle4
+	.4byte Route110_TrickHousePuzzle5
+	.4byte Route110_TrickHousePuzzle6
+	.4byte Route110_TrickHousePuzzle7
+	.4byte Route110_TrickHousePuzzle8
+	.4byte Route110_SeasideCyclingRoadNorthEntrance
+	.4byte Route110_SeasideCyclingRoadSouthEntrance
+
+gMapGroup30: @ 8486560
+	.4byte Route113_GlassWorkshop
+
+gMapGroup31: @ 8486564
+	.4byte Route123_BerryMastersHouse
+
+gMapGroup32: @ 8486568
+	.4byte Route119_WeatherInstitute_1F
+	.4byte Route119_WeatherInstitute_2F
+	.4byte Route119_House
+
+gMapGroup33: @ 8486574
+	.4byte Route124_DivingTreasureHuntersHouse
+
+	.align 2
+gMapGroups:: @ 8486578
+	.4byte gMapGroup0
+	.4byte gMapGroup1
+	.4byte gMapGroup2
+	.4byte gMapGroup3
+	.4byte gMapGroup4
+	.4byte gMapGroup5
+	.4byte gMapGroup6
+	.4byte gMapGroup7
+	.4byte gMapGroup8
+	.4byte gMapGroup9
+	.4byte gMapGroup10
+	.4byte gMapGroup11
+	.4byte gMapGroup12
+	.4byte gMapGroup13
+	.4byte gMapGroup14
+	.4byte gMapGroup15
+	.4byte gMapGroup16
+	.4byte gMapGroup17
+	.4byte gMapGroup18
+	.4byte gMapGroup19
+	.4byte gMapGroup20
+	.4byte gMapGroup21
+	.4byte gMapGroup22
+	.4byte gMapGroup23
+	.4byte gMapGroup24
+	.4byte gMapGroup25
+	.4byte gMapGroup26
+	.4byte gMapGroup27
+	.4byte gMapGroup28
+	.4byte gMapGroup29
+	.4byte gMapGroup30
+	.4byte gMapGroup31
+	.4byte gMapGroup32
+	.4byte gMapGroup33
+
diff --git a/data/maps/headers.inc b/data/maps/headers.inc
index 58d2cc66c..b4be3ab0c 100644
--- a/data/maps/headers.inc
+++ b/data/maps/headers.inc
@@ -508,8 +508,8 @@
 	.include "data/maps/Route110_TrickHousePuzzle6/header.inc"
 	.include "data/maps/Route110_TrickHousePuzzle7/header.inc"
 	.include "data/maps/Route110_TrickHousePuzzle8/header.inc"
-	.include "data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc"
-	.include "data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc"
 	.include "data/maps/Route113_GlassWorkshop/header.inc"
 	.include "data/maps/Route123_BerryMastersHouse/header.inc"
 	.include "data/maps/Route119_WeatherInstitute_1F/header.inc"
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 523aa67ca..f02ffbe66 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -468,14 +468,14 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
 	waitdooranim
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A
 	waitmovement 0
-	hideobjectat 255, PETALBURG_CITY
+	hideobjectat 255, MAP_PETALBURG_CITY
 	closedoor 9, 1
 	waitdooranim
 	release
 	compare VAR_0x8004, 5
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277036
 	special sub_809D2BC
-	warp SINGLE_BATTLE_COLOSSEUM, 255, 6, 8
+	warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8
 	special sub_80AF948
 	waitstate
 	end
@@ -487,7 +487,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27702B:: @ 827702B
 
 OldaleTown_PokemonCenter_2F_EventScript_277036:: @ 8277036
 	special sub_809D2BC
-	warp DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8
+	warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8
 	special sub_80AF948
 	waitstate
 	end
@@ -572,12 +572,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A
 	waitdooranim
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A
 	waitmovement 0
-	hideobjectat 255, PETALBURG_CITY
+	hideobjectat 255, MAP_PETALBURG_CITY
 	closedoor 9, 1
 	waitdooranim
 	release
 	special sub_809D2BC
-	setwarp TRADE_CENTER, 255, 5, 8
+	setwarp MAP_TRADE_CENTER, 255, 5, 8
 	special sub_80AF948
 	waitstate
 	end
@@ -647,12 +647,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C
 	waitdooranim
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A
 	waitmovement 0
-	hideobjectat 255, PETALBURG_CITY
+	hideobjectat 255, MAP_PETALBURG_CITY
 	closedoor 9, 1
 	waitdooranim
 	release
 	special sub_809D2BC
-	setwarp RECORD_CORNER, 255, 8, 9
+	setwarp MAP_RECORD_CORNER, 255, 8, 9
 	special sub_80AF948
 	waitstate
 	end
@@ -1046,12 +1046,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
 	waitdooranim
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A
 	waitmovement 0
-	hideobjectat 255, PETALBURG_CITY
+	hideobjectat 255, MAP_PETALBURG_CITY
 	closedoor 5, 1
 	waitdooranim
 	special sub_8018090
 	special sub_809D2BC
-	warpteleport2 UNION_ROOM, 255, 7, 11
+	warpteleport2 MAP_UNION_ROOM, 255, 7, 11
 	waitstate
 	special UnionRoomSpecial
 	waitstate
@@ -1385,7 +1385,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A
 	waitdooranim
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A
 	waitmovement 0
-	hideobjectat 255, PETALBURG_CITY
+	hideobjectat 255, MAP_PETALBURG_CITY
 	closedoor 9, 1
 	waitdooranim
 	release
@@ -1595,7 +1595,7 @@ MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E
 	closemessage
 	applymovement 255, MossdeepCity_GameCorner_1F_Movement_277360
 	waitmovement 0
-	hideobjectat 255, PETALBURG_CITY
+	hideobjectat 255, MAP_PETALBURG_CITY
 	release
 	waitstate
 	end
diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
deleted file mode 100644
index 3f019f4d8..000000000
--- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
+++ /dev/null
@@ -1,91 +0,0 @@
-AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84
-	map_script 5, AbandonedShip_Corridors_B1F_MapScript1_237D8F
-	map_script 1, AbandonedShip_Corridors_B1F_MapScript1_237D98
-	.byte 0
-
-AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F
-	setdivewarp ABANDONED_SHIP_UNDERWATER_1, 255, 5, 4
-	end
-
-AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98
-	checkflag FLAG_0x0EF
-	call_if 0, AbandonedShip_Corridors_B1F_EventScript_237DAB
-	checkflag FLAG_0x0EF
-	call_if 1, AbandonedShip_Corridors_B1F_EventScript_237DB5
-	end
-
-AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB
-	setmetatile 11, 4, 563, 1
-	return
-
-AbandonedShip_Corridors_B1F_EventScript_237DB5:: @ 8237DB5
-	setmetatile 11, 4, 555, 1
-	return
-
-AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF
-	msgbox AbandonedShip_Corridors_B1F_Text_237F03, 2
-	end
-
-AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8
-	lockall
-	checkflag FLAG_0x0EF
-	goto_eq AbandonedShip_Corridors_B1F_EventScript_237E09
-	checkitem ITEM_STORAGE_KEY, 1
-	compare VAR_RESULT, 0
-	goto_eq AbandonedShip_Corridors_B1F_EventScript_237DFF
-	msgbox AbandonedShip_Corridors_B1F_Text_237F4B, 4
-	playse SE_PIN
-	takeitem ITEM_STORAGE_KEY, 1
-	setflag FLAG_0x0EF
-	call AbandonedShip_Corridors_B1F_EventScript_237DB5
-	special DrawWholeMapView
-	releaseall
-	end
-
-AbandonedShip_Corridors_B1F_EventScript_237DFF:: @ 8237DFF
-	msgbox AbandonedShip_Corridors_B1F_Text_237F15, 4
-	releaseall
-	end
-
-AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09
-	msgbox AbandonedShip_Corridors_B1F_Text_237FA5, 4
-	releaseall
-	end
-
-AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13
-	trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80
-	msgbox AbandonedShip_Corridors_B1F_Text_237E92, 6
-	end
-
-AbandonedShip_Corridors_B1F_Text_237E2A: @ 8237E2A
-	.string "When we go out to sea, we SAILORS\n"
-	.string "always bring our POKéMON.\l"
-	.string "How about a quick battle?$"
-
-AbandonedShip_Corridors_B1F_Text_237E80: @ 8237E80
-	.string "Whoops, I’m sunk!$"
-
-AbandonedShip_Corridors_B1F_Text_237E92: @ 8237E92
-	.string "The ship’s bottom has sunk into the\n"
-	.string "depths.\p"
-	.string "If a POKéMON knew how to go underwater,\n"
-	.string "we might make some progress…$"
-
-AbandonedShip_Corridors_B1F_Text_237F03: @ 8237F03
-	.string "Yay!\n"
-	.string "It’s a ship!$"
-
-AbandonedShip_Corridors_B1F_Text_237F15: @ 8237F15
-	.string "The door is locked.\p"
-	.string "“STORAGE” is painted on the door.$"
-
-AbandonedShip_Corridors_B1F_Text_237F4B: @ 8237F4B
-	.string "{PLAYER} inserted and turned the\n"
-	.string "STORAGE KEY.\p"
-	.string "The inserted KEY stuck fast,\n"
-	.string "but the door opened.$"
-
-AbandonedShip_Corridors_B1F_Text_237FA5: @ 8237FA5
-AbandonedShip_HiddenFloorCorridors_Text_237FA5: @ 8237FA5
-	.string "The door is open.$"
-
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
deleted file mode 100644
index b1bca85aa..000000000
--- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
+++ /dev/null
@@ -1,171 +0,0 @@
-AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C
-	map_script 5, AbandonedShip_HiddenFloorCorridors_MapScript1_238977
-	map_script 1, AbandonedShip_HiddenFloorCorridors_MapScript1_238980
-	.byte 0
-
-AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977
-	setdivewarp ABANDONED_SHIP_UNDERWATER_1, 255, 5, 4
-	end
-
-AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980
-	checkflag FLAG_0x0F0
-	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1
-	checkflag FLAG_0x0F1
-	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB
-	checkflag FLAG_0x0F2
-	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A05
-	checkflag FLAG_0x0F3
-	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F
-	checkflag FLAG_0x0F0
-	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
-	checkflag FLAG_0x0F1
-	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
-	checkflag FLAG_0x0F2
-	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
-	checkflag FLAG_0x0F3
-	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
-	end
-
-AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9
-	setmetatile 3, 8, 555, 1
-	return
-
-AbandonedShip_HiddenFloorCorridors_EventScript_2389D3:: @ 82389D3
-	setmetatile 6, 8, 555, 1
-	return
-
-AbandonedShip_HiddenFloorCorridors_EventScript_2389DD:: @ 82389DD
-	setmetatile 3, 3, 538, 0
-	return
-
-AbandonedShip_HiddenFloorCorridors_EventScript_2389E7:: @ 82389E7
-	setmetatile 9, 3, 538, 0
-	return
-
-AbandonedShip_HiddenFloorCorridors_EventScript_2389F1:: @ 82389F1
-	setmetatile 3, 8, 563, 1
-	return
-
-AbandonedShip_HiddenFloorCorridors_EventScript_2389FB:: @ 82389FB
-	setmetatile 6, 8, 563, 1
-	return
-
-AbandonedShip_HiddenFloorCorridors_EventScript_238A05:: @ 8238A05
-	setmetatile 3, 3, 564, 0
-	return
-
-AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F
-	setmetatile 9, 3, 564, 0
-	return
-
-AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19
-	lockall
-	checkflag FLAG_0x0F0
-	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
-	checkitem ITEM_ROOM_1_KEY, 1
-	compare VAR_RESULT, 0
-	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
-	playse SE_PIN
-	takeitem ITEM_ROOM_1_KEY, 1
-	setflag FLAG_0x0F0
-	call AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
-	special DrawWholeMapView
-	releaseall
-	end
-
-AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50
-	lockall
-	checkflag FLAG_0x0F1
-	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
-	checkitem ITEM_ROOM_2_KEY, 1
-	compare VAR_RESULT, 0
-	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
-	playse SE_PIN
-	takeitem ITEM_ROOM_2_KEY, 1
-	setflag FLAG_0x0F1
-	call AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
-	special DrawWholeMapView
-	releaseall
-	end
-
-AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87
-	lockall
-	checkflag FLAG_0x0F2
-	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
-	checkitem ITEM_ROOM_4_KEY, 1
-	compare VAR_RESULT, 0
-	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
-	playse SE_PIN
-	takeitem ITEM_ROOM_4_KEY, 1
-	setflag FLAG_0x0F2
-	call AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
-	special DrawWholeMapView
-	releaseall
-	end
-
-AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE
-	lockall
-	checkflag FLAG_0x0F3
-	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
-	checkitem ITEM_ROOM_6_KEY, 1
-	compare VAR_RESULT, 0
-	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
-	playse SE_PIN
-	takeitem ITEM_ROOM_6_KEY, 1
-	setflag FLAG_0x0F3
-	call AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
-	special DrawWholeMapView
-	releaseall
-	end
-
-AbandonedShip_HiddenFloorCorridors_EventScript_238AF5:: @ 8238AF5
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, 4
-	releaseall
-	end
-
-AbandonedShip_HiddenFloorCorridors_EventScript_238AFF:: @ 8238AFF
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, 4
-	releaseall
-	end
-
-AbandonedShip_HiddenFloorCorridors_EventScript_238B09:: @ 8238B09
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, 4
-	releaseall
-	end
-
-AbandonedShip_HiddenFloorCorridors_EventScript_238B13:: @ 8238B13
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, 4
-	releaseall
-	end
-
-AbandonedShip_HiddenFloorCorridors_EventScript_238B1D:: @ 8238B1D
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, 4
-	releaseall
-	end
-
-AbandonedShip_HiddenFloorCorridors_Text_238B27: @ 8238B27
-	.string "The door is locked.\p"
-	.string "“RM. 1” is painted on the door.$"
-
-AbandonedShip_HiddenFloorCorridors_Text_238B5B: @ 8238B5B
-	.string "The door is locked.\p"
-	.string "“RM. 2” is painted on the door.$"
-
-AbandonedShip_HiddenFloorCorridors_Text_238B8F: @ 8238B8F
-	.string "The door is locked.\p"
-	.string "“RM. 4” is painted on the door.$"
-
-AbandonedShip_HiddenFloorCorridors_Text_238BC3: @ 8238BC3
-	.string "The door is locked.\p"
-	.string "“RM. 6” is painted on the door.$"
-
-AbandonedShip_HiddenFloorCorridors_Text_238BF7: @ 8238BF7
-	.string "{PLAYER} inserted and turned the\n"
-	.string "KEY.\p"
-	.string "The inserted KEY stuck fast,\n"
-	.string "but the door opened.$"
-
diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc
deleted file mode 100644
index 784d44c2e..000000000
--- a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7
-	map_script 5, AbandonedShip_Rooms_B1F_MapScript1_237FBD
-	.byte 0
-
-AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD
-	setdivewarp ABANDONED_SHIP_UNDERWATER_2, 255, 17, 4
-	end
-
-AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6
-	msgbox AbandonedShip_Rooms_B1F_Text_237FCF, 2
-	end
-
-AbandonedShip_Rooms_B1F_Text_237FCF: @ 8237FCF
-	.string "Urrrrppp…\p"
-	.string "I’m getting queasy just being aboard\n"
-	.string "this ship…\p"
-	.string "It’s not even moving, but…$"
-
diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/scripts/maps/AbandonedShip_Underwater1.inc
deleted file mode 100644
index 49971cde7..000000000
--- a/data/scripts/maps/AbandonedShip_Underwater1.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-AbandonedShip_Underwater1_MapScripts:: @ 8238096
-	map_script 5, AbandonedShip_Underwater1_MapScript1_23809C
-	.byte 0
-
-AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C
-	setdivewarp ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10
-	end
-
diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/scripts/maps/AbandonedShip_Underwater2.inc
deleted file mode 100644
index 19a786956..000000000
--- a/data/scripts/maps/AbandonedShip_Underwater2.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-AbandonedShip_Underwater2_MapScripts:: @ 823895D
-	map_script 5, AbandonedShip_Underwater2_MapScript1_238963
-	.byte 0
-
-AbandonedShip_Underwater2_MapScript1_238963: @ 8238963
-	setdivewarp ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7
-	end
-
diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc
deleted file mode 100644
index 27ea23b59..000000000
--- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc
+++ /dev/null
@@ -1,712 +0,0 @@
-BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487
-	map_script 3, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0
-	map_script 2, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2
-	map_script 4, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C
-	map_script 5, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C
-	.byte 0
-
-BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C
-	special sub_8139980
-	end
-
-BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
-	setvar VAR_0x8004, 5
-	special sub_81A1780
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE
-	end
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC
-	return
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6
-	setvar VAR_OBJ_GFX_ID_1, 100
-	return
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC:: @ 82574CC
-	setvar VAR_OBJ_GFX_ID_1, 105
-	return
-
-BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC
-	.2byte 0
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC
-	lockall
-	showobjectat 8, BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
-	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE2
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E
-	applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08
-	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB
-	setvar VAR_TEMP_2, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E
-	setvar VAR_0x8004, 3
-	special sub_8161F74
-	addobject 7
-	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BEF
-	waitmovement 0
-	applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
-	playse SE_W187
-	waitse
-	waitmovement 0
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, 4
-	closemessage
-	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5
-	waitmovement 0
-	applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
-	playse SE_W187
-	waitse
-	waitmovement 0
-	setvar VAR_0x8004, 6
-	special sub_81A5238
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C68, 4
-	closemessage
-	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2
-	waitmovement 0
-	applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
-	playse SE_W187
-	waitse
-	waitmovement 0
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, 4
-	closemessage
-	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5
-	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2
-	waitmovement 0
-	setvar VAR_0x8004, 5
-	special sub_8195960
-	msgbox 0x2021fc4, 4
-	waitmessage
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257630
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB:: @ 82575DB
-	applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
-	applymovement 1, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
-	applymovement 2, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
-	applymovement 3, BattleFrontier_BattleArenaBattleRoom_Movement_257C05
-	applymovement 4, BattleFrontier_BattleArenaBattleRoom_Movement_257C05
-	playse SE_W173
-	waitse
-	waitmovement 0
-	setvar VAR_0x8004, 6
-	special sub_81A5238
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, 4
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special sub_81A1780
-	warp BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
-	waitstate
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	switch VAR_RESULT
-	case 7, BattleFrontier_BattleArenaBattleRoom_EventScript_257852
-	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE7
-	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BFA
-	waitmovement 0
-	removeobject 7
-	applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08
-	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB
-	waitmovement 0
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, 4
-	special LoadPlayerParty
-	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0
-	setvar VAR_0x8004, 9
-	special sub_81A1780
-	copyvar VAR_TEMP_F, VAR_RESULT
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870
-	compare VAR_RESULT, 2
-	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257877
-	compare VAR_RESULT, 3
-	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25787E
-	compare VAR_RESULT, 4
-	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257885
-	compare VAR_RESULT, 5
-	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25788C
-	compare VAR_RESULT, 6
-	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257893
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768
-	multichoice 19, 4, 103, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A
-	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25779E
-	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA
-	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257808
-	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257768:: @ 8257768
-	multichoice 20, 6, 104, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A
-	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA
-	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257808
-	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_25779E:: @ 825779E
-	message BattleFrontier_BattleArenaBattleRoom_Text_257F04
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
-	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0
-	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0:: @ 82577D0
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4
-	goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA:: @ 82577DA
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257E6B, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
-	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25789A
-	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257808:: @ 8257808
-	message BattleFrontier_BattleArenaBattleRoom_Text_257E9E
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
-	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257615
-	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_25783A:: @ 825783A
-	closemessage
-	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BED
-	applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257BED
-	waitmovement 0
-	goto BattleFrontier_BattleArenaBattleRoom_EventScript_25752E
-	waitstate
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852
-	delay 60
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special sub_81A1780
-	warp BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
-	waitstate
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257870:: @ 8257870
-	message BattleFrontier_BattleArenaBattleRoom_Text_257D17
-	waitmessage
-	return
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257877:: @ 8257877
-	message BattleFrontier_BattleArenaBattleRoom_Text_257D50
-	waitmessage
-	return
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_25787E:: @ 825787E
-	message BattleFrontier_BattleArenaBattleRoom_Text_257D88
-	waitmessage
-	return
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257885:: @ 8257885
-	message BattleFrontier_BattleArenaBattleRoom_Text_257DC1
-	waitmessage
-	return
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_25788C:: @ 825788C
-	message BattleFrontier_BattleArenaBattleRoom_Text_257DF9
-	waitmessage
-	return
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257893:: @ 8257893
-	message BattleFrontier_BattleArenaBattleRoom_Text_257E31
-	waitmessage
-	return
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A
-	message BattleFrontier_BattleArenaBattleRoom_Text_257EDB
-	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 2
-	special sub_81A5238
-	playse SE_SAVE
-	waitse
-	fadescreen 1
-	setvar VAR_0x8004, 4
-	special sub_81A1780
-	end
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC
-	compare VAR_TEMP_2, 1
-	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, 4
-	setvar VAR_TEMP_2, 1
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4
-	message BattleFrontier_BattleArenaBattleRoom_Text_257FBB
-	waitmessage
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B
-	multichoice 19, 4, 103, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961
-	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25779E
-	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA
-	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257808
-	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_25792B:: @ 825792B
-	multichoice 20, 6, 104, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961
-	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA
-	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257808
-	case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_242170
-	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BED
-	applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257BED
-	waitmovement 0
-	applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
-	playse SE_W187
-	waitse
-	waitmovement 0
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, 4
-	closemessage
-	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE4
-	waitmovement 0
-	applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
-	playse SE_W187
-	waitse
-	waitmovement 0
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257FED, 4
-	closemessage
-	addobject 7
-	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF4
-	waitmovement 0
-	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2
-	waitmovement 0
-	switch VAR_TEMP_F
-	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5
-	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
-	case 4, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, 4
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30
-	waitmovement 0
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, 4
-	closemessage
-	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A
-	waitmovement 0
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_258068, 4
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, 4
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C
-	goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
-	setvar VAR_0x8004, 12
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852
-	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
-	waitmovement 0
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, 4
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattleArenaBattleRoom_Text_25819C
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, 13
-	special sub_81A1780
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, 4
-	goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, 4
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30
-	waitmovement 0
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, 4
-	closemessage
-	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A
-	waitmovement 0
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582BB, 4
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, 4
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15
-	goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
-	setvar VAR_0x8004, 12
-	special sub_81A1780
-	compare VAR_RESULT, 2
-	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852
-	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
-	waitmovement 0
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, 4
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattleArenaBattleRoom_Text_25835B
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, 13
-	special sub_81A1780
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, 4
-	goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E:: @ 8257B5E
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, 4
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C
-	return
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C:: @ 8257B6C
-FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C
-	closemessage
-	setvar VAR_TEMP_2, 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special HealPlayerParty
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 0
-	special sub_8163AC4
-	waitstate
-	setvar VAR_0x8004, 18
-	special sub_81A1780
-	special HealPlayerParty
-	setvar VAR_0x8004, 21
-	special sub_81A1780
-	return
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9
-	applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
-	applymovement 1, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
-	applymovement 2, BattleFrontier_BattleArenaBattleRoom_Movement_257C02
-	applymovement 3, BattleFrontier_BattleArenaBattleRoom_Movement_257C05
-	applymovement 4, BattleFrontier_BattleArenaBattleRoom_Movement_257C05
-	playse SE_BAN
-	waitse
-	waitmovement 0
-	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CB3, 4
-	closemessage
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_241EBA
-	return
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BE2: @ 8257BE2
-	walk_right
-	walk_right
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BE4: @ 8257BE4
-	walk_right
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BE5: @ 8257BE5
-	walk_right
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BE7: @ 8257BE7
-	walk_left
-	walk_left
-	walk_in_place_fastest_right
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BEB: @ 8257BEB
-	walk_in_place_fastest_up
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BED: @ 8257BED
-	walk_in_place_fastest_right
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BEF: @ 8257BEF
-	walk_left
-	walk_left
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BF1: @ 8257BF1
-	walk_left
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BF2: @ 8257BF2
-	walk_left
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BF4: @ 8257BF4
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BFA: @ 8257BFA
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257C02: @ 8257C02
-	disable_jump_landing_ground_effect
-	jump_in_place_down
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257C05: @ 8257C05
-	disable_jump_landing_ground_effect
-	jump_in_place_up
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257C08: @ 8257C08
-	walk_in_place_fastest_down
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257C0A: @ 8257C0A
-	walk_in_place_fastest_right
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C: @ 8257C0C
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257C16
-	.2byte 0
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16
-	hideobjectat 8, BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
-	removeobject 7
-	call BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC
-	applymovement 255, BattleFrontier_BattleArenaBattleRoom_Movement_24C773
-	setvar VAR_TEMP_1, 1
-	end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257C30: @ 8257C30
-	walk_down
-	walk_in_place_fastest_left
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_up
-	walk_up
-	walk_in_place_fastest_left
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257C3A: @ 8257C3A
-	walk_down
-	walk_in_place_fastest_left
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Text_257C3D: @ 8257C3D
-	.string "REFEREE: TRAINER {PLAYER}!\n"
-	.string "Step forward, please!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257C68: @ 8257C68
-	.string "REFEREE: TRAINER {STR_VAR_1}!\n"
-	.string "Step forward, please!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257C93: @ 8257C93
-FallarborTown_BattleTentBattleRoom_Text_257C93: @ 8257C93
-	.string "REFEREE: Set KO Tourney!\n"
-	.string "Begin!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257CB3: @ 8257CB3
-FallarborTown_BattleTentBattleRoom_Text_257CB3: @ 8257CB3
-	.string "REFEREE: The winner is {PLAYER}!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257CCE: @ 8257CCE
-FallarborTown_BattleTentBattleRoom_Text_257CCE: @ 8257CCE
-	.string "REFEREE: The winner is {STR_VAR_1}!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257CE9: @ 8257CE9
-FallarborTown_BattleTentBattleRoom_Text_257CE9: @ 8257CE9
-	.string "Your POKéMON will be restored to\n"
-	.string "full health.$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257D17: @ 8257D17
-FallarborTown_BattleTentBattleRoom_Text_257D17: @ 8257D17
-	.string "Next up, your second opponent!\n"
-	.string "Are you ready to move on?$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257D50: @ 8257D50
-FallarborTown_BattleTentBattleRoom_Text_257D50: @ 8257D50
-	.string "Next up, your third opponent!\n"
-	.string "Are you ready to move on?$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257D88: @ 8257D88
-	.string "Next up, your fourth opponent!\n"
-	.string "Are you ready to move on?$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257DC1: @ 8257DC1
-	.string "Next up, your fifth opponent!\n"
-	.string "Are you ready to move on?$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257DF9: @ 8257DF9
-	.string "Next up, your sixth opponent!\n"
-	.string "Are you ready to move on?$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257E31: @ 8257E31
-	.string "Next up, your seventh opponent!\n"
-	.string "Are you ready to move on?$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257E6B: @ 8257E6B
-FallarborTown_BattleTentBattleRoom_Text_257E6B: @ 8257E6B
-	.string "Would you like to save the game and\n"
-	.string "shut down now?$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257E9E: @ 8257E9E
-FallarborTown_BattleTentBattleRoom_Text_257E9E: @ 8257E9E
-	.string "Would you like to retire from your\n"
-	.string "Set KO Tourney challenge?$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257EDB: @ 8257EDB
-FallarborTown_BattleTentBattleRoom_Text_257EDB: @ 8257EDB
-	.string "I am saving your game data.\n"
-	.string "Please wait.$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257F04: @ 8257F04
-	.string "Would you like to record your last\n"
-	.string "battle on your FRONTIER PASS?$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257F45: @ 8257F45
-	.string "My dear challenger!\p"
-	.string "Your skill level is truly astounding!\p"
-	.string "We now would like you to face our\n"
-	.string "leader, the ARENA TYCOON!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257FBB: @ 8257FBB
-	.string "A battle with the ARENA TYCOON!\n"
-	.string "Are you prepared?$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_257FED: @ 8257FED
-	.string "REFEREE: The ARENA TYCOON!\n"
-	.string "Make way for GRETA!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_25801C: @ 825801C
-	.string "GRETA: Hey!\n"
-	.string "Howdy!\p"
-	.string "…Wait, are you the challenger?$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_25804E: @ 825804E
-	.string "Is that right? Hmm…\n"
-	.string "Hmhm…$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_258068: @ 8258068
-	.string "I don’t know how to say it, but…\n"
-	.string "To put it bluntly, you look pretty weak.\l"
-	.string "Are you sure you’re up for me?\p"
-	.string "Hmm…\p"
-	.string "Well, all right!\n"
-	.string "We’ll take things easy to start with!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_25810D: @ 825810D
-	.string "Okay! Let’s see you ignite my passion\n"
-	.string "for battle!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_25813F: @ 825813F
-	.string "GRETA: Ow, wait a second!\n"
-	.string "You are tough after all!\p"
-	.string "I like you!\n"
-	.string "Let’s see your FRONTIER PASS.$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_25819C: @ 825819C
-	.string "The Guts Symbol was embossed on\n"
-	.string "the FRONTIER PASS!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_2581CF: @ 82581CF
-	.string "Hmm…\p"
-	.string "It’s going to be fun the next time!\n"
-	.string "I’m looking forward to it!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_258213: @ 8258213
-	.string "GRETA: Hey! Howdy!\n"
-	.string "You finally won your way up to me!\p"
-	.string "I was getting worried waiting for you!\n"
-	.string "I was really looking forward to seeing\l"
-	.string "you again!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_2582A2: @ 82582A2
-	.string "… … …\n"
-	.string "So, are you ready?$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_2582BB: @ 82582BB
-	.string "I won’t allow a halfhearted effort!\n"
-	.string "Be ready for a thrashing!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_2582F9: @ 82582F9
-	.string "Come on, REFEREE!\n"
-	.string "Let’s get this started!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_258323: @ 8258323
-	.string "GRETA: Gaaah! Blown away!\n"
-	.string "Let’s see your FRONTIER PASS!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_25835B: @ 825835B
-	.string "The Guts Symbol took on\n"
-	.string "a golden shine!$"
-
-BattleFrontier_BattleArenaBattleRoom_Text_258383: @ 8258383
-	.string "Arrrgh!\n"
-	.string "This is so infuriating!\p"
-	.string "If we ever battle again, I won’t lose!\n"
-	.string "Don’t you forget it! Bye-bye!$"
diff --git a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc
deleted file mode 100644
index 83b602fc4..000000000
--- a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9
-	map_script 2, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF
-	.byte 0
-
-BattleFrontier_BattleArenaCorridor_MapScript2_2573BF: @ 82573BF
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaCorridor_EventScript_2573C9
-	.2byte 0
-
-BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9
-	delay 16
-	setvar VAR_TEMP_0, 1
-	applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_25742F
-	applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_257417
-	waitmovement 0
-	applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257444
-	waitmovement 0
-	msgbox BattleFrontier_BattleArenaCorridor_Text_257449, 3
-	applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257446
-	waitmovement 0
-	applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_25742C
-	waitmovement 0
-	setvar VAR_0x8006, 0
-	warp BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5
-	waitstate
-	end
-
-BattleFrontier_BattleArenaCorridor_Movement_257417: @ 8257417
-	walk_up
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-BattleFrontier_BattleArenaCorridor_Movement_25742C: @ 825742C
-	walk_right
-	set_invisible
-	step_end
-
-BattleFrontier_BattleArenaCorridor_Movement_25742F: @ 825742F
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-BattleFrontier_BattleArenaCorridor_Movement_257444: @ 8257444
-	walk_in_place_fastest_left
-	step_end
-
-BattleFrontier_BattleArenaCorridor_Movement_257446: @ 8257446
-	walk_up
-	walk_in_place_fastest_down
-	step_end
-
-BattleFrontier_BattleArenaCorridor_Text_257449: @ 8257449
-	.string "Your battles shall be waged in\n"
-	.string "the next room. Please step in!$"
-
diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc
deleted file mode 100644
index 7a0695445..000000000
--- a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc
+++ /dev/null
@@ -1,638 +0,0 @@
-BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36
-	map_script 2, BattleFrontier_BattleArenaLobby_MapScript2_255C55
-	map_script 4, BattleFrontier_BattleArenaLobby_MapScript2_255C41
-	.byte 0
-
-BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaLobby_EventScript_255C4B
-	.2byte 0
-
-BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaLobby_EventScript_255C7F
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleArenaLobby_EventScript_255C88
-	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleArenaLobby_EventScript_255DC0
-	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleArenaLobby_EventScript_255CCF
-	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleArenaLobby_EventScript_255D2B
-	.2byte 0
-
-BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F
-	setvar VAR_0x8004, 0
-	special sub_81A1780
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88
-	lockall
-	msgbox BattleFrontier_BattleArenaLobby_Text_256811, 4
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_81A5238
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special sub_81A5238
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF
-	lockall
-	setvar VAR_0x8004, 10
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0
-	msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, 4
-	goto BattleFrontier_BattleArenaLobby_EventScript_255CF8
-
-BattleFrontier_BattleArenaLobby_EventScript_255CF0:: @ 8255CF0
-	msgbox BattleFrontier_BattleArenaLobby_Text_2572D9, 4
-
-BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8
-	msgbox BattleFrontier_BattleArenaLobby_Text_257353, 4
-	setvar VAR_0x8004, 11
-	special sub_81A1780
-	msgbox BattleFrontier_BattleArenaLobby_Text_241520, 9
-	message BattleFrontier_BattleArenaLobby_Text_256931
-	waitmessage
-	call BattleFrontier_BattleArenaLobby_EventScript_255D59
-	msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B
-	lockall
-	message BattleFrontier_BattleArenaLobby_Text_256A2C
-	waitmessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special sub_81A5238
-	call BattleFrontier_BattleArenaLobby_EventScript_255D59
-	msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59
-	setvar VAR_0x8004, 8
-	special sub_81A1780
-	special LoadPlayerParty
-	special HealPlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_81A5238
-	playse SE_SAVE
-	waitse
-	call BattleFrontier_BattleArenaLobby_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF
-	message BattleFrontier_BattleArenaLobby_Text_256B19
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleArenaLobby_EventScript_255DBF
-	case 0, BattleFrontier_BattleArenaLobby_EventScript_255DBA
-	case 127, BattleFrontier_BattleArenaLobby_EventScript_255DBF
-
-BattleFrontier_BattleArenaLobby_EventScript_255DBA:: @ 8255DBA
-	call BattleFrontier_BattleArenaLobby_EventScript_23E8B4
-
-BattleFrontier_BattleArenaLobby_EventScript_255DBF:: @ 8255DBF
-	return
-
-BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0
-	lockall
-	message BattleFrontier_BattleArenaLobby_Text_256AA1
-	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 1
-	special sub_81A5238
-	playse SE_SAVE
-	waitse
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	goto BattleFrontier_BattleArenaLobby_EventScript_255F54
-
-BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4
-	lock
-	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 3
-	setvar VAR_0x40CE, 0
-	special SavePlayerParty
-	msgbox BattleFrontier_BattleArenaLobby_Text_256166, 4
-
-BattleFrontier_BattleArenaLobby_EventScript_255E0B:: @ 8255E0B
-	message BattleFrontier_BattleArenaLobby_Text_2561EA
-	waitmessage
-	multichoice 17, 6, 23, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleArenaLobby_EventScript_255E47
-	case 1, BattleFrontier_BattleArenaLobby_EventScript_255F9F
-	case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB
-	case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB
-
-BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47
-	message BattleFrontier_BattleArenaLobby_Text_256513
-	waitmessage
-	multichoice 17, 6, 24, 0
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB
-	case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB
-	setvar VAR_0x8004, 15
-	special sub_81A1780
-	compare VAR_0x8004, 1
-	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	msgbox BattleFrontier_BattleArenaLobby_Text_256573, 4
-	fadescreen 1
-	call BattleFrontier_BattleArenaLobby_EventScript_23F2B7
-	copyvar VAR_0x8004, VAR_RESULT
-	setvar VAR_0x8005, 3
-	special sub_80F9490
-	waitstate
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8
-	msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleArenaLobby_EventScript_255FF8
-	case 1, BattleFrontier_BattleArenaLobby_EventScript_255EE8
-	case 127, BattleFrontier_BattleArenaLobby_EventScript_255FF8
-
-BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
-	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	special sub_81A1780
-	setvar VAR_0x8004, 0
-	special sub_81A5238
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special sub_81A5238
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special LoadPlayerParty
-	closemessage
-	delay 2
-	call BattleFrontier_BattleArenaLobby_EventScript_27134F
-	setvar VAR_TEMP_0, 255
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1
-
-BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54
-	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, 4
-	closemessage
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005
-	compare VAR_RESULT, 1
-	call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050
-	warp BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13
-	setvar VAR_TEMP_0, 0
-	waitstate
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_255F9F:: @ 8255F9F
-	msgbox BattleFrontier_BattleArenaLobby_Text_25624C, 4
-	goto BattleFrontier_BattleArenaLobby_EventScript_255E0B
-
-BattleFrontier_BattleArenaLobby_EventScript_255FAC:: @ 8255FAC
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleArenaLobby_EventScript_255FC7
-	case 1, BattleFrontier_BattleArenaLobby_EventScript_255FD4
-
-BattleFrontier_BattleArenaLobby_EventScript_255FC7:: @ 8255FC7
-	msgbox BattleFrontier_BattleArenaLobby_Text_2566A8, 4
-	goto BattleFrontier_BattleArenaLobby_EventScript_256003
-
-BattleFrontier_BattleArenaLobby_EventScript_255FD4:: @ 8255FD4
-	msgbox BattleFrontier_BattleArenaLobby_Text_2565A5, 4
-	goto BattleFrontier_BattleArenaLobby_EventScript_256003
-
-BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	goto BattleFrontier_BattleArenaLobby_EventScript_255FFB
-
-BattleFrontier_BattleArenaLobby_EventScript_255FF8:: @ 8255FF8
-	special LoadPlayerParty
-
-BattleFrontier_BattleArenaLobby_EventScript_255FFB:: @ 8255FFB
-	msgbox BattleFrontier_BattleArenaLobby_Text_25621F, 4
-
-BattleFrontier_BattleArenaLobby_EventScript_256003:: @ 8256003
-	release
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_256005:: @ 8256005
-	applymovement 1, BattleFrontier_BattleArenaLobby_Movement_256034
-	applymovement 255, BattleFrontier_BattleArenaLobby_Movement_256041
-	waitmovement 0
-	opendoor 2, 2
-	waitdooranim
-	applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E
-	applymovement 255, BattleFrontier_BattleArenaLobby_Movement_25604C
-	waitmovement 0
-	closedoor 2, 2
-	waitdooranim
-	return
-
-BattleFrontier_BattleArenaLobby_Movement_256034: @ 8256034
-	walk_up
-	walk_up
-	walk_up
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	step_end
-
-BattleFrontier_BattleArenaLobby_Movement_25603E: @ 825603E
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleArenaLobby_Movement_256041: @ 8256041
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_in_place_fastest_up
-	step_end
-
-BattleFrontier_BattleArenaLobby_Movement_25604C: @ 825604C
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050
-	applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25607F
-	applymovement 255, BattleFrontier_BattleArenaLobby_Movement_256088
-	waitmovement 0
-	opendoor 11, 2
-	waitdooranim
-	applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E
-	applymovement 255, BattleFrontier_BattleArenaLobby_Movement_25604C
-	waitmovement 0
-	closedoor 11, 2
-	waitdooranim
-	return
-
-BattleFrontier_BattleArenaLobby_Movement_25607F: @ 825607F
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	step_end
-
-BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092
-	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_2560A6:: @ 82560A6
-	msgbox BattleFrontier_BattleArenaLobby_Text_256B5C, 2
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_2560AF:: @ 82560AF
-	msgbox BattleFrontier_BattleArenaLobby_Text_256BCB, 2
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_2560B8:: @ 82560B8
-	msgbox BattleFrontier_BattleArenaLobby_Text_256C19, 2
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_2560C1:: @ 82560C1
-	msgbox BattleFrontier_BattleArenaLobby_Text_256C9A, 2
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_2560CA:: @ 82560CA
-	lockall
-	msgbox BattleFrontier_BattleArenaLobby_Text_256DB8, 4
-	goto BattleFrontier_BattleArenaLobby_EventScript_2560D9
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_2560D9:: @ 82560D9
-	message BattleFrontier_BattleArenaLobby_Text_256DDF
-	waitmessage
-	multichoice 17, 2, 96, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleArenaLobby_EventScript_25612C
-	case 1, BattleFrontier_BattleArenaLobby_EventScript_25613A
-	case 2, BattleFrontier_BattleArenaLobby_EventScript_256148
-	case 3, BattleFrontier_BattleArenaLobby_EventScript_256156
-	case 4, BattleFrontier_BattleArenaLobby_EventScript_256164
-	case 127, BattleFrontier_BattleArenaLobby_EventScript_256164
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_25612C:: @ 825612C
-	msgbox BattleFrontier_BattleArenaLobby_Text_256E02, 4
-	goto BattleFrontier_BattleArenaLobby_EventScript_2560D9
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_25613A:: @ 825613A
-	msgbox BattleFrontier_BattleArenaLobby_Text_256F43, 4
-	goto BattleFrontier_BattleArenaLobby_EventScript_2560D9
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_256148:: @ 8256148
-	msgbox BattleFrontier_BattleArenaLobby_Text_256FF2, 4
-	goto BattleFrontier_BattleArenaLobby_EventScript_2560D9
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_256156:: @ 8256156
-	msgbox BattleFrontier_BattleArenaLobby_Text_257202, 4
-	goto BattleFrontier_BattleArenaLobby_EventScript_2560D9
-	end
-
-BattleFrontier_BattleArenaLobby_EventScript_256164:: @ 8256164
-	releaseall
-	end
-
-BattleFrontier_BattleArenaLobby_Text_256166: @ 8256166
-	.string "Where the battling spirit of TRAINERS\n"
-	.string "is put to the test!\p"
-	.string "I welcome you to the BATTLE ARENA!\p"
-	.string "I am your guide to the Set KO Tourney!$"
-
-BattleFrontier_BattleArenaLobby_Text_2561EA: @ 82561EA
-	.string "Now, do you wish to take\n"
-	.string "the BATTLE ARENA challenge?$"
-
-BattleFrontier_BattleArenaLobby_Text_25621F: @ 825621F
-	.string "We await your challenge on\n"
-	.string "another occasion!$"
-
-BattleFrontier_BattleArenaLobby_Text_25624C: @ 825624C
-	.string "In the BATTLE ARENA, we undertake\n"
-	.string "the Set KO Tourney.\p"
-	.string "All participants enter with a team of\n"
-	.string "three POKéMON.\p"
-	.string "The three POKéMON must be lined up in\n"
-	.string "the order in which they are to appear.\p"
-	.string "During battle, the POKéMON will appear\n"
-	.string "one at a time in the preset order.\p"
-	.string "Once a POKéMON enters battle, it must\n"
-	.string "remain out until the match is decided.\p"
-	.string "If a match remains undecided in\n"
-	.string "three turns, it goes to judging.\p"
-	.string "If you wish to interrupt your challenge,\n"
-	.string "please save the game.\p"
-	.string "If you don’t save, you will not be able\n"
-	.string "to continue with your challenge.\p"
-	.string "If you pull off the feat of beating\n"
-	.string "seven TRAINERS in succession,\l"
-	.string "we will present you with Battle Points.$"
-
-BattleFrontier_BattleArenaLobby_Text_2564CE: @ 82564CE
-	.string "Before showing you to the BATTLE\n"
-	.string "ARENA, you must save. Is that okay?$"
-
-BattleFrontier_BattleArenaLobby_Text_256513: @ 8256513
-	.string "The BATTLE ARENA offers two levels\n"
-	.string "of challenge, Level 50 and Open Level.\l"
-	.string "Which is your choice?$"
-
-BattleFrontier_BattleArenaLobby_Text_256573: @ 8256573
-	.string "Very well, now select your\n"
-	.string "three POKéMON, please.$"
-
-BattleFrontier_BattleArenaLobby_Text_2565A5: @ 82565A5
-	.string "My dear challenger!\p"
-	.string "You do not have the three POKéMON\n"
-	.string "required for entry.\p"
-	.string "To qualify, you must bring three\n"
-	.string "different kinds of POKéMON.\p"
-	.string "They also must not hold the same\n"
-	.string "kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "When you have made your preparations,\n"
-	.string "please do return.$"
-
-BattleFrontier_BattleArenaLobby_Text_2566A8: @ 82566A8
-	.string "My dear challenger!\p"
-	.string "You do not have the three POKéMON\n"
-	.string "required for entry.\p"
-	.string "To qualify, you must bring three\n"
-	.string "different kinds of POKéMON.\p"
-	.string "The three different POKéMON\n"
-	.string "must all be Level 50 or lower.\p"
-	.string "They also must not hold the same\n"
-	.string "kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "When you have made your preparations,\n"
-	.string "please do return.$"
-
-BattleFrontier_BattleArenaLobby_Text_2567E6: @ 82567E6
-	.string "I shall now guide you to\n"
-	.string "the BATTLE ARENA.$"
-
-BattleFrontier_BattleArenaLobby_Text_256811: @ 8256811
-	.string "My dear challenger!\p"
-	.string "You did not save the game before\n"
-	.string "shutting down, did you?\p"
-	.string "It is unfortunate, but that has\n"
-	.string "resulted in your disqualification\l"
-	.string "from your challenge.\p"
-	.string "You may, of course, start with a fresh\n"
-	.string "challenge.$"
-
-BattleFrontier_BattleArenaLobby_Text_2568E7: @ 82568E7
-	.string "We congratulate you for your splendid\n"
-	.string "string of wins over seven TRAINERS!$"
-
-BattleFrontier_BattleArenaLobby_Text_256931: @ 8256931
-	.string "Your achievement will be recorded.\n"
-	.string "Please wait while I save the game.$"
-
-BattleFrontier_BattleArenaLobby_Text_256977: @ 8256977
-	.string "In commemoration of your 7-win streak,\n"
-	.string "we present you with this prize.$"
-
-BattleFrontier_BattleArenaLobby_Text_2569BE: @ 82569BE
-	.string "{PLAYER} received the prize\n"
-	.string "{STR_VAR_1}.$"
-
-BattleFrontier_BattleArenaLobby_Text_2569D8: @ 82569D8
-	.string "Oh?\n"
-	.string "Your BAG seems to be full.\p"
-	.string "I urge you to clear space and\n"
-	.string "return for your prize.$"
-
-BattleFrontier_BattleArenaLobby_Text_256A2C: @ 8256A2C
-	.string "Thank you so much for participating!\p"
-	.string "Please wait while I save the game.$"
-
-BattleFrontier_BattleArenaLobby_Text_256A74: @ 8256A74
-	.string "We await your challenge on\n"
-	.string "another occasion!$"
-
-BattleFrontier_BattleArenaLobby_Text_256AA1: @ 8256AA1
-	.string "We have been looking forward to\n"
-	.string "your arrival.\p"
-	.string "Before I show you to the BATTLE\n"
-	.string "ARENA, I must save the game.\l"
-	.string "Please wait.$"
-
-BattleFrontier_BattleArenaLobby_Text_256B19: @ 8256B19
-	.string "Shall I record your last BATTLE ARENA\n"
-	.string "match on your FRONTIER PASS?$"
-
-BattleFrontier_BattleArenaLobby_Text_256B5C: @ 8256B5C
-	.string "I lost on the REFEREE’s decision…\p"
-	.string "I don’t think it was a good idea to only\n"
-	.string "use defensive moves and not attack…$"
-
-BattleFrontier_BattleArenaLobby_Text_256BCB: @ 8256BCB
-	.string "I won in judging!\p"
-	.string "Landing hits consistently on\n"
-	.string "the opponent’s POKéMON worked!$"
-
-BattleFrontier_BattleArenaLobby_Text_256C19: @ 8256C19
-	.string "Our match was declared a draw.\p"
-	.string "When we ran out of time, both my\n"
-	.string "POKéMON and the opponent’s had about\l"
-	.string "the same amount of HP left.$"
-
-BattleFrontier_BattleArenaLobby_Text_256C9A: @ 8256C9A
-	.string "In the BATTLE ARENA, the order of\n"
-	.string "POKéMON is totally important.\p"
-	.string "For example, if your first POKéMON\n"
-	.string "has certain type disadvantages,\l"
-	.string "try making your second POKéMON one\l"
-	.string "with moves that are super effective\l"
-	.string "against the first one.\p"
-	.string "I think that will be a good way of\n"
-	.string "making an effective team.$"
-
-BattleFrontier_BattleArenaLobby_Text_256DB8: @ 8256DB8
-FallarborTown_BattleTentLobby_Text_256DB8: @ 8256DB8
-	.string "The Set KO Tourney’s rules are listed.$"
-
-BattleFrontier_BattleArenaLobby_Text_256DDF: @ 8256DDF
-FallarborTown_BattleTentLobby_Text_256DDF: @ 8256DDF
-	.string "Which heading do you want to read?$"
-
-BattleFrontier_BattleArenaLobby_Text_256E02: @ 8256E02
-FallarborTown_BattleTentLobby_Text_256E02: @ 8256E02
-	.string "The Set KO Tourney has special rules,\n"
-	.string "unlike standard battles.\p"
-	.string "First, one battle lasts only\n"
-	.string "three turns.\p"
-	.string "If the outcome is not decided after\n"
-	.string "three turns, it goes to judging.\p"
-	.string "The REFEREE will choose the winner\n"
-	.string "based on how the POKéMON battled.\p"
-	.string "Also, a POKéMON cannot be switched out\n"
-	.string "until its battle’s outcome is decided.$"
-
-BattleFrontier_BattleArenaLobby_Text_256F43: @ 8256F43
-FallarborTown_BattleTentLobby_Text_256F43: @ 8256F43
-	.string "The first judging factor is “Mind.”\n"
-	.string "This factor evaluates how aggressive\l"
-	.string "the battlers were.\p"
-	.string "The judging is based on how often\n"
-	.string "the TRAINERS ordered the use of\l"
-	.string "offensive moves.$"
-
-BattleFrontier_BattleArenaLobby_Text_256FF2: @ 8256FF2
-FallarborTown_BattleTentLobby_Text_256FF2: @ 8256FF2
-	.string "The second judging factor is “Skill.”\n"
-	.string "This factor evaluates how effectively\l"
-	.string "POKéMON moves were used.\p"
-	.string "If a move worked successfully,\n"
-	.string "the Skill rating goes up.\p"
-	.string "If a move failed, the Skill rating\n"
-	.string "is lowered.\p"
-	.string "If it was an offensive move, the Skill\n"
-	.string "rating goes up if the move was “super\l"
-	.string "effective” and goes down if it was\l"
-	.string "“not very effective.”\p"
-	.string "The Skill rating will not go up for\n"
-	.string "moves such as PROTECT and DETECT.\p"
-	.string "If the opponent used PROTECT or\n"
-	.string "DETECT, and your POKéMON failed to\l"
-	.string "hit with a move, its Skill rating will not\l"
-	.string "go down.$"
-
-BattleFrontier_BattleArenaLobby_Text_257202: @ 8257202
-FallarborTown_BattleTentLobby_Text_257202: @ 8257202
-	.string "The third judging factor is “Body.”\n"
-	.string "This factor is based on how much HP\l"
-	.string "remained at the end of a battle.\p"
-	.string "The rating takes into account how much\n"
-	.string "HP a POKéMON had at the start of\l"
-	.string "battle, and what remained at the end.$"
-
-BattleFrontier_BattleArenaLobby_Text_2572D9: @ 82572D9
-	.string "A victory snatched from the ARENA\n"
-	.string "TYCOON, and a seven-TRAINER sweep!\p"
-	.string "We congratulate you on your most\n"
-	.string "splendid challenge!$"
-
-BattleFrontier_BattleArenaLobby_Text_257353: @ 8257353
-	.string "My dear challenger, in recognition of\n"
-	.string "your indefatigable spirit, please\l"
-	.string "accept these Battle Point(s).$"
diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc
deleted file mode 100644
index c46358aed..000000000
--- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc
+++ /dev/null
@@ -1,1277 +0,0 @@
-BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
-	map_script 3, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1
-	map_script 2, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00
-	map_script 4, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481
-	map_script 5, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0
-	.byte 0
-
-BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
-	setvar VAR_0x8004, 10
-	special sub_818E9AC
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	copyvar VAR_TEMP_F, VAR_RESULT
-	compare VAR_RESULT, 0
-	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC
-	end
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4
-	setvar VAR_OBJ_GFX_ID_1, 100
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA:: @ 824BCFA
-	setvar VAR_OBJ_GFX_ID_1, 105
-	return
-
-BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A
-	.2byte 0
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A
-	lockall
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
-	compare VAR_RESULT, 0
-	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C938
-	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4
-	waitmovement 0
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, 4
-	closemessage
-	showobjectat 13, BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM
-	compare VAR_TEMP_F, 3
-	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E
-	compare VAR_TEMP_E, 0
-	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E:: @ 824BD4E
-	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C775
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A:: @ 824BD5A
-	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77F
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61
-	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
-	waitmovement 0
-	compare VAR_TEMP_F, 3
-	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82
-	compare VAR_TEMP_E, 0
-	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
-	setvar VAR_0x8004, 4
-	special sub_818E9AC
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, 4
-	closemessage
-	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B
-	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C789
-	waitmovement 0
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	special sub_8161F74
-	msgbox 0x2021fc4, 4
-	closemessage
-	setvar VAR_0x8004, 5
-	special sub_818E9AC
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440
-	setvar VAR_TEMP_2, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
-	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
-	setvar VAR_TEMP_2, 1
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA86, 4
-	closemessage
-	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
-	delay 60
-	applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C964
-	waitmovement 0
-	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_24C969
-	waitmovement 0
-	delay 180
-	applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C96B
-	waitmovement 0
-	compare VAR_TEMP_2, 2
-	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
-	setvar VAR_0x8004, 19
-	special sub_818E9AC
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
-	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4
-	waitmovement 0
-	setvar VAR_0x8004, 4
-	special sub_818E9AC
-	compare VAR_TEMP_2, 0
-	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1
-	compare VAR_TEMP_2, 1
-	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5
-	compare VAR_TEMP_2, 2
-	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9
-	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
-	delay 60
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 2
-	special sub_818E9AC
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special sub_81A1780
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5
-@ 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1
-	setvar VAR_0x8004, 20
-	setvar VAR_0x8005, 1
-	special sub_81A1780
-	message BattleFrontier_BattleDomeBattleRoom_Text_24C9E1
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5:: @ 824BEC5
-	setvar VAR_0x8004, 20
-	setvar VAR_0x8005, 0
-	special sub_81A1780
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CB34
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9:: @ 824BED9
-	message BattleFrontier_BattleDomeBattleRoom_Text_24D6BE
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
-	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4
-	waitmovement 0
-	compare VAR_TEMP_2, 0
-	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3
-	compare VAR_TEMP_2, 1
-	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC
-	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
-	delay 60
-	setvar VAR_0x8004, 3
-	special sub_818E9AC
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 1
-	special sub_818E9AC
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	switch VAR_RESULT
-	case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
-	setvar VAR_0x8006, 1
-	warp BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3
-	waitstate
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62
-	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77D
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_81A1780
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, 4
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96:: @ 824BF96
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA44, 4
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E
-	special sub_8175280
-	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
-	delay 60
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special sub_81A1780
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3:: @ 824BFC3
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C9BE, 4
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CB9D, 4
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 6
-	special sub_818E9AC
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_818E9AC
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_818E9AC
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C023:: @ 824C023
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C05A
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C061
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C068
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C06F
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C05A:: @ 824C05A
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CC06
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C061:: @ 824C061
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CC1C
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C068:: @ 824C068
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CC2E
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C06F:: @ 824C06F
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CC5B
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C076:: @ 824C076
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0AD
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0B4
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0BB
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C0AD:: @ 824C0AD
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CC99
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C0B4:: @ 824C0B4
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CCC5
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C0BB:: @ 824C0BB
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CCFD
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2:: @ 824C0C2
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CD33
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9:: @ 824C0C9
-	compare VAR_TEMP_F, 3
-	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C105
-	switch VAR_TEMP_E
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158
-	case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C105:: @ 824C105
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C13C
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C143
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C14A
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C151
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C13C:: @ 824C13C
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CD72
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C143:: @ 824C143
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CD8C
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C14A:: @ 824C14A
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CDB3
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C151:: @ 824C151
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CDDE
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C158:: @ 824C158
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEBE, 4
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C161:: @ 824C161
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D232, 4
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A:: @ 824C16A
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A1
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A8
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1AF
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A1:: @ 824C1A1
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CE10
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A8:: @ 824C1A8
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CE33
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C1AF:: @ 824C1AF
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CE57
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6:: @ 824C1B6
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CE94
-	waitmessage
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD:: @ 824C1BD
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB
-	switch VAR_TEMP_E
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC
-	case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC:: @ 824C1FC
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEDE, 4
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C211
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C209:: @ 824C209
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D26C, 4
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211
-	closemessage
-	applymovement 2, BattleFrontier_BattleDomeBattleRoom_Movement_24C94B
-	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9
-	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C78E
-	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
-	waitse
-	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
-	waitse
-	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
-	waitse
-	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
-	waitse
-	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
-	waitse
-	waitmovement 0
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CF7A
-	waitmessage
-	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
-	waitse
-	switch VAR_TEMP_E
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C346
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
-	case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, 4
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, 4
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
-	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 1
-	special sub_818E9AC
-	setvar VAR_0x8004, 12
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
-	closemessage
-	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B
-	waitmovement 0
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D172, 4
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattleDomeBattleRoom_Text_24D1AA
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, 13
-	special sub_81A1780
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, 4
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, 4
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, 4
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
-	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 1
-	special sub_818E9AC
-	setvar VAR_0x8004, 12
-	special sub_81A1780
-	compare VAR_RESULT, 2
-	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
-	closemessage
-	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B
-	waitmovement 0
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D47F, 4
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattleDomeBattleRoom_Text_24D522
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, 13
-	special sub_81A1780
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, 4
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C400:: @ 824C400
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D677, 4
-	closemessage
-	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C787
-	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C829
-	waitmovement 0
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C420:: @ 824C420
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D127, 4
-	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
-	waitse
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C436:: @ 824C436
-	setvar VAR_TEMP_2, 2
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special HealPlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	setvar VAR_TEMP_9, 1
-	special sub_8163AC4
-	waitstate
-	setvar VAR_TEMP_9, 0
-	setvar VAR_0x8004, 17
-	special sub_818E9AC
-	special HealPlayerParty
-	setvar VAR_0x8004, 16
-	special sub_818E9AC
-	return
-
-BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B
-	.2byte 0
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B
-	hideobjectat 13, BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC
-	setvar VAR_TEMP_1, 1
-	applymovement 255, BattleFrontier_BattleDomeBattleRoom_Movement_24C773
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	compare VAR_RESULT, 3
-	goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
-	setvar VAR_0x8004, 9
-	special sub_81A1780
-	copyvar VAR_TEMP_E, VAR_RESULT
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_242170
-	setobjectxyperm 15, 13, 9
-	removeobject 15
-	addobject 15
-	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C78B
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF:: @ 824C4EF
-	end
-
-BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0: @ 824C4F0
-	compare VAR_TEMP_9, 1
-	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC
-	end
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C502:: @ 824C502
-	compare VAR_TEMP_F, 0
-	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F
-	compare VAR_TEMP_F, 1
-	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C530
-	compare VAR_TEMP_F, 2
-	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C594
-	compare VAR_TEMP_F, 3
-	call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C652
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C530:: @ 824C530
-	createvobject 46, 1, 3, 0, 3, 1
-	createvobject 22, 4, 6, 0, 3, 1
-	createvobject 5, 6, 8, 0, 3, 1
-	createvobject 12, 9, 11, 0, 3, 1
-	createvobject 46, 11, 13, 0, 3, 1
-	createvobject 66, 13, 15, 0, 3, 1
-	createvobject 45, 19, 7, 1, 3, 1
-	createvobject 34, 22, 11, 1, 3, 1
-	createvobject 11, 25, 15, 1, 3, 1
-	createvobject 35, 26, 2, 2, 3, 1
-	createvobject 38, 29, 5, 1, 3, 1
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C594:: @ 824C594
-	createvobject 46, 1, 3, 0, 3, 1
-	createvobject 22, 4, 6, 0, 3, 1
-	createvobject 5, 6, 8, 0, 3, 1
-	createvobject 20, 7, 9, 0, 3, 1
-	createvobject 12, 9, 11, 0, 3, 1
-	createvobject 47, 10, 12, 0, 3, 1
-	createvobject 46, 11, 13, 0, 3, 1
-	createvobject 66, 13, 15, 0, 3, 1
-	createvobject 48, 15, 2, 1, 3, 1
-	createvobject 5, 16, 3, 1, 3, 1
-	createvobject 20, 17, 4, 1, 3, 1
-	createvobject 45, 19, 7, 1, 3, 1
-	createvobject 22, 20, 9, 1, 3, 1
-	createvobject 34, 22, 11, 1, 3, 1
-	createvobject 46, 23, 13, 1, 3, 1
-	createvobject 11, 25, 15, 1, 3, 1
-	createvobject 35, 26, 2, 2, 3, 1
-	createvobject 40, 28, 5, 2, 3, 1
-	createvobject 38, 29, 5, 1, 3, 1
-	createvobject 83, 30, 6, 2, 3, 1
-	createvobject 34, 31, 8, 2, 3, 1
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652
-	createvobject 5, 0, 2, 0, 3, 1
-	createvobject 46, 1, 3, 0, 3, 1
-	createvobject 45, 2, 15, 0, 3, 1
-	createvobject 66, 3, 5, 0, 3, 1
-	createvobject 22, 4, 6, 0, 3, 1
-	createvobject 46, 5, 7, 0, 3, 1
-	createvobject 5, 6, 8, 0, 3, 1
-	createvobject 20, 7, 9, 0, 3, 1
-	createvobject 24, 8, 10, 0, 3, 1
-	createvobject 12, 9, 11, 0, 3, 1
-	createvobject 47, 10, 12, 0, 3, 1
-	createvobject 46, 11, 13, 0, 3, 1
-	createvobject 45, 12, 14, 0, 3, 1
-	createvobject 66, 13, 15, 2, 3, 1
-	createvobject 55, 14, 12, 2, 3, 1
-	createvobject 48, 15, 2, 1, 3, 1
-	createvobject 5, 16, 3, 1, 3, 1
-	createvobject 20, 17, 4, 1, 3, 1
-	createvobject 24, 18, 6, 1, 3, 1
-	createvobject 45, 19, 7, 1, 3, 1
-	createvobject 22, 20, 9, 1, 3, 1
-	createvobject 23, 21, 10, 1, 3, 1
-	createvobject 34, 22, 11, 1, 3, 1
-	createvobject 46, 23, 13, 1, 3, 1
-	createvobject 48, 24, 14, 1, 3, 1
-	createvobject 11, 25, 15, 1, 3, 1
-	createvobject 35, 26, 2, 2, 3, 1
-	createvobject 17, 27, 3, 2, 3, 1
-	createvobject 40, 28, 5, 2, 3, 1
-	createvobject 38, 29, 5, 1, 3, 1
-	createvobject 83, 30, 6, 2, 3, 1
-	createvobject 34, 31, 8, 2, 3, 1
-	return
-
-BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773
-BattleFrontier_BattleDomeBattleRoom_Movement_24C773: @ 824C773
-	set_invisible
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C775: @ 824C775
-	set_visible
-	delay_16
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C77B: @ 824C77B
-	walk_right
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C77D: @ 824C77D
-	walk_up
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C77F: @ 824C77F
-	set_visible
-	delay_16
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_right
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C787: @ 824C787
-	walk_right
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C789: @ 824C789
-	walk_left
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C78B: @ 824C78B
-	face_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C78E: @ 824C78E
-	set_visible
-	walk_up
-	walk_up
-	walk_up
-	face_left
-	delay_8
-	delay_4
-	face_down
-	delay_8
-	delay_4
-	face_right
-	delay_8
-	delay_4
-	face_up
-	delay_8
-	delay_4
-	face_left
-	delay_16
-	walk_fast_up
-	walk_fast_up
-	face_left
-	delay_8
-	delay_4
-	face_down
-	delay_8
-	delay_4
-	face_right
-	delay_8
-	delay_4
-	face_up
-	delay_8
-	delay_4
-	face_left
-	jump_2_left
-	unlock_facing_direction
-	face_up
-	lock_facing_direction
-	jump_2_left
-	jump_2_left
-	unlock_facing_direction
-	face_right
-	lock_facing_direction
-	jump_2_left
-	unlock_facing_direction
-	face_down
-	delay_2
-	face_left
-	delay_8
-	delay_4
-	face_up
-	delay_8
-	delay_4
-	face_right
-	delay_8
-	delay_4
-	face_down
-	delay_8
-	delay_4
-	face_left
-	delay_4
-	face_up
-	delay_4
-	face_right
-	delay_4
-	face_down
-	delay_4
-	face_left
-	delay_2
-	face_up
-	delay_2
-	face_right
-	delay_2
-	face_down
-	delay_2
-	face_left
-	lock_facing_direction
-	walk_right
-	walk_slow_right
-	walk_right
-	walk_slow_right
-	unlock_facing_direction
-	face_up
-	delay_16
-	jump_in_place_up
-	jump_in_place_up
-	delay_16
-	walk_right
-	walk_right
-	walk_right
-	jump_in_place_up
-	delay_16
-	walk_right
-	walk_down
-	walk_down
-	face_left
-	delay_2
-	face_up
-	delay_2
-	face_right
-	delay_2
-	face_down
-	delay_2
-	face_left
-	delay_4
-	walk_left
-	walk_left
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9: @ 824C7F9
-	delay_16
-	delay_16
-	walk_left
-	walk_left
-	walk_in_place_fastest_right
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_right
-	walk_right
-	walk_in_place_fastest_down
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C829: @ 824C829
-	walk_left
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C82B: @ 824C82B
-	walk_left
-	walk_left
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E
-	turnvobject 0, 4
-	turnvobject 2, 4
-	turnvobject 4, 4
-	turnvobject 6, 4
-	turnvobject 8, 4
-	turnvobject 10, 3
-	turnvobject 12, 3
-	turnvobject 14, 3
-	turnvobject 16, 3
-	turnvobject 18, 3
-	turnvobject 20, 4
-	turnvobject 22, 4
-	turnvobject 24, 4
-	turnvobject 26, 4
-	turnvobject 28, 4
-	turnvobject 30, 4
-	delay 20
-	turnvobject 0, 1
-	turnvobject 2, 1
-	turnvobject 4, 1
-	turnvobject 6, 1
-	turnvobject 8, 1
-	turnvobject 10, 1
-	turnvobject 12, 1
-	turnvobject 14, 1
-	turnvobject 16, 1
-	turnvobject 18, 1
-	turnvobject 20, 1
-	turnvobject 22, 1
-	turnvobject 24, 1
-	turnvobject 26, 1
-	turnvobject 28, 1
-	turnvobject 30, 1
-	delay 20
-	turnvobject 1, 4
-	turnvobject 3, 4
-	turnvobject 5, 4
-	turnvobject 7, 4
-	turnvobject 9, 4
-	turnvobject 11, 3
-	turnvobject 13, 3
-	turnvobject 15, 3
-	turnvobject 17, 3
-	turnvobject 19, 3
-	turnvobject 21, 4
-	turnvobject 23, 4
-	turnvobject 25, 4
-	turnvobject 27, 3
-	turnvobject 31, 3
-	delay 20
-	turnvobject 1, 1
-	turnvobject 3, 1
-	turnvobject 5, 1
-	turnvobject 7, 1
-	turnvobject 9, 1
-	turnvobject 11, 1
-	turnvobject 13, 1
-	turnvobject 15, 1
-	turnvobject 17, 1
-	turnvobject 19, 1
-	turnvobject 21, 1
-	turnvobject 23, 1
-	turnvobject 25, 1
-	turnvobject 27, 1
-	turnvobject 31, 1
-	delay 20
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5
-	copyvar VAR_RESULT, VAR_0x40CE
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F
-	warp BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11
-	waitstate
-	end
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F:: @ 824C90F
-	warp BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11
-	waitstate
-	end
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919
-	random 2
-	copyvar VAR_TEMP_D, VAR_RESULT
-	compare VAR_TEMP_D, 0
-	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
-	setobjectxyperm 6, 2, 0
-	setobjectmovementtype 6, 10
-	return
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938
-	compare VAR_TEMP_D, 0
-	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
-	applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E
-	return
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C94B: @ 824C94B
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_8
-	disable_jump_landing_ground_effect
-	jump_in_place_down
-	delay_4
-	jump_in_place_down
-	enable_jump_landing_ground_effect
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C95E: @ 824C95E
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_in_place_fastest_down
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C964: @ 824C964
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C969: @ 824C969
-	walk_in_place_fastest_left
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C96B: @ 824C96B
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Text_24C970: @ 824C970
-	.string "{PLAYER} has entered the BATTLE DOME!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24C990: @ 824C990
-	.string "{STR_VAR_1}\n"
-	.string "match!\p"
-	.string "{PLAYER} versus {STR_VAR_2}!\p"
-	.string "Let the battle begin!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24C9BE: @ 824C9BE
-	.string "{PLAYER} is the winner!\n"
-	.string "Congratulations!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24C9E1: @ 824C9E1
-	.string "{STR_VAR_2} is the winner!\n"
-	.string "Congratulations!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CA04: @ 824CA04
-	.string "{PLAYER} is the Level 50\n"
-	.string "Battle Tournament Champion!\p"
-	.string "Congratulations!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CA44: @ 824CA44
-	.string "{PLAYER} is the Open Level\n"
-	.string "Battle Tournament Champion!\p"
-	.string "Congratulations!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CA86: @ 824CA86
-	.string "What an unbelievable finish!\n"
-	.string "We have a double knockout!\p"
-	.string "In this event, the Battle Tournament\n"
-	.string "rules call for a REFEREE’S decision.\p"
-	.string "Please wait while the judging\n"
-	.string "is under way.$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CB34: @ 824CB34
-	.string "The REFEREES have reached\n"
-	.string "a decision!\p"
-	.string "The winner is…\n"
-	.string "Oh, my goodness!\l"
-	.string "The winner is {STR_VAR_1}!\l"
-	.string "Congratulations!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CB9D: @ 824CB9D
-	.string "The REFEREES have reached\n"
-	.string "a decision!\p"
-	.string "The winner is…\n"
-	.string "Oh, my goodness!\l"
-	.string "The winner is {PLAYER}!\l"
-	.string "Congratulations!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CC06: @ 824CC06
-	.string "The bright new hope!\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CC1C: @ 824CC1C
-	.string "The rising star!\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CC2E: @ 824CC2E
-	.string "Will this TRAINER race to\n"
-	.string "the championship?\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CC5B: @ 824CC5B
-	.string "Can the feat of a championship\n"
-	.string "on the first try be achieved?\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CC99: @ 824CC99
-	.string "Can the loss of the last match\n"
-	.string "be avenged?\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CCC5: @ 824CCC5
-	.string "The TRAINER is on fire for\n"
-	.string "the first championship try!\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CCFD: @ 824CCFD
-	.string "A win here means this TRAINER\n"
-	.string "advances to the final!\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CD33: @ 824CD33
-	.string "Will the long-held dream of\n"
-	.string "a championship finally come true?\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CD72: @ 824CD72
-	.string "The invincible champion!\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CD8C: @ 824CD8C
-	.string "Can anyone hope to beat this\n"
-	.string "TRAINER?\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CDB3: @ 824CDB3
-	.string "Do battles exist solely for\n"
-	.string "this TRAINER?\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CDDE: @ 824CDDE
-	.string "The current champion aiming to\n"
-	.string "retain the title!\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CE10: @ 824CE10
-	.string "The former champion has returned!\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CE33: @ 824CE33
-	.string "The former toughness has returned!\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CE57: @ 824CE57
-	.string "Will this TRAINER do as expected\n"
-	.string "and advance to the finals?\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CE94: @ 824CE94
-	.string "Will the former champ regain\n"
-	.string "lost glory?\p"
-	.string "$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CEBE: @ 824CEBE
-	.string "Feel the glow of a true master!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CEDE: @ 824CEDE
-	.string "And now… The TRAINER standing in\n"
-	.string "{PLAYER}’s record-setting path…\p"
-	.string "Yes! The one and only!\n"
-	.string "The BATTLE DOME COMMISSIONER!\l"
-	.string "Our very own DOME ACE!\l"
-	.string "Make way for TUCKER!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CF7A: @ 824CF7A
-	.string "Spectators: TUCKER! TUCKER!\n"
-	.string "TUCKER! TUCKER! TUCKER!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24CFAE: @ 824CFAE
-	.string "TUCKER: Ahahah!\p"
-	.string "Do you hear it? This crowd!\n"
-	.string "They’re all itching to see our match!\p"
-	.string "Ahahah!\p"
-	.string "I bet you’re twitching all over from\n"
-	.string "the tension of getting to battle me!\p"
-	.string "But don’t you worry about a thing!\p"
-	.string "I’m the no. 1 star of the BATTLE DOME!\n"
-	.string "I, TUCKER the DOME ACE, will bathe you\l"
-	.string "in my brilliant glow!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D0D9: @ 824D0D9
-	.string "Your strategy!\n"
-	.string "Let’s see it!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D0F6: @ 824D0F6
-	.string "Unbelievable! It’s incredible!\n"
-	.string "The victor is {PLAYER}!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D127: @ 824D127
-	.string "The winner is TUCKER!\n"
-	.string "The DOME ACE has prevailed!\p"
-	.string "Congratulations, TUCKER!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D172: @ 824D172
-	.string "TUCKER: Rules are rules!\n"
-	.string "Let me see your FRONTIER PASS.$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D1AA: @ 824D1AA
-	.string "The Tactics Symbol was embossed on\n"
-	.string "the FRONTIER PASS!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D1E0: @ 824D1E0
-	.string "… … … … … …\p"
-	.string "I sorely underestimated you. I won’t\n"
-	.string "make the same mistake next time…$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D232: @ 824D232
-	.string "Can the win streak be stretched?\n"
-	.string "The confidence is there!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D26C: @ 824D26C
-	.string "Ladies and gentlemen!\n"
-	.string "Boys, girls, and POKéMON!\p"
-	.string "Finally!\n"
-	.string "Finally, the legend has returned!\p"
-	.string "Yes, the name of that legend!\n"
-	.string "Our very own DOME ACE!\l"
-	.string "It’s none other than TUCKER!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D319: @ 824D319
-	.string "TUCKER: Ah…\n"
-	.string "The pummeling roar of the crowd…\l"
-	.string "Their furnace-like heat of excitement…\l"
-	.string "This is a wonderful place…\p"
-	.string "To the crowd, I am the DOME ACE…\n"
-	.string "I represent their hopes and dreams…\l"
-	.string "I must never fade from their sight…\p"
-	.string "I must burn!\n"
-	.string "Brighter and more brilliant!\l"
-	.string "I must light all that gather here!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D43E: @ 824D43E
-	.string "I will unleash all the power that\n"
-	.string "I possess! Right here and now!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D47F: @ 824D47F
-	.string "TUCKER: You’re genuinely fantastic!\p"
-	.string "Never before! I haven’t ever lost in the\n"
-	.string "times I’ve had to unleash my power.\p"
-	.string "Yes, quite fantastic!\n"
-	.string "Your FRONTIER PASS, please?$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D522: @ 824D522
-	.string "The Tactics Symbol took on\n"
-	.string "a golden shine!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D54D: @ 824D54D
-	.string "You’re strong, but above all,\n"
-	.string "you have a unique charm!\p"
-	.string "In you, I see a definite potential for\n"
-	.string "a superstar like me.\p"
-	.string "I will very much look forward to\n"
-	.string "our next encounter!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D5F5: @ 824D5F5
-	.string "{PLAYER} is the Level 50\n"
-	.string "Battle Tournament Champion!\p"
-	.string "Congratulations!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D635: @ 824D635
-	.string "{PLAYER} is the Open Level\n"
-	.string "Battle Tournament Champion!\p"
-	.string "Congratulations!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D677: @ 824D677
-	.string "The final match!\p"
-	.string "{PLAYER} versus the DOME ACE, TUCKER!\p"
-	.string "Let the battle begin!$"
-
-BattleFrontier_BattleDomeBattleRoom_Text_24D6BE: @ 824D6BE
-	.string "The REFEREES have reached\n"
-	.string "a decision!\p"
-	.string "The winner is…\n"
-	.string "Oh, my goodness!\l"
-	.string "The winner is our very own DOME ACE!\l"
-	.string "It’s TUCKER!\p"
-	.string "Congratulations! And thank you!\n"
-	.string "Let’s hear it for the DOME ACE, TUCKER!$"
diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc
deleted file mode 100644
index 6a97382d4..000000000
--- a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc
+++ /dev/null
@@ -1,152 +0,0 @@
-BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE
-	map_script 2, BattleFrontier_BattleDomeCorridor_MapScript2_24B104
-	.byte 0
-
-BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_24B10E
-	.2byte 0
-
-BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E
-	delay 16
-	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161
-	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2
-	applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1A1
-	waitmovement 0
-	opendoor 13, 3
-	waitdooranim
-	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1BE
-	applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1AE
-	waitmovement 0
-	closedoor 13, 3
-	waitdooranim
-	goto BattleFrontier_BattleDomeCorridor_EventScript_24B18F
-
-BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161
-	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1D6
-	applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1C1
-	waitmovement 0
-	opendoor 37, 3
-	waitdooranim
-	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1E6
-	applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1D2
-	waitmovement 0
-	closedoor 37, 3
-	waitdooranim
-
-BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F
-	waitmovement 0
-	setvar VAR_0x8006, 0
-	warp BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7
-	waitstate
-	end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1A1: @ 824B1A1
-	walk_up
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_in_place_fastest_up
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1AE: @ 824B1AE
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1BE: @ 824B1BE
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1D2: @ 824B1D2
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1E6: @ 824B1E6
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1E9: @ 824B1E9
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	set_invisible
-	step_end
diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc
deleted file mode 100644
index b08d0ca89..000000000
--- a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc
+++ /dev/null
@@ -1,777 +0,0 @@
-BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
-	map_script 5, BattleFrontier_BattleDomeLobby_MapScript1_2497F2
-	map_script 2, BattleFrontier_BattleDomeLobby_MapScript2_24980F
-	map_script 4, BattleFrontier_BattleDomeLobby_MapScript2_2497FB
-	.byte 0
-
-BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2
-	setvar VAR_0x8004, 21
-	special sub_818E9AC
-	end
-
-BattleFrontier_BattleDomeLobby_MapScript2_2497FB: @ 82497FB
-BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_249805
-	.2byte 0
-
-BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeLobby_EventScript_249839
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleDomeLobby_EventScript_249842
-	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleDomeLobby_EventScript_2499F9
-	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleDomeLobby_EventScript_24989B
-	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleDomeLobby_EventScript_249940
-	.2byte 0
-
-BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839
-	setvar VAR_0x8004, 0
-	special sub_81A1780
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
-	lockall
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, 4
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_818E9AC
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_818E9AC
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special sub_818E9AC
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B
-	call BattleFrontier_BattleDomeLobby_EventScript_241EBA
-	lockall
-	setvar VAR_0x8004, 10
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, 4
-	goto BattleFrontier_BattleDomeLobby_EventScript_2498C9
-
-BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AD67, 4
-
-BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
-	msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, 4
-	setvar VAR_0x8004, 11
-	special sub_81A1780
-	msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9
-	message BattleFrontier_BattleDomeLobby_Text_24A5D6
-	waitmessage
-	special LoadPlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	setvar VAR_0x8004, 8
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special sub_818E9AC
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	setvar VAR_0x8006, 1
-	special sub_818E9AC
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 1
-	special sub_818E9AC
-	special LoadPlayerParty
-	special HealPlayerParty
-	goto BattleFrontier_BattleDomeLobby_EventScript_249991
-
-BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
-	lockall
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, 4
-	message BattleFrontier_BattleDomeLobby_Text_24A5D6
-	waitmessage
-	special LoadPlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	setvar VAR_0x8004, 8
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_818E9AC
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special sub_818E9AC
-	special LoadPlayerParty
-	special HealPlayerParty
-
-BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 0
-	special sub_818E9AC
-	playse SE_SAVE
-	waitse
-	call BattleFrontier_BattleDomeLobby_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9
-	message BattleFrontier_BattleDomeLobby_Text_24AE17
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomeLobby_EventScript_2499E9
-	case 0, BattleFrontier_BattleDomeLobby_EventScript_2499E4
-	case 127, BattleFrontier_BattleDomeLobby_EventScript_2499E9
-
-BattleFrontier_BattleDomeLobby_EventScript_2499E4:: @ 82499E4
-	call BattleFrontier_BattleDomeLobby_EventScript_23E8B4
-
-BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9
-	msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9
-	lockall
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, 4
-	message BattleFrontier_BattleDomeLobby_Text_24A61A
-	waitmessage
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 1
-	special sub_818E9AC
-	playse SE_SAVE
-	waitse
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	goto BattleFrontier_BattleDomeLobby_EventScript_249BC2
-
-BattleFrontier_BattleDomeLobby_EventScript_249A35:: @ 8249A35
-	lock
-	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 1
-	setvar VAR_0x40CE, 0
-	goto BattleFrontier_BattleDomeLobby_EventScript_249A59
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47
-	lock
-	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 1
-	setvar VAR_0x40CE, 1
-	goto BattleFrontier_BattleDomeLobby_EventScript_249A59
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59
-	special SavePlayerParty
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D06
-
-BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D0F
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D15
-	waitmessage
-	multichoice 17, 6, 23, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeLobby_EventScript_249ABF
-	case 1, BattleFrontier_BattleDomeLobby_EventScript_249BFA
-	case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64
-	case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64
-
-BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
-	message BattleFrontier_BattleDomeLobby_Text_24A210
-	waitmessage
-	multichoice 17, 6, 24, 0
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64
-	case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64
-	setvar VAR_0x8004, 15
-	special sub_81A1780
-	compare VAR_0x8004, 1
-	goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C15
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, 4
-	fadescreen 1
-	call BattleFrontier_BattleDomeLobby_EventScript_23F2B7
-	copyvar VAR_0x8004, VAR_RESULT
-	setvar VAR_0x8005, 3
-	special sub_80F9490
-	waitstate
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C61
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeLobby_EventScript_249C61
-	case 1, BattleFrontier_BattleDomeLobby_EventScript_249B60
-	case 127, BattleFrontier_BattleDomeLobby_EventScript_249C61
-
-BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
-	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	special sub_81A1780
-	setvar VAR_0x8004, 0
-	special sub_818E9AC
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special LoadPlayerParty
-	closemessage
-	delay 2
-	call BattleFrontier_BattleDomeLobby_EventScript_27134F
-	setvar VAR_TEMP_0, 255
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A
-	setvar VAR_0x8004, 22
-	special sub_818E9AC
-
-BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
-	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	setvar VAR_0x8004, 15
-	special sub_818E9AC
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4
-	closemessage
-	call BattleFrontier_BattleDomeLobby_EventScript_249C6E
-	special HealPlayerParty
-	warp BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6
-	setvar VAR_TEMP_0, 0
-	waitstate
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D1B
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D24
-	goto BattleFrontier_BattleDomeLobby_EventScript_249A72
-
-BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeLobby_EventScript_249C30
-	case 1, BattleFrontier_BattleDomeLobby_EventScript_249C3D
-
-BattleFrontier_BattleDomeLobby_EventScript_249C30:: @ 8249C30
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A353, 4
-	goto BattleFrontier_BattleDomeLobby_EventScript_249C6C
-
-BattleFrontier_BattleDomeLobby_EventScript_249C3D:: @ 8249C3D
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A2AB, 4
-	goto BattleFrontier_BattleDomeLobby_EventScript_249C6C
-
-BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	goto BattleFrontier_BattleDomeLobby_EventScript_249C64
-
-BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61
-	special LoadPlayerParty
-
-BattleFrontier_BattleDomeLobby_EventScript_249C64:: @ 8249C64
-	msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4
-
-BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C
-	release
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5
-	applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D45
-	waitmovement 0
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D33
-	waitdooranim
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5
-	applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D4E
-	waitmovement 0
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D3F
-	waitdooranim
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249CDD:: @ 8249CDD
-	applymovement 1, BattleFrontier_BattleDomeLobby_Movement_249D45
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249CE5:: @ 8249CE5
-	applymovement 6, BattleFrontier_BattleDomeLobby_Movement_249D45
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249CED:: @ 8249CED
-	applymovement 1, BattleFrontier_BattleDomeLobby_Movement_249D4B
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249CF5:: @ 8249CF5
-	applymovement 6, BattleFrontier_BattleDomeLobby_Movement_249D4B
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249CFD:: @ 8249CFD
-	msgbox BattleFrontier_BattleDomeLobby_Text_249EB7, 4
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249D06:: @ 8249D06
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A664, 4
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249D0F:: @ 8249D0F
-	message BattleFrontier_BattleDomeLobby_Text_249F3A
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249D15:: @ 8249D15
-	message BattleFrontier_BattleDomeLobby_Text_24A6E7
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249D1B:: @ 8249D1B
-	msgbox BattleFrontier_BattleDomeLobby_Text_249F8E, 4
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249D24:: @ 8249D24
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A721, 4
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249D2D:: @ 8249D2D
-	opendoor 5, 4
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249D33:: @ 8249D33
-	opendoor 17, 4
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249D39:: @ 8249D39
-	closedoor 5, 4
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249D3F:: @ 8249D3F
-	closedoor 17, 4
-	return
-
-BattleFrontier_BattleDomeLobby_Movement_249D45: @ 8249D45
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattleDomeLobby_Movement_249D4B: @ 8249D4B
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52
-	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
-	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 9
-	special sub_818E9AC
-	compare VAR_RESULT, 0
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DC9
-	compare VAR_RESULT, 1
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DD2
-	compare VAR_RESULT, 2
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DDB
-	compare VAR_RESULT, 3
-	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DE4
-	fadescreen 1
-	setvar VAR_0x8004, 8
-	special sub_818E9AC
-	waitstate
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249DC9:: @ 8249DC9
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A966, 3
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249DD2:: @ 8249DD2
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A9A9, 3
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249DDB:: @ 8249DDB
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A9EC, 3
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AA31, 3
-	return
-
-BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED
-	setvar VAR_0x8004, 20
-	special sub_818E9AC
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, 2
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249DFE:: @ 8249DFE
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AB94, 2
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249E07:: @ 8249E07
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AC76, 2
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249E10:: @ 8249E10
-	msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_249E19:: @ 8249E19
-	msgbox BattleFrontier_OutsideWest_Text_24AB06, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_249E22:: @ 8249E22
-	loadword 0, BattleFrontier_OutsideWest_Text_24AB44
-	callstd 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_249E2B:: @ 8249E2B
-	loadword 0, BattleFrontier_OutsideWest_Text_24AB75
-	callstd 2
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249E34:: @ 8249E34
-	lockall
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AE63, 4
-	goto BattleFrontier_BattleDomeLobby_EventScript_249E43
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249E43:: @ 8249E43
-	message BattleFrontier_BattleDomeLobby_Text_24AE8B
-	waitmessage
-	multichoice 17, 4, 98, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeLobby_EventScript_249E8B
-	case 1, BattleFrontier_BattleDomeLobby_EventScript_249E99
-	case 2, BattleFrontier_BattleDomeLobby_EventScript_249EA7
-	case 3, BattleFrontier_BattleDomeLobby_EventScript_249EB5
-	case 127, BattleFrontier_BattleDomeLobby_EventScript_249EB5
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249E8B:: @ 8249E8B
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AEAE, 4
-	goto BattleFrontier_BattleDomeLobby_EventScript_249E43
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249E99:: @ 8249E99
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AF4C, 4
-	goto BattleFrontier_BattleDomeLobby_EventScript_249E43
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249EA7:: @ 8249EA7
-	msgbox BattleFrontier_BattleDomeLobby_Text_24B073, 4
-	goto BattleFrontier_BattleDomeLobby_EventScript_249E43
-	end
-
-BattleFrontier_BattleDomeLobby_EventScript_249EB5:: @ 8249EB5
-	releaseall
-	end
-
-BattleFrontier_BattleDomeLobby_Text_249EB7: @ 8249EB7
-	.string "Where the strategies of TRAINERS\n"
-	.string "are put to the test!\p"
-	.string "Welcome to the BATTLE DOME!\p"
-	.string "I am your guide to the SINGLE BATTLE\n"
-	.string "Tournament.$"
-
-BattleFrontier_BattleDomeLobby_Text_249F3A: @ 8249F3A
-	.string "Would you like to challenge\n"
-	.string "the SINGLE BATTLE Tournament?$"
-
-BattleFrontier_BattleDomeLobby_Text_249F74: @ 8249F74
-	.string "We hope to see you again.$"
-
-BattleFrontier_BattleDomeLobby_Text_249F8E: @ 8249F8E
-	.string "The SINGLE BATTLE Tournament\n"
-	.string "is exactly as the name suggests--\l"
-	.string "a tournament of SINGLE BATTLES.\p"
-	.string "All participating TRAINERS must\n"
-	.string "enter three POKéMON each.\p"
-	.string "In each battle, one of the three\n"
-	.string "POKéMON must be held in reserve.\p"
-	.string "The other two POKéMON can battle\n"
-	.string "one at a time.\p"
-	.string "Choose the two battling POKéMON after\n"
-	.string "examining the opponent’s trio.\p"
-	.string "You win the tournament by defeating\n"
-	.string "four TRAINERS.\p"
-	.string "Battle Points are awarded to\n"
-	.string "the tournament winner.\p"
-	.string "If you want to interrupt your\n"
-	.string "tournament, please save the game.\p"
-	.string "If you don’t save before interrupting,\n"
-	.string "you will be disqualified.$"
-
-BattleFrontier_BattleDomeLobby_Text_24A1C6: @ 824A1C6
-	.string "Before I show you to the BATTLE DOME,\n"
-	.string "I must save the data. Is that okay?$"
-
-BattleFrontier_BattleDomeLobby_Text_24A210: @ 824A210
-	.string "The tournament offers two levels\n"
-	.string "of challenge, Level 50 and Open Level.\l"
-	.string "Which is your choice?$"
-
-BattleFrontier_BattleDomeLobby_Text_24A26E: @ 824A26E
-	.string "Now select the three POKéMON that\n"
-	.string "you wish to enter, please.$"
-
-BattleFrontier_BattleDomeLobby_Text_24A2AB: @ 824A2AB
-	.string "Excuse me!\p"
-	.string "You don’t have three eligible POKéMON.\p"
-	.string "Also, the POKéMON must be holding\n"
-	.string "different kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "Please come see me when you are ready.$"
-
-BattleFrontier_BattleDomeLobby_Text_24A353: @ 824A353
-	.string "Excuse me!\p"
-	.string "You don’t have three eligible POKéMON.\p"
-	.string "You must have three different POKéMON\n"
-	.string "of Level 50 or less to enter.\p"
-	.string "They also must be holding different\n"
-	.string "kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "Please come see me when you are ready.$"
-
-BattleFrontier_BattleDomeLobby_Text_24A437: @ 824A437
-	.string "I will now show you to\n"
-	.string "the BATTLE DOME.$"
-
-BattleFrontier_BattleDomeLobby_Text_24A45F: @ 824A45F
-	.string "Excuse me!\p"
-	.string "You didn’t save before you quit your\n"
-	.string "challenge last time.\p"
-	.string "Because of that, your challenge so far\n"
-	.string "has been disqualified. Sorry!$"
-
-BattleFrontier_BattleDomeLobby_Text_24A4E9: @ 824A4E9
-	.string "Congratulations for winning\n"
-	.string "your Battle Tournament!$"
-
-BattleFrontier_BattleDomeLobby_Text_24A51D: @ 824A51D
-	.string "Here is your prize for your Battle\n"
-	.string "Tournament victory.$"
-
-VerdanturfTown_BattleTentLobby_Text_24A554: @ 824A554
-	.string "{PLAYER} received the prize\n"
-	.string "{STR_VAR_1}.$"
-
-VerdanturfTown_BattleTentLobby_Text_24A56E: @ 824A56E
-	.string "Oh, your BAG appears to be full.\p"
-	.string "Please make room in your BAG, then come\n"
-	.string "see me.$"
-
-BattleFrontier_BattleDomeLobby_Text_24A5BF: @ 824A5BF
-	.string "Thank you for playing!$"
-
-BattleFrontier_BattleDomeLobby_Text_24A5D6: @ 824A5D6
-	.string "Your record will be saved.\n"
-	.string "Please wait.$"
-
-BattleFrontier_BattleDomeLobby_Text_24A5FE: @ 824A5FE
-	.string "We’ve been waiting for you!$"
-
-BattleFrontier_BattleDomeLobby_Text_24A61A: @ 824A61A
-	.string "Before I show you to the BATTLE DOME,\n"
-	.string "I must save the data. Is that okay?$"
-
-BattleFrontier_BattleDomeLobby_Text_24A664: @ 824A664
-	.string "Where the strategies of TRAINERS\n"
-	.string "are put to the test!\p"
-	.string "Welcome to the BATTLE DOME!\p"
-	.string "I am your guide to the DOUBLE BATTLE\n"
-	.string "Tournament.$"
-
-BattleFrontier_BattleDomeLobby_Text_24A6E7: @ 824A6E7
-	.string "Would you like to challenge\n"
-	.string "the DOUBLE BATTLE Tournament?$"
-
-BattleFrontier_BattleDomeLobby_Text_24A721: @ 824A721
-	.string "The DOUBLE BATTLE Tournament\n"
-	.string "is exactly as the name suggests--\l"
-	.string "a tournament of DOUBLE BATTLES.\p"
-	.string "All participating TRAINERS must\n"
-	.string "enter three POKéMON each.\p"
-	.string "In each battle, one of the three\n"
-	.string "POKéMON must be held in reserve.\p"
-	.string "The remaining two POKéMON must take\n"
-	.string "part in a DOUBLE BATTLE.\p"
-	.string "Choose the two battling POKéMON after\n"
-	.string "examining the opponent’s trio.\p"
-	.string "You win the tournament by defeating\n"
-	.string "four TRAINERS.\p"
-	.string "Battle Points are awarded to\n"
-	.string "the tournament winner.\p"
-	.string "If you want to interrupt your\n"
-	.string "tournament, please save the game.\p"
-	.string "If you don’t save before interrupting,\n"
-	.string "you will be disqualified.$"
-
-BattleFrontier_BattleDomeLobby_Text_24A966: @ 824A966
-	.string "They’re the results of the last\n"
-	.string "Level 50 SINGLE BATTLE Tournament.$"
-
-BattleFrontier_BattleDomeLobby_Text_24A9A9: @ 824A9A9
-	.string "They’re the results of the last\n"
-	.string "Level 50 DOUBLE BATTLE Tournament.$"
-
-BattleFrontier_BattleDomeLobby_Text_24A9EC: @ 824A9EC
-	.string "They’re the results of the last\n"
-	.string "Open Level SINGLE BATTLE Tournament.$"
-
-BattleFrontier_BattleDomeLobby_Text_24AA31: @ 824AA31
-	.string "They’re the results of the last\n"
-	.string "Open Level DOUBLE BATTLE Tournament.$"
-
-BattleFrontier_BattleDomeLobby_Text_24AA76: @ 824AA76
-	.string "Did you see it?\n"
-	.string "The last Battle Tournament?\p"
-	.string "The winner, {STR_VAR_1}, was seriously\n"
-	.string "tough.\p"
-	.string "You should check out the results\n"
-	.string "on the monitor beside the PC.$"
-
-BattleFrontier_OutsideWest_Text_24AB06: @ 824AB06
-	.string "The BATTLE FRONTIER…\n"
-	.string "I’ve long dreamed about a place like it.$"
-
-BattleFrontier_OutsideWest_Text_24AB44: @ 824AB44
-	.string "The BATTLE DOME\n"
-	.string "Become the Unbeatable Superstar!$"
-
-BattleFrontier_OutsideWest_Text_24AB75: @ 824AB75
-	.string "The ??????\n"
-	.string "Under Construction!$"
-
-BattleFrontier_BattleDomeLobby_Text_24AB94: @ 824AB94
-	.string "When a TRAINER chains tournament\n"
-	.string "wins at the BATTLE DOME, he or she\l"
-	.string "gains a reputation as a star.\p"
-	.string "Tough TRAINERS are drawn by that\n"
-	.string "reputation to the BATTLE DOME.\p"
-	.string "A true superstar is a TRAINER who\n"
-	.string "can keep winning tournaments.$"
-
-BattleFrontier_BattleDomeLobby_Text_24AC76: @ 824AC76
-	.string "I ran into one of the tournament\n"
-	.string "favorites in the very first round.\p"
-	.string "Of course I got trashed…$"
-
-BattleFrontier_BattleDomeLobby_Text_24ACD3: @ 824ACD3
-	.string "I would’ve won if I’d kept this POKéMON\n"
-	.string "held in reserve.\p"
-	.string "You need to check your opponent’s\n"
-	.string "POKéMON carefully before choosing\l"
-	.string "your battling POKéMON.$"
-
-BattleFrontier_BattleDomeLobby_Text_24AD67: @ 824AD67
-	.string "Congratulations!\p"
-	.string "You defeated the DOME ACE and won\n"
-	.string "the Battle Tournament!$"
-
-BattleFrontier_BattleDomeLobby_Text_24ADB1: @ 824ADB1
-	.string "In recognition of your strategy--\n"
-	.string "a thing of beauty it was, too--\l"
-	.string "we award you these Battle Point(s)!$"
-
-BattleFrontier_BattleDomeLobby_Text_24AE17: @ 824AE17
-	.string "Would you like to record your\n"
-	.string "last BATTLE DOME match on your\l"
-	.string "FRONTIER PASS?$"
-
-BattleFrontier_BattleDomeLobby_Text_24AE63: @ 824AE63
-	.string "The Battle Tournament rules\n"
-	.string "are listed.$"
-
-BattleFrontier_BattleDomeLobby_Text_24AE8B: @ 824AE8B
-	.string "Which heading do you want to read?$"
-
-BattleFrontier_BattleDomeLobby_Text_24AEAE: @ 824AEAE
-	.string "The tournament matchups are drawn up\n"
-	.string "based on the toughness of POKéMON\l"
-	.string "held by TRAINERS.\p"
-	.string "The matchups avoid having tough\n"
-	.string "TRAINERS face each other right away.$"
-
-BattleFrontier_BattleDomeLobby_Text_24AF4C: @ 824AF4C
-	.string "The tournament chart, or as we call it,\n"
-	.string "the “Tree,” is available for viewing\l"
-	.string "in the Waiting Room from any guide.\p"
-	.string "The Tournament Tree will provide\n"
-	.string "several kinds of data.\p"
-	.string "The data on view includes the previous\n"
-	.string "tournament’s results, the POKéMON held\l"
-	.string "by TRAINERS, and the battle styles of\l"
-	.string "TRAINERS.$"
-
-BattleFrontier_BattleDomeLobby_Text_24B073: @ 824B073
-	.string "If battling POKéMON faint at the same\n"
-	.string "time--a double KO--in a tournament\l"
-	.string "match, the REFEREES will review\l"
-	.string "the match and declare the winner.$"
diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc
deleted file mode 100644
index d19b4b999..000000000
--- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc
+++ /dev/null
@@ -1,417 +0,0 @@
-BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9
-	map_script 2, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218
-	map_script 4, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204
-	.byte 0
-
-BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E
-	.2byte 0
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222
-	.2byte 0
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222
-	compare VAR_0x8006, 1
-	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	setvar VAR_TEMP_0, 1
-	applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652
-	waitmovement 0
-	lockall
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F
-	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB
-	waitmessage
-	switch VAR_RESULT
-	call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1
-	multichoice 16, 0, 73, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5
-	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D
-	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D
-	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349
-	case 5, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377
-	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1:: @ 824B2C1
-	multichoice 16, 2, 107, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5
-	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D
-	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349
-	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377
-	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D:: @ 824B30D
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24BAF7
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F
-	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F:: @ 824B33F
-	call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8B4
-	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349:: @ 824B349
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA69, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB
-	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24BA93
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9
-	case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 9
-	special sub_818E9AC
-	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3
-	waitmessage
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 2
-	special sub_818E9AC
-	playse SE_SAVE
-	waitse
-	fadescreen 1
-	setvar VAR_0x8004, 4
-	special sub_81A1780
-	end
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, 4
-	fadescreen 1
-	setvar VAR_0x8004, 6
-	special sub_818E9AC
-	waitstate
-	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5
-	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A
-	fadescreen 1
-	setvar VAR_0x8004, 7
-	special sub_818E9AC
-	waitstate
-	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452
-	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B
-	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449:: @ 824B449
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9, 4
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452:: @ 824B452
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD, 4
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B:: @ 824B45B
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA21, 4
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464:: @ 824B464
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA46, 4
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24B70C
-	waitmessage
-	waitbuttonpress
-	fadescreen 1
-	call BattleFrontier_BattleDomePreBattleRoom_EventScript_23F2B7
-	copyvar VAR_0x8004, VAR_RESULT
-	setvar VAR_0x8005, 2
-	special sub_80F9490
-	waitstate
-	setvar VAR_0x8004, 21
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 8
-	special sub_818E9AC
-	setvar VAR_0x8004, 18
-	special sub_818E9AC
-	setvar VAR_0x8004, 9
-	special sub_818E9AC
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, 4
-	closemessage
-	applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F
-	waitmovement 0
-	applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657
-	waitmovement 0
-	opendoor 5, 1
-	waitdooranim
-	applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659
-	waitmovement 0
-	closedoor 5, 1
-	waitdooranim
-	warp BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 255, 9, 5
-	setvar VAR_TEMP_0, 0
-	waitstate
-	end
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB:: @ 824B4FB
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540
-	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546
-	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A:: @ 824B53A
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24B65C
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540:: @ 824B540
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24B689
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546:: @ 824B546
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24B6B6
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C
-	setvar VAR_0x8004, 9
-	special sub_81A1780
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B
-	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0
-	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B
-	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24B6E3
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B
-	checkflag FLAG_0x001
-	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, 4
-	setflag FLAG_0x001
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0
-	checkflag FLAG_0x001
-	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, 4
-	setflag FLAG_0x001
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5:: @ 824B5B5
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A, 4
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE:: @ 824B5BE
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC63, 4
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
-	setvar VAR_TEMP_0, 1
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, 4
-	special LoadPlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600
-	fadescreen 1
-	setvar VAR_0x8004, 11
-	special sub_818E9AC
-	waitstate
-	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634
-	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D
-	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634:: @ 824B634
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3, 4
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D:: @ 824B63D
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1, 4
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646:: @ 824B646
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B83F, 4
-	return
-
-BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F: @ 824B64F
-	walk_right
-	face_left
-	step_end
-
-BattleFrontier_BattleDomePreBattleRoom_Movement_24B652: @ 824B652
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattleDomePreBattleRoom_Movement_24B657: @ 824B657
-	walk_up
-	step_end
-
-BattleFrontier_BattleDomePreBattleRoom_Movement_24B659: @ 824B659
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B65C: @ 824B65C
-	.string "Your 1st-round match is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B689: @ 824B689
-	.string "Your 2nd-round match is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B6B6: @ 824B6B6
-	.string "Your semifinal match is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B6E3: @ 824B6E3
-	.string "Your final match is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B70C: @ 824B70C
-	.string "Please choose the two POKéMON\n"
-	.string "that are to appear in battle.$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B748: @ 824B748
-	.string "Right this way, please.$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B760: @ 824B760
-	.string "Thank you for competing!\p"
-	.string "I’ll restore your POKéMON to\n"
-	.string "full health.$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3: @ 824B7A3
-	.string "All 1st-round matches have been\n"
-	.string "completed.\p"
-	.string "These are the teams that advanced!$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1: @ 824B7F1
-	.string "All 2nd-round matches have been\n"
-	.string "completed.\p"
-	.string "These are the teams that advanced!$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B83F: @ 824B83F
-	.string "All semifinal matches have been\n"
-	.string "completed.\p"
-	.string "These are the teams that advanced!$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B88D: @ 824B88D
-	.string "Congratulations for getting through\n"
-	.string "the 1st round.\p"
-	.string "The 2nd round is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B8E6: @ 824B8E6
-	.string "Congratulations for advancing\n"
-	.string "to the semifinals.\p"
-	.string "The best four teams meet in this round.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B94E: @ 824B94E
-	.string "Congratulations for advancing\n"
-	.string "to the final match.\p"
-	.string "You’re one win from the championship.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5: @ 824B9B5
-	.string "{PLAYER}’s next opponent\n"
-	.string "is this TRAINER.$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9: @ 824B9D9
-	.string "The tournament is in the 1st round.$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD: @ 824B9FD
-	.string "The tournament is in the 2nd round.$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24BA21: @ 824BA21
-	.string "The tournament is in the semifinals.$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24BA46: @ 824BA46
-	.string "The tournament is up to the final.$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24BA69: @ 824BA69
-	.string "Would you like to save and\n"
-	.string "quit the game?$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24BA93: @ 824BA93
-	.string "Would you like to retire from your\n"
-	.string "Battle Tournament challenge?$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3: @ 824BAD3
-	.string "I am saving your data.\n"
-	.string "Please wait.$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24BAF7: @ 824BAF7
-	.string "Should I record your last match\n"
-	.string "on your FRONTIER PASS?$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E: @ 824BB2E
-	.string "Congratulations for advancing\n"
-	.string "to the final match.\p"
-	.string "For the final match, you will challenge\n"
-	.string "the DOME ACE TUCKER.\p"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC: @ 824BBAC
-	.string "Congratulations for advancing\n"
-	.string "to the final match.\p"
-	.string "For the final match, you will challenge\n"
-	.string "the DOME ACE TUCKER.\p"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A: @ 824BC2A
-	.string "Your final battle against TUCKER is\n"
-	.string "next. Are you ready?$"
-
-BattleFrontier_BattleDomePreBattleRoom_Text_24BC63: @ 824BC63
-	.string "Your final battle against TUCKER is\n"
-	.string "next. Are you ready?$"
-
diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc
deleted file mode 100644
index cdfd6edd6..000000000
--- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc
+++ /dev/null
@@ -1,384 +0,0 @@
-BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB
-	map_script 3, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB
-	map_script 4, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00
-	map_script 2, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31
-	.byte 0
-
-BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
-	setvar VAR_0x8004, 5
-	special sub_81A1780
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
-	compare VAR_RESULT, 1
-	call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
-	setvar VAR_0x8004, 9
-	special sub_81A1780
-	copyvar VAR_TEMP_F, VAR_RESULT
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3
-	end
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3:: @ 825ADF3
-	call BattleFrontier_BattleFactoryBattleRoom_EventScript_242170
-	setobjectxyperm 2, 7, 9
-	end
-
-BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A
-	.2byte 0
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A
-	setvar VAR_TEMP_1, 1
-	hideobjectat 255, BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
-	compare VAR_TEMP_F, 0
-	goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24
-	hideobjectat 2, BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24
-	end
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25:: @ 825AE25
-	setvar VAR_OBJ_GFX_ID_F, 100
-	return
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B:: @ 825AE2B
-	setvar VAR_OBJ_GFX_ID_F, 105
-	return
-
-BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67
-	.2byte 0
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, 4
-	closemessage
-	applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B
-	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
-	applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
-	waitmovement 0
-	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7
-	end
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67
-	compare VAR_TEMP_F, 0
-	goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B
-	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
-	applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
-	waitmovement 0
-	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4
-	setvar VAR_0x8004, 11
-	special sub_81A5E74
-	removeobject 2
-	setobjectxyperm 2, 7, 1
-	addobject 2
-	applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B184
-	waitmovement 0
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
-	compare VAR_TEMP_F, 0
-	goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C
-	setvar VAR_0x8004, 5
-	special sub_8195960
-	lockall
-	msgbox 0x2021fc4, 4
-	waitmessage
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special HealPlayerParty
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 0
-	special sub_8163AC4
-	waitstate
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8:: @ 825AEF8
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special sub_81A1780
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190
-@ 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 3
-	special sub_81A5E74
-	compare VAR_RESULT, 9999
-	goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
-	addvar VAR_RESULT, 1
-	setorcopyvar VAR_0x8006, VAR_RESULT
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	special sub_81A5E74
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E
-	call BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	switch VAR_RESULT
-	case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85
-	setvar VAR_0x8006, 1
-	warp BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8
-	waitstate
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special sub_81A1780
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C
-	switch VAR_TEMP_F
-	case 2, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051
-	case 3, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
-	case 4, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, 4
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4
-	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C
-	setvar VAR_0x8004, 12
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, 4
-	closemessage
-	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182
-	waitmovement 0
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattleFactoryBattleRoom_Text_25B460
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, 13
-	special sub_81A1780
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, 4
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, 4
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4
-	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
-	setvar VAR_0x8004, 12
-	special sub_81A1780
-	compare VAR_RESULT, 2
-	goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, 4
-	waitmessage
-	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182
-	waitmovement 0
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattleFactoryBattleRoom_Text_25B640
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, 13
-	special sub_81A1780
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, 4
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special HealPlayerParty
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 0
-	special sub_8163AC4
-	waitstate
-	return
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 3
-	special sub_81A5E74
-	compare VAR_RESULT, 9999
-	goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
-	addvar VAR_RESULT, 1
-	setorcopyvar VAR_0x8006, VAR_RESULT
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	special sub_81A5E74
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_81A5E74
-	compare VAR_RESULT, 9999
-	goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43
-	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A5E74
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	addvar VAR_RESULT, 1
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85
-	end
-
-BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B: @ 825B17B
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	face_right
-	step_end
-
-BattleFrontier_BattleFactoryBattleRoom_Movement_25B182: @ 825B182
-	walk_right
-	step_end
-
-BattleFrontier_BattleFactoryBattleRoom_Movement_25B184: @ 825B184
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	face_left
-	step_end
-
-BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B
-	walk_up
-	walk_up
-	walk_up
-	face_left
-	step_end
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190
-	copyvar VAR_RESULT, VAR_0x40CE
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA
-	warp BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8
-	waitstate
-	end
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA
-	warp BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8
-	waitstate
-	end
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4
-	applymovement 1, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
-	applymovement 3, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
-	applymovement 4, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
-	applymovement 5, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
-	applymovement 6, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
-	applymovement 7, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
-	waitmovement 0
-	return
-
-BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2: @ 825B1E2
-	.string "Hey, hey!\n"
-	.string "Get a move on!$"
-
-BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB: @ 825B1FB
-	.string "Hey, my name’s NOLAND!\n"
-	.string "I’m basically in charge of this place,\l"
-	.string "which is why I’m the FACTORY HEAD!\p"
-	.string "I had a look at your Battle Swap data.\p"
-	.string "You seem to have the right idea,\n"
-	.string "but you’re still square in your head!\p"
-	.string "Listen up, okay? Knowledge isn’t only\n"
-	.string "about reading books or doing desk work.\p"
-	.string "Just doing that sort of thing…\n"
-	.string "It may as well be useless!\p"
-	.string "You have to experience things with\n"
-	.string "your heart and your body, understand?\p"
-	.string "I’ll take you on under the same\n"
-	.string "conditions as you.\p"
-	.string "I’ll be using rental POKéMON, too!$"
-
-BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1: @ 825B3F1
-	.string "Shake out every last bit of your\n"
-	.string "knowledge and bring it on!$"
-
-BattleFrontier_BattleFactoryBattleRoom_Text_25B42D: @ 825B42D
-	.string "NOLAND: Smart going!\n"
-	.string "Let’s see your FRONTIER PASS.$"
-
-BattleFrontier_BattleFactoryBattleRoom_Text_25B460: @ 825B460
-	.string "The Knowledge Symbol was embossed\n"
-	.string "on the FRONTIER PASS!$"
-
-BattleFrontier_BattleFactoryBattleRoom_Text_25B498: @ 825B498
-	.string "Heh…\n"
-	.string "You’re a pretty bright spark…\p"
-	.string "Next time, I’ll come after you hard.\n"
-	.string "No holds barred, understand?\p"
-	.string "You keep up your studies!$"
-
-BattleFrontier_BattleFactoryBattleRoom_Text_25B517: @ 825B517
-	.string "NOLAND: Hey, hey! How’s it going?\n"
-	.string "You keeping up with your studies?\p"
-	.string "…Oh?\p"
-	.string "You’ve taken on a harder look than\n"
-	.string "the last time I saw you.\p"
-	.string "Now, this should be fun!\n"
-	.string "I’m getting excited, hey!$"
-
-BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF: @ 825B5CF
-	.string "All right!\n"
-	.string "Bring it on!$"
-
-BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7: @ 825B5E7
-	.string "NOLAND: What the…\n"
-	.string "You’re getting out of my league!\p"
-	.string "Sheesh!\n"
-	.string "Let’s see that FRONTIER PASS!$"
-
-BattleFrontier_BattleFactoryBattleRoom_Text_25B640: @ 825B640
-	.string "The Knowledge Symbol took on\n"
-	.string "a golden shine!$"
-
-BattleFrontier_BattleFactoryBattleRoom_Text_25B66D: @ 825B66D
-	.string "Pfft, man!\p"
-	.string "That’s absolutely the last time\n"
-	.string "I lose to you!\p"
-	.string "We have to do this again, hey?$"
-
diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc
deleted file mode 100644
index 4f2dea343..000000000
--- a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc
+++ /dev/null
@@ -1,611 +0,0 @@
-BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8
-	map_script 2, BattleFrontier_BattleFactoryLobby_MapScript2_258407
-	map_script 4, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3
-	.byte 0
-
-BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2583FD
-	.2byte 0
-
-BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258431
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleFactoryLobby_EventScript_25843A
-	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleFactoryLobby_EventScript_258592
-	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleFactoryLobby_EventScript_25849B
-	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleFactoryLobby_EventScript_258506
-	.2byte 0
-
-BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431
-	setvar VAR_0x8004, 0
-	special sub_81A1780
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
-	lockall
-	msgbox BattleFrontier_BattleFactoryLobby_Text_258ECA, 4
-	closemessage
-	setvar VAR_0x8004, 8
-	special sub_81A5E74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A5E74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_81A5E74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special sub_81A5E74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B
-	lockall
-	setvar VAR_0x8004, 10
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD
-	msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, 4
-	waitmessage
-	goto BattleFrontier_BattleFactoryLobby_EventScript_2584C6
-
-BattleFrontier_BattleFactoryLobby_EventScript_2584BD:: @ 82584BD
-	msgbox BattleFrontier_BattleFactoryLobby_Text_25926A, 4
-	waitmessage
-
-BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6
-	msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, 4
-	setvar VAR_0x8004, 11
-	special sub_81A1780
-	msgbox BattleFrontier_BattleFactoryLobby_Text_241520, 9
-	message BattleFrontier_BattleFactoryLobby_Text_259323
-	waitmessage
-	setvar VAR_0x8004, 8
-	special sub_81A1780
-	special LoadPlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_81A5E74
-	playse SE_SAVE
-	waitse
-	goto BattleFrontier_BattleFactoryLobby_EventScript_25853B
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506
-	lockall
-	message BattleFrontier_BattleFactoryLobby_Text_258CC7
-	waitmessage
-	setvar VAR_0x8004, 8
-	special sub_81A1780
-	special LoadPlayerParty
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special sub_81A5E74
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_81A5E74
-	playse SE_SAVE
-	waitse
-
-BattleFrontier_BattleFactoryLobby_EventScript_25853B:: @ 825853B
-	call BattleFrontier_BattleFactoryLobby_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258582
-	message BattleFrontier_BattleFactoryLobby_Text_259388
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleFactoryLobby_EventScript_258582
-	case 0, BattleFrontier_BattleFactoryLobby_EventScript_25857D
-	case 127, BattleFrontier_BattleFactoryLobby_EventScript_258582
-
-BattleFrontier_BattleFactoryLobby_EventScript_25857D:: @ 825857D
-	call BattleFrontier_BattleFactoryLobby_EventScript_23E8B4
-
-BattleFrontier_BattleFactoryLobby_EventScript_258582:: @ 8258582
-	msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592
-	lockall
-	message BattleFrontier_BattleFactoryLobby_Text_258E77
-	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 1
-	special sub_81A5E74
-	playse SE_SAVE
-	waitse
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	setvar VAR_0x8006, 2
-	goto BattleFrontier_BattleFactoryLobby_EventScript_25871A
-
-BattleFrontier_BattleFactoryLobby_EventScript_2585CB:: @ 82585CB
-	lock
-	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 4
-	setvar VAR_0x40CE, 0
-	goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD
-	setvar VAR_FRONTIER_FACILITY, 4
-	setvar VAR_0x40CE, 1
-	goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED
-	special SavePlayerParty
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587BA
-
-BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C3
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C9
-	waitmessage
-	multichoice 17, 6, 23, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryLobby_EventScript_258653
-	case 1, BattleFrontier_BattleFactoryLobby_EventScript_258768
-	case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D
-	case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879D
-
-BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653
-	message BattleFrontier_BattleFactoryLobby_Text_258BE9
-	waitmessage
-	multichoice 17, 6, 24, 0
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D
-	case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879D
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryLobby_EventScript_25879A
-	case 1, BattleFrontier_BattleFactoryLobby_EventScript_2586B9
-	case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879A
-
-BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
-	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 0
-	special sub_81A5E74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special sub_81A5E74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	closemessage
-	delay 2
-	call BattleFrontier_BattleFactoryLobby_EventScript_27134F
-	setvar VAR_TEMP_0, 255
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258783
-	setvar VAR_0x8006, 0
-
-BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A
-	special SavePlayerParty
-	msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, 4
-	closemessage
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762
-	applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7
-	applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC
-	waitmovement 0
-	warp BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13
-	setvar VAR_TEMP_0, 0
-	waitstate
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_25875C:: @ 825875C
-	setvar VAR_LAST_TALKED, 1
-	return
-
-BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762
-	setvar VAR_LAST_TALKED, 6
-	return
-
-BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587CF
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587D8
-	goto BattleFrontier_BattleFactoryLobby_EventScript_258606
-
-BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	goto BattleFrontier_BattleFactoryLobby_EventScript_25879D
-
-BattleFrontier_BattleFactoryLobby_EventScript_25879A:: @ 825879A
-	special LoadPlayerParty
-
-BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D
-	msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4
-	release
-	end
-
-BattleFrontier_BattleFactoryLobby_Movement_2587A7: @ 82587A7
-	walk_up
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleFactoryLobby_Movement_2587AC: @ 82587AC
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattleFactoryLobby_EventScript_2587B1:: @ 82587B1
-	msgbox BattleFrontier_BattleFactoryLobby_Text_2588EE, 4
-	return
-
-BattleFrontier_BattleFactoryLobby_EventScript_2587BA:: @ 82587BA
-	msgbox BattleFrontier_BattleFactoryLobby_Text_258F93, 4
-	return
-
-BattleFrontier_BattleFactoryLobby_EventScript_2587C3:: @ 82587C3
-	message BattleFrontier_BattleFactoryLobby_Text_25897A
-	return
-
-BattleFrontier_BattleFactoryLobby_EventScript_2587C9:: @ 82587C9
-	message BattleFrontier_BattleFactoryLobby_Text_25901F
-	return
-
-BattleFrontier_BattleFactoryLobby_EventScript_2587CF:: @ 82587CF
-	msgbox BattleFrontier_BattleFactoryLobby_Text_2589B3, 4
-	return
-
-BattleFrontier_BattleFactoryLobby_EventScript_2587D8:: @ 82587D8
-	msgbox BattleFrontier_BattleFactoryLobby_Text_259058, 4
-	return
-
-BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1
-	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 4
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA
-	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 4
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_258813:: @ 8258813
-	msgbox BattleFrontier_BattleFactoryLobby_Text_2593D7, 2
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_25881C:: @ 825881C
-	msgbox BattleFrontier_BattleFactoryLobby_Text_2594E5, 2
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_258825:: @ 8258825
-	lock
-	msgbox BattleFrontier_BattleFactoryLobby_Text_259547, 4
-	release
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_258830:: @ 8258830
-	msgbox BattleFrontier_BattleFactoryLobby_Text_2595C4, 2
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_258839:: @ 8258839
-	lockall
-	msgbox BattleFrontier_BattleFactoryLobby_Text_259721, 4
-	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_258848:: @ 8258848
-	message BattleFrontier_BattleFactoryLobby_Text_259743
-	waitmessage
-	multichoice 17, 0, 99, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryLobby_EventScript_2588A6
-	case 1, BattleFrontier_BattleFactoryLobby_EventScript_2588B4
-	case 2, BattleFrontier_BattleFactoryLobby_EventScript_2588C2
-	case 3, BattleFrontier_BattleFactoryLobby_EventScript_2588D0
-	case 4, BattleFrontier_BattleFactoryLobby_EventScript_2588DE
-	case 5, BattleFrontier_BattleFactoryLobby_EventScript_2588EC
-	case 127, BattleFrontier_BattleFactoryLobby_EventScript_2588EC
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_2588A6:: @ 82588A6
-	msgbox BattleFrontier_BattleFactoryLobby_Text_259766, 4
-	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_2588B4:: @ 82588B4
-	msgbox BattleFrontier_BattleFactoryLobby_Text_2597FB, 4
-	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_2588C2:: @ 82588C2
-	msgbox BattleFrontier_BattleFactoryLobby_Text_25987E, 4
-	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_2588D0:: @ 82588D0
-	msgbox BattleFrontier_BattleFactoryLobby_Text_259920, 4
-	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_2588DE:: @ 82588DE
-	msgbox BattleFrontier_BattleFactoryLobby_Text_259A5E, 4
-	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
-	end
-
-BattleFrontier_BattleFactoryLobby_EventScript_2588EC:: @ 82588EC
-	releaseall
-	end
-
-BattleFrontier_BattleFactoryLobby_Text_2588EE: @ 82588EE
-	.string "Where the intelligence of TRAINERS\n"
-	.string "is put to the test!\p"
-	.string "Welcome to the BATTLE FACTORY!\p"
-	.string "I am your guide to the Battle Swap\n"
-	.string "Single Tournament.$"
-
-BattleFrontier_BattleFactoryLobby_Text_25897A: @ 825897A
-	.string "Would you like to take the Battle\n"
-	.string "Swap Single challenge?$"
-
-BattleFrontier_BattleFactoryLobby_Text_2589B3: @ 82589B3
-	.string "The Battle Swap Single Tournament\n"
-	.string "is a SINGLE BATTLE competition using\l"
-	.string "only rental POKéMON.\p"
-	.string "First, you will be loaned three\n"
-	.string "POKéMON specifically for this event.\p"
-	.string "Using the supplied rental POKéMON,\n"
-	.string "you must conduct a SINGLE BATTLE.\p"
-	.string "If you win, you are permitted to trade\n"
-	.string "one of your rental POKéMON.\p"
-	.string "Repeat this cycle of battling and\n"
-	.string "trading--if you win seven times in\l"
-	.string "a row, you will earn Battle Points.\p"
-	.string "If you want to interrupt your\n"
-	.string "challenge, please save the game.\p"
-	.string "If you don’t save, you will be\n"
-	.string "disqualified from your challenge.$"
-
-BattleFrontier_BattleFactoryLobby_Text_258BC5: @ 8258BC5
-	.string "We look forward to your next visit.$"
-
-BattleFrontier_BattleFactoryLobby_Text_258BE9: @ 8258BE9
-	.string "Which level do you wish to challenge?\n"
-	.string "Level 50 or Open Level?$"
-
-BattleFrontier_BattleFactoryLobby_Text_258C27: @ 8258C27
-	.string "Before you begin your challenge,\n"
-	.string "I need to save the game. Is that okay?$"
-
-BattleFrontier_BattleFactoryLobby_Text_258C6F: @ 8258C6F
-	.string "Okay, I will hold your POKéMON for\n"
-	.string "safekeeping while you compete.$"
-
-BattleFrontier_BattleFactoryLobby_Text_258CB1: @ 8258CB1
-	.string "Please step this way.$"
-
-BattleFrontier_BattleFactoryLobby_Text_258CC7: @ 8258CC7
-	.string "Thank you for participating!\p"
-	.string "I will return your POKéMON in exchange\n"
-	.string "for our rental POKéMON.\p"
-	.string "I must also save the event results.\n"
-	.string "Please wait.$"
-
-BattleFrontier_BattleFactoryLobby_Text_258D54: @ 8258D54
-	.string "I will return your POKéMON in exchange\n"
-	.string "for our rental POKéMON.$"
-
-BattleFrontier_BattleFactoryLobby_Text_258D93: @ 8258D93
-	.string "Congratulations! You’ve won seven\n"
-	.string "straight Battle Swap matches!$"
-
-BattleFrontier_BattleFactoryLobby_Text_258DD3: @ 8258DD3
-	.string "In recognition of your 7-win streak,\n"
-	.string "we award you these Battle Point(s).$"
-
-BattleFrontier_BattleFactoryLobby_Text_258E1C: @ 8258E1C
-	.string "Oh, oh, oh!\p"
-	.string "Your Battle Points are maxed.\p"
-	.string "Please come back after using\n"
-	.string "some Battle Points.$"
-
-BattleFrontier_BattleFactoryLobby_Text_258E77: @ 8258E77
-	.string "We’ve been waiting for you!\p"
-	.string "Before we resume your challenge,\n"
-	.string "I must save the game.$"
-
-BattleFrontier_BattleFactoryLobby_Text_258ECA: @ 8258ECA
-	.string "I’m sorry to say this, but you didn’t\n"
-	.string "save before you quit playing last time.\p"
-	.string "As a result, you have been disqualified\n"
-	.string "from your challenge.$"
-
-BattleFrontier_BattleFactoryLobby_Text_258F55: @ 8258F55
-	.string "We’ll return your personal POKéMON.$"
-
-BattleFrontier_BattleFactoryLobby_Text_258F79: @ 8258F79
-	.string "{PLAYER} received the prize\n"
-	.string "{STR_VAR_1}.$"
-
-BattleFrontier_BattleFactoryLobby_Text_258F93: @ 8258F93
-	.string "Where the intelligence of TRAINERS\n"
-	.string "is put to the test!\p"
-	.string "Welcome to the BATTLE FACTORY!\p"
-	.string "I am your guide to the Battle Swap\n"
-	.string "Double Tournament.$"
-
-BattleFrontier_BattleFactoryLobby_Text_25901F: @ 825901F
-	.string "Would you like to take the Battle\n"
-	.string "Swap Double challenge?$"
-
-BattleFrontier_BattleFactoryLobby_Text_259058: @ 8259058
-	.string "The Battle Swap Double Tournament\n"
-	.string "is a DOUBLE BATTLE competition using\l"
-	.string "only rental POKéMON.\p"
-	.string "First, you will be loaned three\n"
-	.string "POKéMON specifically for this event.\p"
-	.string "Using the supplied rental POKéMON,\n"
-	.string "you must conduct a DOUBLE BATTLE.\p"
-	.string "If you win, you are permitted to trade\n"
-	.string "one of your rental POKéMON.\p"
-	.string "Repeat this cycle of battling and\n"
-	.string "trading--if you win seven times in\l"
-	.string "a row, you will earn Battle Points.\p"
-	.string "If you want to interrupt your\n"
-	.string "challenge, please save the game.\p"
-	.string "If you don’t save before interrupting,\n"
-	.string "you will be disqualified.$"
-
-BattleFrontier_BattleFactoryLobby_Text_25926A: @ 825926A
-	.string "Congratulations for defeating\n"
-	.string "the FACTORY HEAD and winning\l"
-	.string "seven matches in a row!$"
-
-BattleFrontier_BattleFactoryLobby_Text_2592BD: @ 82592BD
-	.string "In recognition of your wealth of\n"
-	.string "knowledge and keen intelligence,\l"
-	.string "we award you these Battle Point(s).$"
-
-BattleFrontier_BattleFactoryLobby_Text_259323: @ 8259323
-	.string "Let me exchange your POKéMON\n"
-	.string "for our rental POKéMON.\p"
-	.string "I need to save the battle data,\n"
-	.string "so please wait.$"
-
-BattleFrontier_BattleFactoryLobby_Text_259388: @ 8259388
-	.string "Would you like to record your last\n"
-	.string "BATTLE FACTORY match on your\l"
-	.string "FRONTIER PASS?$"
-
-BattleFrontier_BattleFactoryLobby_Text_2593D7: @ 82593D7
-	.string "Hi!\n"
-	.string "You, there!\p"
-	.string "Are you thinking that the events here\n"
-	.string "are easy since you don’t need to have\l"
-	.string "a raised team of POKéMON?\p"
-	.string "I wouldn’t be too sure about winning\n"
-	.string "that easily.\p"
-	.string "If you don’t have thorough knowledge\n"
-	.string "about POKéMON and their moves,\l"
-	.string "it will be tough to keep winning.$"
-
-BattleFrontier_BattleFactoryLobby_Text_2594E5: @ 82594E5
-	.string "I swapped for a weak POKéMON…\n"
-	.string "I thought it was a good kind to have…\p"
-	.string "They wiped the floor with us…$"
-
-BattleFrontier_BattleFactoryLobby_Text_259547: @ 8259547
-	.string "Things haven’t been going my way\n"
-	.string "at all.\p"
-	.string "You need to check your opponent’s\n"
-	.string "POKéMON during battle to see if\l"
-	.string "they’re any good.$"
-
-BattleFrontier_BattleFactoryLobby_Text_2595C4: @ 82595C4
-	.string "You know how the staff here give you\n"
-	.string "a few hints about your next opponent?\p"
-	.string "Well, I’m a full-grown man, but I have\n"
-	.string "trouble figuring out their hints.$"
-
-BattleFrontier_BattleFactoryLobby_Text_259658: @ 8259658
-	.string "Like, I’m really tough, but I get bored\n"
-	.string "really easily, so I just kept swapping\l"
-	.string "and battling over and over.\p"
-	.string "So anyway, when I kept entering\n"
-	.string "Battle Swap events, I noticed they\l"
-	.string "varied the rental POKéMON.$"
-
-BattleFrontier_BattleFactoryLobby_Text_259721: @ 8259721
-SlateportCity_BattleTentLobby_Text_259721: @ 8259721
-	.string "The Battle Swap rules are listed.$"
-
-BattleFrontier_BattleFactoryLobby_Text_259743: @ 8259743
-SlateportCity_BattleTentLobby_Text_259743: @ 8259743
-	.string "Which heading do you want to read?$"
-
-BattleFrontier_BattleFactoryLobby_Text_259766: @ 8259766
-	.string "In a Battle Swap event, you may use\n"
-	.string "only three POKéMON.\p"
-	.string "Whether you are renting or swapping,\n"
-	.string "your team may not have two or more\l"
-	.string "of the same POKéMON.$"
-
-BattleFrontier_BattleFactoryLobby_Text_2597FB: @ 82597FB
-	.string "You may swap POKéMON only with\n"
-	.string "the TRAINER you have just defeated.\p"
-	.string "You may swap for only those POKéMON\n"
-	.string "used by the beaten TRAINER.$"
-
-BattleFrontier_BattleFactoryLobby_Text_25987E: @ 825987E
-	.string "After every battle you win, you may\n"
-	.string "swap for one of your defeated\l"
-	.string "opponent’s POKéMON.\p"
-	.string "You will not be able to swap POKéMON\n"
-	.string "with the seventh TRAINER in the event.$"
-
-BattleFrontier_BattleFactoryLobby_Text_259920: @ 8259920
-	.string "There are two key points to be aware\n"
-	.string "of when swapping POKéMON.\p"
-	.string "First, when swapping, you can’t check\n"
-	.string "the stats of the POKéMON you are\l"
-	.string "about to receive.\p"
-	.string "Second, the POKéMON on your team\n"
-	.string "are lined up in sequence, depending on\l"
-	.string "the order in which you rented them.\p"
-	.string "This sequence remains unchanged\n"
-	.string "even when swaps are made.$"
-
-BattleFrontier_BattleFactoryLobby_Text_259A5E: @ 8259A5E
-	.string "In the Open Level, the rental POKéMON\n"
-	.string "and the opposing TRAINERS’ POKéMON\l"
-	.string "are all Level 100.$"
diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc
deleted file mode 100644
index 875a3a220..000000000
--- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc
+++ /dev/null
@@ -1,726 +0,0 @@
-BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA
-	map_script 2, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF
-	map_script 4, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5
-	.byte 0
-
-BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF
-	.2byte 0
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF
-	setvar VAR_TEMP_1, 1
-	compare VAR_0x8006, 1
-	goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA
-	setobjectxy 1, 8, 7
-	turnobject 1, 1
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA
-	turnobject 255, 2
-	end
-
-BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9
-	.2byte 0
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9
-	compare VAR_0x8006, 1
-	goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5
-	setvar VAR_TEMP_0, 1
-	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC
-	applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A
-	waitmovement 0
-	compare VAR_0x8006, 2
-	goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69
-	setvar VAR_0x8004, 13
-	special sub_81A5E74
-	setvar VAR_0x8004, 12
-	special sub_81A5E74
-	setvar VAR_0x8004, 14
-	special sub_81A5E74
-	setorcopyvar VAR_0x8005, VAR_RESULT
-	setvar VAR_0x8004, 15
-	special sub_81A5E74
-	setorcopyvar VAR_0x8006, VAR_RESULT
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8, 4
-	fadescreen 1
-	setvar VAR_0x8004, 8
-	special sub_81A5E74
-	setvar VAR_0x8004, 6
-	special sub_81A5E74
-	waitstate
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, 4
-	closemessage
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7
-	compare VAR_RESULT, 0
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C
-	compare VAR_RESULT, 1
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B
-	waitmovement 0
-	warp BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11
-	waitstate
-	end
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
-	setvar VAR_0x8004, 9
-	special sub_81A5E74
-	setvar VAR_0x8004, 16
-	special sub_81A5E74
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, 4
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-	setvar VAR_0x8004, 9
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26
-	playse 263
-	waitse
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, 4
-	closemessage
-	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF
-	waitmovement 0
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58, 4
-	closemessage
-	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3
-	waitmovement 0
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89, 4
-	closemessage
-	delay 16
-	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
-	end
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13
-	setvar VAR_0x8004, 9
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D
-	compare VAR_RESULT, 2
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24
-	compare VAR_RESULT, 3
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B
-	compare VAR_RESULT, 4
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32
-	compare VAR_RESULT, 5
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39
-	compare VAR_RESULT, 6
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6
-	multichoice 19, 4, 103, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC
-	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
-	case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6:: @ 8259CC6
-	multichoice 20, 6, 104, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
-	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC:: @ 8259CFC
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABD2
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E:: @ 8259D2E
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8B4
-	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38:: @ 8259D38
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66:: @ 8259D66
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A37A
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98
-	setvar VAR_0x8004, 12
-	special sub_81A5E74
-	setvar VAR_0x8004, 14
-	special sub_81A5E74
-	setorcopyvar VAR_0x8005, VAR_RESULT
-	setvar VAR_0x8004, 15
-	special sub_81A5E74
-	setorcopyvar VAR_0x8006, VAR_RESULT
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2
-	fadescreen 1
-	setvar VAR_0x8004, 7
-	special sub_81A5E74
-	waitstate
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
-	setvar VAR_0x8004, 8
-	special sub_81A5E74
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, 4
-	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D:: @ 8259E1D
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A263
-	waitmessage
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24:: @ 8259E24
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A289
-	waitmessage
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B:: @ 8259E2B
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2AF
-	waitmessage
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32:: @ 8259E32
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2D5
-	waitmessage
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39:: @ 8259E39
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2FB
-	waitmessage
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40:: @ 8259E40
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A321
-	waitmessage
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABAE
-	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 2
-	special sub_81A5E74
-	playse SE_SAVE
-	waitse
-	fadescreen 1
-	setvar VAR_0x8004, 4
-	special sub_81A1780
-	end
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
-	special SavePlayerParty
-	setvar VAR_0x8004, 10
-	setvar VAR_0x8005, 0
-	special sub_81A5E74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	special CalculatePlayerPartyCount
-	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, 4
-	compare VAR_0x8005, 0
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62
-	compare VAR_0x8005, 1
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B
-	compare VAR_0x8005, 2
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74
-	compare VAR_0x8005, 3
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D
-	compare VAR_0x8005, 4
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86
-	compare VAR_0x8005, 5
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F
-	compare VAR_0x8005, 6
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98
-	compare VAR_0x8005, 7
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1
-	compare VAR_0x8005, 8
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA
-	compare VAR_0x8005, 10
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3
-	compare VAR_0x8005, 11
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC
-	compare VAR_0x8005, 12
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5
-	compare VAR_0x8005, 13
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE
-	compare VAR_0x8005, 14
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7
-	compare VAR_0x8005, 15
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0
-	compare VAR_0x8005, 16
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9
-	compare VAR_0x8005, 17
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2
-	compare VAR_0x8005, 18
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62:: @ 8259F62
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B:: @ 8259F6B
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74:: @ 8259F74
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D:: @ 8259F7D
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86:: @ 8259F86
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F:: @ 8259F8F
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98:: @ 8259F98
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1:: @ 8259FA1
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA:: @ 8259FAA
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3:: @ 8259FB3
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC:: @ 8259FBC
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5:: @ 8259FC5
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE:: @ 8259FCE
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7:: @ 8259FD7
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0:: @ 8259FE0
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9:: @ 8259FE9
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2:: @ 8259FF2
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004
-	compare VAR_0x8006, 0
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068
-	compare VAR_0x8006, 1
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071
-	compare VAR_0x8006, 2
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A
-	compare VAR_0x8006, 3
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083
-	compare VAR_0x8006, 4
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C
-	compare VAR_0x8006, 5
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095
-	compare VAR_0x8006, 6
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E
-	compare VAR_0x8006, 7
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7
-	compare VAR_0x8006, 8
-	call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068:: @ 825A068
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAE6, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071:: @ 825A071
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A9CE, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A:: @ 825A07A
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A8D9, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083:: @ 825A083
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A912, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C:: @ 825A08C
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A94C, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095:: @ 825A095
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA16, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E:: @ 825A09E
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAA7, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7:: @ 825A0A7
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A98C, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0:: @ 825A0B0
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA5A, 4
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20
-	waitmessage
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110
-	multichoice 19, 4, 103, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC
-	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
-	case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110:: @ 825A110
-	multichoice 20, 6, 104, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
-	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, 4
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2
-	case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C:: @ 825A17C
-	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3
-	applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B:: @ 825A18B
-	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9
-	applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6
-	return
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0: @ 825A1A0
-	walk_up
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6: @ 825A1A6
-	walk_up
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC: @ 825A1AC
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	face_down
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3: @ 825A1B3
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9: @ 825A1B9
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF: @ 825A1BF
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3: @ 825A1C3
-	walk_right
-	walk_right
-	walk_right
-	face_down
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8: @ 825A1C8
-SlateportCity_BattleTentCorridor_Text_25A1C8: @ 825A1C8
-	.string "First, we will hold your POKéMON for\n"
-	.string "safekeeping.\p"
-	.string "You may then choose from our\n"
-	.string "selection of POKéMON.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D: @ 825A22D
-SlateportCity_BattleTentCorridor_Text_25A22D: @ 825A22D
-	.string "Thank you for competing!\n"
-	.string "Let us restore your POKéMON!$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A263: @ 825A263
-SlateportCity_BattleTentCorridor_Text_25A263: @ 825A263
-	.string "The 2nd match is next!\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A289: @ 825A289
-SlateportCity_BattleTentCorridor_Text_25A289: @ 825A289
-	.string "The 3rd match is next!\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2AF: @ 825A2AF
-	.string "The 4th match is next!\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2D5: @ 825A2D5
-	.string "The 5th match is next!\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2FB: @ 825A2FB
-	.string "The 6th match is next!\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A321: @ 825A321
-	.string "Finally, the 7th match is next!\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350: @ 825A350
-SlateportCity_BattleTentCorridor_Text_25A350: @ 825A350
-	.string "Would you like to save and quit\n"
-	.string "the game?$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A37A: @ 825A37A
-SlateportCity_BattleTentCorridor_Text_25A37A: @ 825A37A
-	.string "Would you like to retire from your\n"
-	.string "Battle Swap challenge?$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4: @ 825A3B4
-	.string "I’ve conducted a little investigation\n"
-	.string "about your upcoming opponent.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8: @ 825A3F8
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the NORMAL type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E: @ 825A43E
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the FIRE type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482: @ 825A482
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the WATER type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7: @ 825A4C7
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the ELECTRIC type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F: @ 825A50F
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the GRASS type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554: @ 825A554
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the ICE type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597: @ 825A597
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the FIGHTING type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF: @ 825A5DF
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the POISON type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625: @ 825A625
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the GROUND type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B: @ 825A66B
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the FLYING type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1: @ 825A6B1
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the PSYCHIC type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8: @ 825A6F8
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the BUG type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B: @ 825A73B
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the ROCK type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F: @ 825A77F
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the GHOST type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4: @ 825A7C4
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the DRAGON type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A: @ 825A80A
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the DARK type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E: @ 825A84E
-	.string "The TRAINER is apparently skilled\n"
-	.string "in the handling of the STEEL type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893: @ 825A893
-	.string "The TRAINER appears to have no clear\n"
-	.string "favorites when it comes to type.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A8D9: @ 825A8D9
-	.string "The favorite battle style appears to\n"
-	.string "be slow and steady.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A912: @ 825A912
-	.string "The favorite battle style appears to\n"
-	.string "be one of endurance.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A94C: @ 825A94C
-	.string "The favorite battle style appears to\n"
-	.string "be high risk, high return.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A98C: @ 825A98C
-	.string "The favorite battle style appears to\n"
-	.string "depend on the battle’s flow.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A9CE: @ 825A9CE
-	.string "The favorite battle style appears to\n"
-	.string "be one based on total preparation.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA16: @ 825AA16
-	.string "The favorite battle style appears\n"
-	.string "to be weakening the foe to start.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA5A: @ 825AA5A
-	.string "The favorite battle style appears to\n"
-	.string "be flexibly adaptable to the situation.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAA7: @ 825AAA7
-	.string "The favorite battle style appears to\n"
-	.string "be impossible to predict.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAE6: @ 825AAE6
-	.string "The favorite battle style appears to\n"
-	.string "be free-spirited and unrestrained.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E: @ 825AB2E
-SlateportCity_BattleTentCorridor_Text_25AB2E: @ 825AB2E
-	.string "Before starting the battle, would you\n"
-	.string "like to swap a POKéMON?$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C: @ 825AB6C
-SlateportCity_BattleTentCorridor_Text_25AB6C: @ 825AB6C
-	.string "Thank you!\n"
-	.string "Your POKéMON swap is complete.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96: @ 825AB96
-SlateportCity_BattleTentCorridor_Text_25AB96: @ 825AB96
-	.string "Right this way, please!$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABAE: @ 825ABAE
-SlateportCity_BattleTentCorridor_Text_25ABAE: @ 825ABAE
-	.string "I am saving your data.\n"
-	.string "Please wait.$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABD2: @ 825ABD2
-	.string "Would you like to record your latest\n"
-	.string "battle on your FRONTIER PASS?$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15: @ 825AC15
-	.string "Excuse me! Excuse me, please!\n"
-	.string "May I get you to wait a few moments?$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58: @ 825AC58
-	.string "…Uh-huh? What?! …Whoa!\n"
-	.string "Understood, sir! Will do!$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89: @ 825AC89
-	.string "Oh, my…\n"
-	.string "Sorry to keep you waiting!\p"
-	.string "I have a message from this facility’s\n"
-	.string "boss, the FACTORY HEAD.\p"
-	.string "He says, “We’re going to do it!\n"
-	.string "Come here right now!”$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20: @ 825AD20
-	.string "The FACTORY HEAD is demanding you.\n"
-	.string "Are you prepared to face him?$"
-
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61: @ 825AD61
-	.string "I’m terribly sorry, but I can’t tell you\n"
-	.string "anything about the FACTORY HEAD.$"
diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc
deleted file mode 100644
index 07ccbe79d..000000000
--- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc
+++ /dev/null
@@ -1,650 +0,0 @@
-BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815
-	map_script 3, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825
-	map_script 2, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861
-	map_script 4, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34
-	.byte 0
-
-BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
-	setvar VAR_0x8004, 5
-	special sub_81A1780
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833
-	end
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856
-	return
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B
-	setvar VAR_OBJ_GFX_ID_1, 100
-	setvar VAR_OBJ_GFX_ID_0, 100
-	return
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856:: @ 824F856
-	setvar VAR_OBJ_GFX_ID_1, 105
-	setvar VAR_OBJ_GFX_ID_0, 105
-	return
-
-BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B
-	.2byte 0
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B
-	showobjectat 1, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B
-	waitmovement 0
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
-	setvar VAR_TEMP_2, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92
-	waitmovement 0
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF
-	setvar VAR_0x8004, 3
-	special sub_8161F74
-	addobject 2
-	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1
-	waitmovement 0
-	setvar VAR_0x8004, 5
-	special sub_8195960
-	msgbox 0x2021fc4, 4
-	waitmessage
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA:: @ 824F8FA
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special sub_81A1780
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	switch VAR_RESULT
-	case 7, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
-	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7
-	waitmovement 0
-	removeobject 2
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
-	waitmovement 0
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, 4
-	special LoadPlayerParty
-	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A
-	setvar VAR_0x8004, 9
-	special sub_81A1780
-	copyvar VAR_TEMP_F, VAR_RESULT
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66
-	compare VAR_RESULT, 2
-	call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D
-	compare VAR_RESULT, 3
-	call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74
-	compare VAR_RESULT, 4
-	call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B
-	compare VAR_RESULT, 5
-	call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82
-	compare VAR_RESULT, 6
-	call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42
-	multichoice 19, 4, 103, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78
-	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
-	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
-	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42:: @ 824FA42
-	multichoice 20, 6, 104, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
-	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
-	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78:: @ 824FA78
-	message BattleFrontier_BattlePalaceBattleRoom_Text_25009E
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
-	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA
-	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA:: @ 824FAAA
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8B4
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4:: @ 824FAB4
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250030, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F
-	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2:: @ 824FAE2
-	message BattleFrontier_BattlePalaceBattleRoom_Text_25005A
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
-	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
-	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14:: @ 824FB14
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97
-	closemessage
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special sub_81A1780
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
-	message BattleFrontier_BattlePalaceBattleRoom_Text_25007E
-	waitmessage
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 2
-	special sub_8195960
-	playse SE_SAVE
-	waitse
-	fadescreen 1
-	setvar VAR_0x8004, 4
-	special sub_81A1780
-	end
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61
-	compare VAR_TEMP_2, 1
-	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, 4
-	setvar VAR_TEMP_2, 1
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79
-	message BattleFrontier_BattlePalaceBattleRoom_Text_25014A
-	waitmessage
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0
-	multichoice 19, 4, 103, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78
-	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
-	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
-	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0:: @ 824FBD0
-	multichoice 20, 6, 104, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
-	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
-	case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_242170
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25017C, 4
-	closemessage
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97
-	setobjectxyperm 2, 15, 1
-	addobject 2
-	hideobjectat 2, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
-	setobjectxy 2, 13, 1
-	setobjectxyperm 2, 13, 1
-	applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF
-	applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7
-	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2
-	waitmovement 0
-	switch VAR_TEMP_F
-	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A
-	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
-	case 4, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, 4
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, 4
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
-	setvar VAR_0x8004, 6
-	special sub_8195960
-	setvar VAR_0x8004, 12
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, 4
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25036D, 4
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattlePalaceBattleRoom_Text_2503DC
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, 13
-	special sub_81A1780
-	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
-	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
-	waitmovement 0
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, 4
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, 4
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, 4
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
-	setvar VAR_0x8004, 6
-	special sub_8195960
-	setvar VAR_0x8004, 12
-	special sub_81A1780
-	compare VAR_RESULT, 2
-	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, 4
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250629, 4
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattlePalaceBattleRoom_Text_250699
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, 13
-	special sub_81A1780
-	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
-	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
-	waitmovement 0
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, 4
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7:: @ 824FDF7
-VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7
-	closemessage
-	setvar VAR_TEMP_2, 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special HealPlayerParty
-	setvar VAR_0x8004, 4
-	setvar VAR_0x8005, 0
-	special sub_8163AC4
-	waitstate
-	setvar VAR_0x8004, 18
-	special sub_81A1780
-	special HealPlayerParty
-	setvar VAR_0x8004, 21
-	special sub_81A1780
-	return
-
-BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E
-	.2byte 0
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E:: @ 824FE3E
-	hideobjectat 1, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833
-	setvar VAR_TEMP_1, 1
-	applymovement 255, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90
-	removeobject 2
-	applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90
-	applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90
-	end
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66:: @ 824FE66
-	message BattleFrontier_BattlePalaceBattleRoom_Text_24FF28
-	waitmessage
-	return
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D:: @ 824FE6D
-	message BattleFrontier_BattlePalaceBattleRoom_Text_24FF54
-	waitmessage
-	return
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74:: @ 824FE74
-	message BattleFrontier_BattlePalaceBattleRoom_Text_24FF80
-	waitmessage
-	return
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B:: @ 824FE7B
-	message BattleFrontier_BattlePalaceBattleRoom_Text_24FFAC
-	waitmessage
-	return
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82:: @ 824FE82
-	message BattleFrontier_BattlePalaceBattleRoom_Text_24FFD8
-	waitmessage
-	return
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89:: @ 824FE89
-	message BattleFrontier_BattlePalaceBattleRoom_Text_250004
-	waitmessage
-	return
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90: @ 824FE90
-	set_invisible
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92: @ 824FE92
-	set_visible
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97: @ 824FE97
-	face_right
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99: @ 824FE99
-	face_up
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B: @ 824FE9B
-	set_visible
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1: @ 824FEA1
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	face_left
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7: @ 824FEA7
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC: @ 824FEAC
-	face_down
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAE: @ 824FEAE
-	set_visible
-	walk_slow_down
-	walk_slow_down
-	face_left
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB3: @ 824FEB3
-	set_visible
-	walk_slow_down
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6
-	walk_slow_down
-	walk_slow_down
-	walk_slow_down
-	face_left
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB
-	copyvar VAR_RESULT, VAR_0x40CE
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5
-	warp BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7
-	waitstate
-	end
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5:: @ 824FED5
-	warp BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7
-	waitstate
-	end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF: @ 824FEDF
-	delay_16
-	delay_16
-	set_visible
-	walk_down
-	walk_right
-	walk_down
-	walk_in_place_fastest_left
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7: @ 824FEE7
-	set_visible
-	walk_fast_down
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_in_place_fastest_left
-	delay_16
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2: @ 824FEF2
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	set_visible
-	walk_slow_down
-	walk_slow_down
-	walk_slow_down
-	walk_slow_down
-	face_left
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Text_24FF00: @ 824FF00
-VerdanturfTown_BattleTentBattleRoom_Text_24FF00: @ 824FF00
-	.string "Excellent…\n"
-	.string "Let me restore your POKéMON.$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_24FF28: @ 824FF28
-VerdanturfTown_BattleTentBattleRoom_Text_24FF28: @ 824FF28
-	.string "The 2nd opponent is next.\n"
-	.string "Are you prepared?$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_24FF54: @ 824FF54
-VerdanturfTown_BattleTentBattleRoom_Text_24FF54: @ 824FF54
-	.string "The 3rd opponent is next.\n"
-	.string "Are you prepared?$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_24FF80: @ 824FF80
-	.string "The 4th opponent is next.\n"
-	.string "Are you prepared?$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_24FFAC: @ 824FFAC
-	.string "The 5th opponent is next.\n"
-	.string "Are you prepared?$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_24FFD8: @ 824FFD8
-	.string "The 6th opponent is next.\n"
-	.string "Are you prepared?$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_250004: @ 8250004
-	.string "The 7th opponent is next.\n"
-	.string "Are you prepared?$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_250030: @ 8250030
-VerdanturfTown_BattleTentBattleRoom_Text_250030: @ 8250030
-	.string "Would you like to save and quit\n"
-	.string "the game?$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_25005A: @ 825005A
-VerdanturfTown_BattleTentBattleRoom_Text_25005A: @ 825005A
-	.string "Do you wish to quit your challenge?$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_25007E: @ 825007E
-VerdanturfTown_BattleTentBattleRoom_Text_25007E: @ 825007E
-	.string "Saving the data.\n"
-	.string "Have patience…$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_25009E: @ 825009E
-	.string "Do you wish to record your latest\n"
-	.string "match on your FRONTIER PASS?$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_2500DD: @ 82500DD
-	.string "And now…\p"
-	.string "By winning consistently, you have\n"
-	.string "earned the privilege of challenging\l"
-	.string "our master, the PALACE MAVEN…$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_25014A: @ 825014A
-	.string "I shall send for the PALACE MAVEN.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_25017C: @ 825017C
-	.string "Let great fanfare announce the arrival\n"
-	.string "of the PALACE MAVEN, SPENSER!$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_2501C1: @ 82501C1
-	.string "SPENSER: My physical being is with\n"
-	.string "POKéMON always!\p"
-	.string "My heart beats as one with\n"
-	.string "POKéMON always!\p"
-	.string "Young one of a TRAINER!\n"
-	.string "Do you believe in your POKéMON?\p"
-	.string "Can you believe them through\n"
-	.string "and through?\p"
-	.string "If your bonds of trust are frail,\n"
-	.string "you will never beat my brethren!$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_2502C4: @ 82502C4
-	.string "The bond you share with your POKéMON!\n"
-	.string "Prove it to me here!$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_2502FF: @ 82502FF
-	.string "SPENSER: Gwahahah!\p"
-	.string "Hah, you never fell for my bluster!\n"
-	.string "Sorry for trying that stunt!\p"
-	.string "Here!\n"
-	.string "Bring me the thing!$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_25036D: @ 825036D
-	.string "My, my, if only you could maintain that\n"
-	.string "facade of distinguished authority…\p"
-	.string "Here!\n"
-	.string "Let’s see your FRONTIER PASS!$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_2503DC: @ 82503DC
-	.string "The Spirits Symbol was embossed on\n"
-	.string "the FRONTIER PASS!$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_250412: @ 8250412
-	.string "SPENSER: Your POKéMON’s eyes are \n"
-	.string "truly clear and unclouded.\p"
-	.string "I will eagerly await the next\n"
-	.string "opportunity to see you.$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_250485: @ 8250485
-	.string "SPENSER: Gwahahah!\n"
-	.string "You’ve battled your way up again?\p"
-	.string "You must have developed a truly\n"
-	.string "formidable bond with your POKéMON.\p"
-	.string "So be it!\p"
-	.string "This time, I won’t bluster or hold back.\n"
-	.string "This time, there’s no fooling around.\p"
-	.string "Ready now?\n"
-	.string "Prepare to lose!$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_250572: @ 8250572
-	.string "… … …Kaaah!$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_25057E: @ 825057E
-	.string "SPENSER: Well, that was some display!\n"
-	.string "Even fully unleashed, my brethren\l"
-	.string "could not overpower you.\p"
-	.string "Your team spirit is truly admirable!\p"
-	.string "Here!\n"
-	.string "Bring me that thing, will you?$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_250629: @ 8250629
-	.string "My, my, if only you could maintain\n"
-	.string "a certain level of decorum…\p"
-	.string "Gaaah, here!\n"
-	.string "Hurry with that FRONTIER PASS, you!$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_250699: @ 8250699
-	.string "The Spirits Symbol took on\n"
-	.string "a golden shine!$"
-
-BattleFrontier_BattlePalaceBattleRoom_Text_2506C4: @ 82506C4
-	.string "SPENSER: Gwahahah!\p"
-	.string "Come see me time and again!\n"
-	.string "My brethren and I will be waiting!$"
diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc
deleted file mode 100644
index 89697ff33..000000000
--- a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc
+++ /dev/null
@@ -1,160 +0,0 @@
-BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3
-	map_script 2, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9
-	.byte 0
-
-BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3
-	.2byte 0
-
-BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3
-	delay 16
-	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8
-	applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8
-	waitmovement 0
-	lockall
-	setvar VAR_0x8004, 3
-	special sub_8195960
-	compare VAR_RESULT, 0
-	call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F58B
-	compare VAR_RESULT, 1
-	call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F594
-	compare VAR_RESULT, 2
-	call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F59D
-	compare VAR_RESULT, 3
-	call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6
-	compare VAR_RESULT, 4
-	call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF
-	closemessage
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553
-	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD
-	applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4
-	waitmovement 0
-	opendoor 6, 3
-	waitdooranim
-	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA
-	applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9
-	waitmovement 0
-	closedoor 6, 3
-	waitdooranim
-	goto BattleFrontier_BattlePalaceCorridor_EventScript_24F581
-
-BattleFrontier_BattlePalaceCorridor_EventScript_24F553:: @ 824F553
-	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5CB
-	applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2
-	waitmovement 0
-	opendoor 10, 3
-	waitdooranim
-	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA
-	applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9
-	waitmovement 0
-	closedoor 10, 3
-	waitdooranim
-
-BattleFrontier_BattlePalaceCorridor_EventScript_24F581:: @ 824F581
-	warp BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4
-	waitstate
-	end
-
-BattleFrontier_BattlePalaceCorridor_EventScript_24F58B:: @ 824F58B
-	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F5DD, 4
-	return
-
-BattleFrontier_BattlePalaceCorridor_EventScript_24F594:: @ 824F594
-	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F65B, 4
-	return
-
-BattleFrontier_BattlePalaceCorridor_EventScript_24F59D:: @ 824F59D
-	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F718, 4
-	return
-
-BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6:: @ 824F5A6
-	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F78C, 4
-	return
-
-BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF:: @ 824F5AF
-	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F7D4, 4
-	return
-
-BattleFrontier_BattlePalaceCorridor_Movement_24F5B8: @ 824F5B8
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattlePalaceCorridor_Movement_24F5BD: @ 824F5BD
-	walk_up
-	walk_up
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattlePalaceCorridor_Movement_24F5C4: @ 824F5C4
-	walk_up
-	walk_up
-	walk_up
-	walk_left
-	walk_left
-	walk_up
-	step_end
-
-BattleFrontier_BattlePalaceCorridor_Movement_24F5CB: @ 824F5CB
-	walk_up
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattlePalaceCorridor_Movement_24F5D2: @ 824F5D2
-	walk_up
-	walk_up
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattlePalaceCorridor_Movement_24F5D9: @ 824F5D9
-	walk_up
-
-BattleFrontier_BattlePalaceCorridor_Movement_24F5DA: @ 824F5DA
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattlePalaceCorridor_Text_24F5DD: @ 824F5DD
-	.string "People and POKéMON, they are but\n"
-	.string "the same…\p"
-	.string "Their individual nature makes them\n"
-	.string "good at certain things, and not good\l"
-	.string "at others.$"
-
-BattleFrontier_BattlePalaceCorridor_Text_24F65B: @ 824F65B
-	.string "Rather than trying to make a POKéMON\n"
-	.string "do what it dislikes, try to let it do\l"
-	.string "what it likes and is good at doing.\p"
-	.string "Put yourself in the POKéMON’s position\n"
-	.string "and consider what moves it would like.$"
-
-BattleFrontier_BattlePalaceCorridor_Text_24F718: @ 824F718
-	.string "A POKéMON’s nature is a remarkable\n"
-	.string "thing…\p"
-	.string "Some POKéMON behave in a completely\n"
-	.string "different way when they are cornered.$"
-
-BattleFrontier_BattlePalaceCorridor_Text_24F78C: @ 824F78C
-	.string "Are you beginning to understand how\n"
-	.string "a POKéMON’s nature makes it behave?$"
-
-BattleFrontier_BattlePalaceCorridor_Text_24F7D4: @ 824F7D4
-	.string "Ah… I see a strong, heartfelt bond\n"
-	.string "between you and your POKéMON…$"
-
diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc
deleted file mode 100644
index a5cb11081..000000000
--- a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc
+++ /dev/null
@@ -1,729 +0,0 @@
-BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E
-	map_script 2, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D
-	map_script 4, BattleFrontier_BattlePalaceLobby_MapScript2_24D789
-	.byte 0
-
-BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D793
-	.2byte 0
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D7C7
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePalaceLobby_EventScript_24D7D0
-	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePalaceLobby_EventScript_24D908
-	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePalaceLobby_EventScript_24D817
-	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePalaceLobby_EventScript_24D873
-	.2byte 0
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7
-	setvar VAR_0x8004, 0
-	special sub_81A1780
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
-	lockall
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, 4
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_8195960
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special sub_8195960
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817
-	lockall
-	setvar VAR_0x8004, 10
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, 4
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24D840
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, 4
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, 4
-	setvar VAR_0x8004, 11
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePalaceLobby_Text_241520, 9
-	message BattleFrontier_BattlePalaceLobby_Text_24E4F7
-	waitmessage
-	call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873
-	lockall
-	message BattleFrontier_BattlePalaceLobby_Text_24E41E
-	waitmessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special sub_8195960
-	call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
-	setvar VAR_0x8004, 8
-	special sub_81A1780
-	special LoadPlayerParty
-	special HealPlayerParty
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	special sub_8195960
-	playse SE_SAVE
-	waitse
-	call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907
-	message BattleFrontier_BattlePalaceLobby_Text_24EF16
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24D907
-	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24D902
-	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24D907
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D902:: @ 824D902
-	call BattleFrontier_BattlePalaceLobby_EventScript_23E8B4
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D907:: @ 824D907
-	return
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908
-	lockall
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, 4
-	message BattleFrontier_BattlePalaceLobby_Text_24E5F6
-	waitmessage
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 1
-	special sub_8195960
-	playse SE_SAVE
-	waitse
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DAF3
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D944:: @ 824D944
-	lock
-	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 2
-	setvar VAR_0x40CE, 0
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24D968
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D956:: @ 824D956
-	lock
-	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 2
-	setvar VAR_0x40CE, 1
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24D968
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 0
-	special sub_8195960
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817
-	special SavePlayerParty
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBA7
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB0
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB6
-	waitmessage
-	multichoice 17, 6, 23, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24D9E6
-	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB20
-	case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
-	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
-	message BattleFrontier_BattlePalaceLobby_Text_24E119
-	waitmessage
-	multichoice 17, 6, 24, 0
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
-	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
-	setvar VAR_0x8004, 15
-	special sub_81A1780
-	compare VAR_0x8004, 1
-	goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, 4
-	fadescreen 1
-	call BattleFrontier_BattlePalaceLobby_EventScript_23F2B7
-	copyvar VAR_0x8004, VAR_RESULT
-	setvar VAR_0x8005, 3
-	special sub_80F9490
-	waitstate
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB91
-	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DA87
-	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB91
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
-	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	special sub_81A1780
-	setvar VAR_0x8004, 0
-	special sub_8195960
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special sub_8195960
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special LoadPlayerParty
-	closemessage
-	delay 2
-	call BattleFrontier_BattlePalaceLobby_EventScript_27134F
-	setvar VAR_TEMP_0, 255
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3
-	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, 4
-	closemessage
-	call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC
-	warp BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13
-	setvar VAR_TEMP_0, 0
-	waitstate
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20
-	compare VAR_0x40CE, 1
-	goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, 4
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24D999
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DB38:: @ 824DB38
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24EBC2, 4
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24D999
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DB45:: @ 824DB45
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB60
-	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB6D
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DB60:: @ 824DB60
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E173, 4
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DB6D:: @ 824DB6D
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E29E, 4
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DB94
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91
-	special LoadPlayerParty
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DB94:: @ 824DB94
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DB9C:: @ 824DB9C
-	release
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DB9E:: @ 824DB9E
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24DD5B, 4
-	return
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DBA7:: @ 824DBA7
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24EB06, 4
-	return
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DBB0:: @ 824DBB0
-	message BattleFrontier_BattlePalaceLobby_Text_24DDE1
-	return
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6
-	message BattleFrontier_BattlePalaceLobby_Text_24EB8C
-	return
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC23
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC29
-	applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47
-	applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC47
-	waitmovement 0
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC2F
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC35
-	waitdooranim
-	applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49
-	applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC4C
-	waitmovement 0
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC3B
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC41
-	waitdooranim
-	return
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DC23:: @ 824DC23
-	setvar VAR_LAST_TALKED, 1
-	return
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DC29:: @ 824DC29
-	setvar VAR_LAST_TALKED, 6
-	return
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DC2F:: @ 824DC2F
-	opendoor 5, 4
-	return
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DC35:: @ 824DC35
-	opendoor 19, 4
-	return
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DC3B:: @ 824DC3B
-	closedoor 5, 4
-	return
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DC41:: @ 824DC41
-	closedoor 19, 4
-	return
-
-BattleFrontier_BattlePalaceLobby_Movement_24DC47: @ 824DC47
-	walk_up
-	step_end
-
-BattleFrontier_BattlePalaceLobby_Movement_24DC49: @ 824DC49
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattlePalaceLobby_Movement_24DC4C: @ 824DC4C
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50
-	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69
-	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DC82:: @ 824DC82
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E6E3, 2
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DC8B:: @ 824DC8B
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E851, 2
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DC94:: @ 824DC94
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E992, 2
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DC9D:: @ 824DC9D
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24EA4B, 2
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DCA6:: @ 824DCA6
-	lockall
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24EF66, 4
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DCB5:: @ 824DCB5
-	message BattleFrontier_BattlePalaceLobby_Text_24EF88
-	waitmessage
-	multichoice 16, 0, 100, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DD13
-	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DD21
-	case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DD2F
-	case 3, BattleFrontier_BattlePalaceLobby_EventScript_24DD3D
-	case 4, BattleFrontier_BattlePalaceLobby_EventScript_24DD4B
-	case 5, BattleFrontier_BattlePalaceLobby_EventScript_24DD59
-	case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DD59
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DD13:: @ 824DD13
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24EFAB, 4
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DD21:: @ 824DD21
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24F049, 4
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DD2F:: @ 824DD2F
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24F190, 4
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DD3D:: @ 824DD3D
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24F2E8, 4
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DD4B:: @ 824DD4B
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24F3F4, 4
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
-	end
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DD59:: @ 824DD59
-	releaseall
-	end
-
-BattleFrontier_BattlePalaceLobby_Text_24DD5B: @ 824DD5B
-	.string "Where the hearts of TRAINERS\n"
-	.string "are put to the test.\p"
-	.string "I welcome you to the BATTLE PALACE.\p"
-	.string "I accept challenges to the SINGLE\n"
-	.string "BATTLE HALLS.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24DDE1: @ 824DDE1
-	.string "Do you wish to take\n"
-	.string "the SINGLE BATTLE HALL challenge?$"
-
-BattleFrontier_BattlePalaceLobby_Text_24DE17: @ 824DE17
-	.string "In the BATTLE PALACE, there are\n"
-	.string "several auditoriums for SINGLE BATTLES\l"
-	.string "that are named SINGLE BATTLE HALLS.\p"
-	.string "The SINGLE BATTLES are conducted in\n"
-	.string "the usual way, except with one crucial\l"
-	.string "rule that must be obeyed.\p"
-	.string "TRAINERS are permitted only to switch\n"
-	.string "their POKéMON in and out.\p"
-	.string "TRAINERS are otherwise forbidden to\n"
-	.string "command their POKéMON.\p"
-	.string "The POKéMON are to behave according\n"
-	.string "to their nature and battle on their own.\p"
-	.string "You must put your trust in your\n"
-	.string "POKéMON and watch over them.\p"
-	.string "If you achieve the honor of beating\n"
-	.string "seven TRAINERS in succession,\l"
-	.string "we will present you with Battle Points.\p"
-	.string "If you want to interrupt your\n"
-	.string "challenge, you must save the game.\p"
-	.string "If you don’t save before interrupting,\n"
-	.string "you will be disqualified.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E0D8: @ 824E0D8
-	.string "When you have fortified your heart\n"
-	.string "and POKéMON, you must return.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E119: @ 824E119
-	.string "There are two BATTLE HALLS,\n"
-	.string "Level 50 and Open Level.\l"
-	.string "Which is your choice of a challenge?$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E173: @ 824E173
-	.string "Sigh…\p"
-	.string "You do not have the three POKéMON\n"
-	.string "required for the challenge.\p"
-	.string "To enter, you must provide three\n"
-	.string "different kinds of POKéMON.\p"
-	.string "These POKéMON must all be of\n"
-	.string "Level 50 or lower.\p"
-	.string "They also must not be holding\n"
-	.string "the same kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "Come back when you have made\n"
-	.string "your preparations.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E29E: @ 824E29E
-	.string "Sigh…\p"
-	.string "You do not have the three POKéMON\n"
-	.string "required for the challenge.\p"
-	.string "To enter, you must provide three\n"
-	.string "different kinds of POKéMON.\p"
-	.string "They also must not be holding\n"
-	.string "the same kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "Come back when you have made\n"
-	.string "your preparations.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E399: @ 824E399
-	.string "Good. Now, you must select your\n"
-	.string "three POKéMON.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E3C8: @ 824E3C8
-	.string "I must save before I show you to\n"
-	.string "the BATTLE HALL. Is that okay?$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E408: @ 824E408
-	.string "Good.\n"
-	.string "Now, follow me.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E41E: @ 824E41E
-	.string "I feel privileged for having seen\n"
-	.string "your POKéMON’s exploits.\p"
-	.string "The results will be recorded.\n"
-	.string "I must ask you to briefly wait.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E497: @ 824E497
-	.string "To achieve a 7-win streak…\p"
-	.string "The bonds that bind your heart with\n"
-	.string "your POKéMON seem firm and true.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E4F7: @ 824E4F7
-	.string "Your feat will be recorded.\n"
-	.string "I must ask you to briefly wait.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E533: @ 824E5333
-    .string "For the feat of your 7-win streak,\n"
-    .string "we present you with Battle Point(s).$"
-
-VerdanturfTown_BattleTentLobby_Text_24E57B: @ 824E57B
-	.string "You seem to have no space for\n"
-	.string "our prize.\p"
-	.string "You should return when you have\n"
-	.string "organized your BAG.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E5D8: @ 824E5D8
-VerdanturfTown_BattleTentLobby_Text_24E5D8: @ 824E5D8
-	.string "We have been waiting for you…$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E5F6: @ 824E5F6
-VerdanturfTown_BattleTentLobby_Text_24E5F6: @ 824E5F6
-	.string "I must save before I show you to\n"
-	.string "the BATTLE HALL. Is that okay?$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E636: @ 824E636
-VerdanturfTown_BattleTentLobby_Text_24E636: @ 824E636
-	.string "Sigh…\p"
-	.string "You failed to save before you ended\n"
-	.string "your challenge the last time.\p"
-	.string "As a result, your challenge has been\n"
-	.string "disqualified. It is most unfortunate.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E6C9: @ 824E6C9
-	.string "{PLAYER} received the prize\n"
-	.string "{STR_VAR_1}.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E6E3: @ 824E6E3
-	.string "For a hardy fellow like me,\n"
-	.string "hardy POKéMON are the best.\p"
-	.string "Offense is the best defense!\n"
-	.string "A relentless attack is the ultimate!\p"
-	.string "But that’s not what I wanted to chat\n"
-	.string "about.\p"
-	.string "Every so often a really cute lady\n"
-	.string "swings by here.\p"
-	.string "She says that she can tell what\n"
-	.string "POKéMON are thinking.\p"
-	.string "I don’t know about that part,\n"
-	.string "but she is really cute.\p"
-	.string "Huh?\n"
-	.string "Why are you looking at me like that?$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E851: @ 824E851
-	.string "Hmm…\p"
-	.string "It appears that the nature of POKéMON\n"
-	.string "and the moves that they have been\l"
-	.string "taught are the keys to battle here.\p"
-	.string "To be more precise, it’s how well\n"
-	.string "the moves match the nature of\l"
-	.string "the POKéMON.\p"
-	.string "If your POKéMON is in trouble and\n"
-	.string "unable to live up to its potential,\l"
-	.string "you may need to examine how well\l"
-	.string "its moves match its nature.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24E992: @ 824E992
-	.string "My POKéMON is usually very docile.\p"
-	.string "But when it’s in a BATTLE HALL,\n"
-	.string "it sometimes seems to become\l"
-	.string "transformed into something wicked!\p"
-	.string "It becomes totally intimidating.\n"
-	.string "It’s shocking, even.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24EA4B: @ 824EA4B
-	.string "I wonder what sort of nature a POKéMON\n"
-	.string "would have if it favored enfeebling its\l"
-	.string "opponents and chipping away slowly.\p"
-	.string "I’d be surprised if it was a LAX nature.\p"
-	.string "But, nah, that can’t be right.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24EB06: @ 824EB06
-	.string "Where the hearts of TRAINERS\n"
-	.string "are put to the test.\p"
-	.string "I welcome you to the BATTLE PALACE.\p"
-	.string "I accept challenges to the DOUBLE\n"
-	.string "BATTLE HALLS.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24EB8C: @ 824EB8C
-	.string "Do you wish to take\n"
-	.string "the DOUBLE BATTLE HALL challenge?$"
-
-BattleFrontier_BattlePalaceLobby_Text_24EBC2: @ 824EBC2
-	.string "In the BATTLE PALACE, there are\n"
-	.string "several auditoriums for DOUBLE BATTLES\l"
-	.string "that are named DOUBLE BATTLE HALLS.\p"
-	.string "The DOUBLE BATTLES are conducted in\n"
-	.string "the usual way, except with one crucial\l"
-	.string "rule that must be obeyed.\p"
-	.string "TRAINERS are permitted only to switch\n"
-	.string "their POKéMON in and out.\p"
-	.string "TRAINERS are otherwise forbidden to\n"
-	.string "command their POKéMON.\p"
-	.string "The POKéMON are to behave according\n"
-	.string "to their nature and battle on their own.\p"
-	.string "You must put your trust in your\n"
-	.string "POKéMON and watch over them.\p"
-	.string "If you achieve the honor of beating\n"
-	.string "seven TRAINERS in succession,\l"
-	.string "we will present you with Battle Points.\p"
-	.string "If you want to interrupt your\n"
-	.string "challenge, please save the game.\p"
-	.string "If you don’t save before interrupting,\n"
-	.string "you will be disqualified.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24EE81: @ 824EE81
-	.string "To defeat the PALACE MAVEN\n"
-	.string "and seven TRAINERS in a row…$"
-
-BattleFrontier_BattlePalaceLobby_Text_24EEB9: @ 824EEB9
-	.string "In honor of the bond you share with\n"
-	.string "your POKéMON, we present you with\l"
-	.string "these Battle Point(s).$"
-
-BattleFrontier_BattlePalaceLobby_Text_24EF16: @ 824EF16
-	.string "Would you like to record your latest\n"
-	.string "BATTLE PALACE match on your\l"
-	.string "FRONTIER PASS?$"
-
-BattleFrontier_BattlePalaceLobby_Text_24EF66: @ 824EF66
-	.string "The BATTLE HALL rules are listed.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24EF88: @ 824EF88
-VerdanturfTown_BattleTentLobby_Text_24EF88: @ 824EF88
-	.string "Which heading do you want to read?$"
-
-BattleFrontier_BattlePalaceLobby_Text_24EFAB: @ 824EFAB
-VerdanturfTown_BattleTentLobby_Text_24EFAB: @ 824EFAB
-	.string "Here, POKéMON are required to think\n"
-	.string "and battle by themselves.\p"
-	.string "Unlike in the wild, POKéMON that live\n"
-	.string "with people behave differently\l"
-	.string "depending on their nature.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24F049: @ 824F049
-VerdanturfTown_BattleTentLobby_Text_24F049: @ 824F049
-	.string "Depending on its nature, a POKéMON\n"
-	.string "may prefer to attack no matter what.\p"
-	.string "Another POKéMON may prefer to protect\n"
-	.string "itself from any harm.\p"
-	.string "Yet another may enjoy vexing or\n"
-	.string "confounding its foes.\p"
-	.string "Due to its nature, a POKéMON\n"
-	.string "will have favorite moves that it is good\l"
-	.string "at using.\p"
-	.string "It may also dislike certain moves that\n"
-	.string "it has trouble using.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24F190: @ 824F190
-VerdanturfTown_BattleTentLobby_Text_24F190: @ 824F190
-	.string "There are offensive moves that inflict\n"
-	.string "direct damage on the foe.\p"
-	.string "There are defensive moves that are\n"
-	.string "used to prepare for enemy attacks or\l"
-	.string "used to heal HP and so on.\p"
-	.string "There are also other somewhat-odd\n"
-	.string "moves that may enfeeble the foes with\l"
-	.string "stat problems including poison and \l"
-	.string "paralysis.\p"
-	.string "POKéMON will consider using moves in\n"
-	.string "these three categories.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24F2E8: @ 824F2E8
-VerdanturfTown_BattleTentLobby_Text_24F2E8: @ 824F2E8
-	.string "When not under command by its TRAINER,\n"
-	.string "a POKéMON may be unable to effectively\l"
-	.string "use certain moves.\p"
-	.string "A POKéMON is not good at using any\n"
-	.string "move that it dislikes.\p"
-	.string "If a POKéMON only knows moves that\n"
-	.string "do not match its nature, it will often\l"
-	.string "be unable to live up to its potential.$"
-
-BattleFrontier_BattlePalaceLobby_Text_24F3F4: @ 824F3F4
-VerdanturfTown_BattleTentLobby_Text_24F3F4: @ 824F3F4
-	.string "Depending on its nature, a POKéMON may\n"
-	.string "start using moves that don’t match its\l"
-	.string "nature when it is in trouble.\p"
-	.string "If a POKéMON begins behaving oddly\n"
-	.string "in a pinch, watch it carefully.$"
-
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc
deleted file mode 100644
index 4171da314..000000000
--- a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc
+++ /dev/null
@@ -1,69 +0,0 @@
-BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771
-	map_script 2, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C
-	map_script 4, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7
-	.byte 0
-
-BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C786
-	.2byte 0
-
-BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
-	delay 16
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	setvar VAR_0x8004, 20
-	special sub_81A703C
-	setvar VAR_0x8004, 24
-	setvar VAR_0x8005, 1
-	special sub_81A703C
-	applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80B
-	applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812
-	waitmovement 0
-	lockall
-	msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, 4
-	closemessage
-	releaseall
-	applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80E
-	waitmovement 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 99
-	special sub_81A1780
-	call BattleFrontier_BattlePikeCorridor_EventScript_25BB49
-	warpsilent BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10
-	waitstate
-	end
-
-BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C801
-	.2byte 0
-
-BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattlePikeCorridor_Movement_25C80E: @ 825C80E
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattlePikeCorridor_Movement_25C812: @ 825C812
-	walk_up
-	walk_up
-	walk_left
-	face_down
-	step_end
-
-BattleFrontier_BattlePikeCorridor_Text_25C817: @ 825C817
-	.string "Your Battle Choice challenge\n"
-	.string "has now begun…$"
-
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc
deleted file mode 100644
index 74bdb1d78..000000000
--- a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc
+++ /dev/null
@@ -1,497 +0,0 @@
-BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6
-	map_script 2, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1
-	map_script 4, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3
-	.byte 0
-
-BattleFrontier_BattlePikeLobby_MapScript2_25B6D1: @ 825B6D1
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B707
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePikeLobby_EventScript_25B710
-	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePikeLobby_EventScript_25B762
-	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePikeLobby_EventScript_25B806
-	.2byte 0
-
-BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeLobby_EventScript_25B6FD
-	.2byte 0
-
-BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
-	setvar VAR_0x8004, 0
-	special sub_81A1780
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
-	special HealPlayerParty
-	setvar VAR_0x8004, 27
-	special sub_81A703C
-	lockall
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, 4
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_81A703C
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	setvar VAR_0x8006, 0
-	special sub_81A703C
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762
-	lockall
-	setvar VAR_0x8004, 10
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, 4
-	waitmessage
-	goto BattleFrontier_BattlePikeLobby_EventScript_25B78D
-
-BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C383, 4
-	waitmessage
-
-BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, 4
-	setvar VAR_0x8004, 11
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9
-	setvar VAR_0x8004, 8
-	special sub_81A1780
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 3
-	special sub_81A703C
-	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A703C
-	special LoadPlayerParty
-	special HealPlayerParty
-	setvar VAR_0x8004, 27
-	special sub_81A703C
-	message BattleFrontier_BattlePikeLobby_Text_25C1DF
-	waitmessage
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 0
-	special sub_81A703C
-	playse SE_SAVE
-	waitse
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
-	lockall
-	message BattleFrontier_BattlePikeLobby_Text_25C146
-	waitmessage
-	setvar VAR_0x8004, 8
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	setvar VAR_0x8006, 0
-	special sub_81A703C
-	special LoadPlayerParty
-	special HealPlayerParty
-	setvar VAR_0x8004, 27
-	special sub_81A703C
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 0
-	special sub_81A703C
-	playse SE_SAVE
-	waitse
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868
-	lock
-	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 5
-	setvar VAR_0x40CE, 0
-	special SavePlayerParty
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, 4
-
-BattleFrontier_BattlePikeLobby_EventScript_25B87F:: @ 825B87F
-	message BattleFrontier_BattlePikeLobby_Text_25BBC1
-	waitmessage
-	multichoice 17, 6, 23, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeLobby_EventScript_25B8BB
-	case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA1A
-	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76
-	case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76
-
-BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
-	message BattleFrontier_BattlePikeLobby_Text_25BE35
-	waitmessage
-	multichoice 17, 6, 24, 0
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76
-	case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76
-	setvar VAR_0x8004, 15
-	special sub_81A1780
-	compare VAR_0x8004, 1
-	goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C094, 4
-	fadescreen 1
-	call BattleFrontier_BattlePikeLobby_EventScript_23F2B7
-	copyvar VAR_0x8004, VAR_RESULT
-	setvar VAR_0x8005, 3
-	special sub_80F9490
-	waitstate
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA73
-	case 1, BattleFrontier_BattlePikeLobby_EventScript_25B95C
-	case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA73
-
-BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
-	setvar VAR_TEMP_0, 0
-	setvar VAR_TEMP_1, 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	special sub_81A1780
-	setvar VAR_0x8004, 28
-	special sub_81A703C
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	setvar VAR_0x8006, 1
-	special sub_81A703C
-	setvar VAR_0x8004, 26
-	special sub_81A703C
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special LoadPlayerParty
-	closemessage
-	delay 2
-	call BattleFrontier_BattlePikeLobby_EventScript_27134F
-	setvar VAR_TEMP_0, 255
-	setvar VAR_0x8004, 26
-	special sub_81A703C
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C
-	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C130, 4
-	closemessage
-	setvar VAR_0x8004, 5
-	special sub_81A1780
-	call BattleFrontier_BattlePikeLobby_EventScript_25BA94
-	special HealPlayerParty
-	call BattleFrontier_BattlePikeLobby_EventScript_25BB49
-	warpsilent BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7
-	setvar VAR_TEMP_0, 0
-	waitstate
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25BA1A:: @ 825BA1A
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BBF5, 4
-	goto BattleFrontier_BattlePikeLobby_EventScript_25B87F
-
-BattleFrontier_BattlePikeLobby_EventScript_25BA27:: @ 825BA27
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA42
-	case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA4F
-
-BattleFrontier_BattlePikeLobby_EventScript_25BA42:: @ 825BA42
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BE8C, 4
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E
-
-BattleFrontier_BattlePikeLobby_EventScript_25BA4F:: @ 825BA4F
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BF9A, 4
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E
-
-BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BA76
-
-BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73
-	special LoadPlayerParty
-
-BattleFrontier_BattlePikeLobby_EventScript_25BA76:: @ 825BA76
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4
-
-BattleFrontier_BattlePikeLobby_EventScript_25BA7E:: @ 825BA7E
-	release
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80
-	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 5
-	special sub_81A1780
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94
-	applymovement 1, BattleFrontier_BattlePikeLobby_Movement_25BAA7
-	applymovement 255, BattleFrontier_BattlePikeLobby_Movement_25BAA6
-	waitmovement 0
-	return
-
-BattleFrontier_BattlePikeLobby_Movement_25BAA6: @ 825BAA6
-	walk_up
-
-BattleFrontier_BattlePikeLobby_Movement_25BAA7: @ 825BAA7
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattlePikeLobby_EventScript_25BAAB:: @ 825BAAB
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C422, 2
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25BAB4:: @ 825BAB4
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C4A5, 2
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25BABD:: @ 825BABD
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C4FD, 2
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25BAC6:: @ 825BAC6
-	lockall
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C5FB, 4
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25BAD5:: @ 825BAD5
-	message BattleFrontier_BattlePikeLobby_Text_25C621
-	waitmessage
-	multichoice 16, 4, 102, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeLobby_EventScript_25BB1D
-	case 1, BattleFrontier_BattlePikeLobby_EventScript_25BB2B
-	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BB39
-	case 3, BattleFrontier_BattlePikeLobby_EventScript_25BB47
-	case 127, BattleFrontier_BattlePikeLobby_EventScript_25BB47
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25BB1D:: @ 825BB1D
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C644, 4
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25BB2B:: @ 825BB2B
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C68A, 4
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25BB39:: @ 825BB39
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C6EB, 4
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
-	end
-
-BattleFrontier_BattlePikeLobby_EventScript_25BB47:: @ 825BB47
-	releaseall
-	end
-
-BattleFrontier_BattlePikeCorridor_EventScript_25BB49:: @ 825BB49
-BattleFrontier_BattlePikeLobby_EventScript_25BB49:: @ 825BB49
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49:: @ 825BB49
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49:: @ 825BB49
-	playse 267
-	special sub_813B880
-	waitstate
-	waitse
-	return
-
-BattleFrontier_BattlePikeLobby_Text_25BB52: @ 825BB52
-	.string "Where the luck of TRAINERS\n"
-	.string "is put to the test…\p"
-	.string "Welcome to the BATTLE PIKE…\p"
-	.string "I am your guide to the BATTLE PIKE…$"
-
-BattleFrontier_BattlePikeLobby_Text_25BBC1: @ 825BBC1
-	.string "Would you like to take the Battle\n"
-	.string "Choice challenge?$"
-
-BattleFrontier_BattlePikeLobby_Text_25BBF5: @ 825BBF5
-	.string "Here we conduct an event we call\n"
-	.string "the Battle Choice.\p"
-	.string "The Battle Choice rules are very\n"
-	.string "simple…\p"
-	.string "Choose one of three paths and make\n"
-	.string "your way to the goal room at the end\l"
-	.string "of the BATTLE PIKE. It’s that simple.\p"
-	.string "However, what happens on the chosen\n"
-	.string "path depends entirely on the luck\l"
-	.string "of the challenger…\p"
-	.string "If you reach the goal, you will be\n"
-	.string "rewarded with Battle Points.\p"
-	.string "If you want to interrupt your\n"
-	.string "challenge, please have a word with\l"
-	.string "our staff in the big rooms on the way.\p"
-	.string "If you don’t save before interrupting,\n"
-	.string "you will be disqualified.$"
-
-BattleFrontier_BattlePikeLobby_Text_25BE02: @ 825BE02
-	.string "We look forward to seeing you\n"
-	.string "on another occasion…$"
-
-BattleFrontier_BattlePikeLobby_Text_25BE35: @ 825BE35
-	.string "You have the choice of two courses,\n"
-	.string "Level 50 and Open Level.\l"
-	.string "Which will you challenge?$"
-
-BattleFrontier_BattlePikeLobby_Text_25BE8C: @ 825BE8C
-	.string "I beg your pardon, but…\p"
-	.string "You do not have three eligible\n"
-	.string "POKéMON for the Battle Choice event.\p"
-	.string "You must have three different POKéMON\n"
-	.string "of Level 50 or less to enter.\p"
-	.string "They also must be holding different\n"
-	.string "kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "Please come see me when\n"
-	.string "you are ready…$"
-
-BattleFrontier_BattlePikeLobby_Text_25BF9A: @ 825BF9A
-	.string "I beg your pardon, but…\p"
-	.string "You do not have three eligible\n"
-	.string "POKéMON for the Battle Choice event.\p"
-	.string "You must have three different\n"
-	.string "POKéMON to enter.\p"
-	.string "They also must be holding different\n"
-	.string "kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "Please come see me when\n"
-	.string "you are ready…$"
-
-BattleFrontier_BattlePikeLobby_Text_25C094: @ 825C094
-	.string "Please choose the three POKéMON\n"
-	.string "you wish to enter in the challenge…$"
-
-BattleFrontier_BattlePikeLobby_Text_25C0D8: @ 825C0D8
-	.string "Before starting your Battle Choice\n"
-	.string "challenge, I must save the game.\l"
-	.string "Is that acceptable?$"
-
-BattleFrontier_BattlePikeLobby_Text_25C130: @ 825C130
-	.string "Please step this way…$"
-
-BattleFrontier_BattlePikeLobby_Text_25C146: @ 825C146
-	.string "Your challenge has ended…\p"
-	.string "I shall record your results.\n"
-	.string "Please wait…$"
-
-BattleFrontier_BattlePikeLobby_Text_25C18A: @ 825C18A
-	.string "You have completed the challenge…\p"
-	.string "I must say… You seem to possess luck\n"
-	.string "in abundance…$"
-
-BattleFrontier_BattlePikeLobby_Text_25C1DF: @ 825C1DF
-	.string "I shall record your results.\n"
-	.string "Please wait…$"
-
-BattleFrontier_BattlePikeLobby_Text_25C209: @ 825C209
-	.string "To commemorate your completion of\n"
-	.string "the Battle Choice challenge, we award\l"
-	.string "you these Battle Point(s)…$"
-
-BattleFrontier_BattlePikeLobby_Text_25C26C: @ 825C26C
-	.string "You appear to have reached the limit\n"
-	.string "for Battle Points…\pPlease exchange some Battle Points\n"
-	.string "for prizes, then return…$"
-
-BattleFrontier_BattlePikeLobby_Text_25C2E0: @ 825C2E0
-	.string "I beg your pardon, but…\p"
-	.string "You failed to save before you quit\n"
-	.string "your challenge the last time.\p"
-	.string "Because of that, your challenge so far\n"
-	.string "has been disqualified. I am sorry…$"
-
-BattleFrontier_BattlePikeLobby_Text_25C383: @ 825C383
-	.string "Congratulations…\p"
-	.string "You have snatched victory from the\n"
-	.string "PIKE QUEEN and cleared the event…$"
-
-BattleFrontier_BattlePikeLobby_Text_25C3D9: @ 825C3D9
-	.string "In recognition of your amazing luck,\n"
-	.string "we award you these Battle Point(s)…$"
-
-BattleFrontier_BattlePikeLobby_Text_25C422: @ 825C422
-	.string "Arrgh! I blew my chance!\n"
-	.string "I was one room away from the goal!\p"
-	.string "In this place, you’d better watch out\n"
-	.string "for poison, freezing, and so on.$"
-
-BattleFrontier_BattlePikeLobby_Text_25C4A5: @ 825C4A5
-	.string "I’ve completed the challenge 10 times\n"
-	.string "now, but I’ve never had to battle\l"
-	.string "a TRAINER once.$"
-
-BattleFrontier_BattlePikeLobby_Text_25C4FD: @ 825C4FD
-	.string "Listen! Listen!\p"
-	.string "Don’t you think that the special\n"
-	.string "abilities of POKéMON will be useful\l"
-	.string "here?$"
-
-BattleFrontier_BattlePikeLobby_Text_25C558: @ 825C558
-	.string "What is this weird place?\n"
-	.string "I can’t figure it out at all!\p"
-	.string "I’ve taken the challenge a bunch\n"
-	.string "of times, but all I ever do is run into\l"
-	.string "TRAINERS whichever path I choose.$"
-
-BattleFrontier_BattlePikeLobby_Text_25C5FB: @ 825C5FB
-	.string "The Battle Choice’s rules are listed.$"
-
-BattleFrontier_BattlePikeLobby_Text_25C621: @ 825C621
-	.string "Which heading do you want to read?$"
-
-BattleFrontier_BattlePikeLobby_Text_25C644: @ 825C644
-	.string "The BAG and POKéNAV may not be used\n"
-	.string "during a Battle Choice challenge.$"
-
-BattleFrontier_BattlePikeLobby_Text_25C68A: @ 825C68A
-	.string "During a Battle Choice challenge,\n"
-	.string "any BERRY or HERB held by POKéMON\l"
-	.string "will be effective only once.$"
-
-BattleFrontier_BattlePikeLobby_Text_25C6EB: @ 825C6EB
-	.string "During a Battle Choice challenge,\n"
-	.string "the sequence of POKéMON cannot be\l"
-	.string "changed.\p"
-	.string "The sequence must be set before\n"
-	.string "starting your challenge.$"
-
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc
deleted file mode 100644
index fd5fd81e0..000000000
--- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc
+++ /dev/null
@@ -1,895 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom1_MapScripts:: @ 825D152
-	map_script 5, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E
-	map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25
-	map_script 2, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167
-	map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE
-	.byte 0
-
-BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171
-	.2byte 0
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171
-	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, 5
-	special sub_81A703C
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6
-	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E
-	case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605
-	case 6, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231
-	case 7, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E
-	case 8, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6
-	lockall
-	delay 16
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
-	waitmovement 0
-	setvar VAR_0x8004, 21
-	setvar VAR_0x8005, 0
-	special sub_81A703C
-	msgbox 0x2021fc4, 4
-	waitmessage
-	closemessage
-	releaseall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	special sub_8163AC4
-	waitstate
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A:: @ 825D20A
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special sub_81A1780
-	warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
-	waitstate
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226:: @ 825D226
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798
-	waitmovement 0
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231
-	lockall
-	delay 16
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE, 4
-	waitmessage
-	closemessage
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
-	waitmovement 0
-	setvar VAR_0x8004, 21
-	setvar VAR_0x8005, 0
-	special sub_81A703C
-	msgbox 0x2021fc4, 4
-	waitmessage
-	closemessage
-	releaseall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	special sub_8163AC4
-	waitstate
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798
-	waitmovement 0
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6
-	waitmovement 0
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, 4
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, 4
-	closemessage
-	release
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798
-	waitmovement 0
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF
-	delay 22
-	lockall
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF
-	waitmovement 0
-	setvar VAR_0x8004, 23
-	special sub_81A703C
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC
-	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA
-	case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, 4
-	closemessage
-	special SpawnScriptEventObject
-	applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2
-	waitmovement 0
-	playse 267
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7
-	delay 4
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4
-	delay 4
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D
-	delay 4
-	waitse
-	delay 60
-	playse 268
-	delay 65
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4
-	showobjectat 1, BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1
-	delay 4
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7
-	delay 4
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D92A
-	waitse
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7
-	waitmovement 0
-	setvar VAR_0x8004, 22
-	special sub_81A703C
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416
-	case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD
-	case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, 4
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, 4
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA
-	setvar VAR_0x8004, 12
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4
-	waitmessage
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, 13
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, 4
-	closemessage
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, 4
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, 4
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460
-	setvar VAR_0x8004, 12
-	special sub_81A1780
-	compare VAR_RESULT, 2
-	goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4
-	waitmessage
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25E118
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, 13
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, 4
-	closemessage
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA
-	waitmovement 0
-	applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_81A703C
-	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A703C
-	call BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144
-	waitstate
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC:: @ 825D4DC
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E15D, 4
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA:: @ 825D4EA
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, 4
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC:: @ 825D4FC
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, 4
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E
-	lockall
-	delay 16
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
-	waitmovement 0
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6
-	waitmessage
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, 4
-	closemessage
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798
-	waitmovement 0
-	releaseall
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
-	lockall
-	delay 16
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3
-	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5
-	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA
-	waitmovement 0
-	applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB
-	waitmovement 0
-	setvar VAR_0x8004, 21
-	setvar VAR_0x8005, 0
-	special sub_81A703C
-	msgbox 0x2021fc4, 4
-	closemessage
-	delay 16
-	applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
-	waitmovement 0
-	setvar VAR_0x8004, 21
-	setvar VAR_0x8005, 1
-	special sub_81A703C
-	msgbox 0x2021fc4, 4
-	closemessage
-	setvar VAR_0x8004, 9
-	setvar VAR_0x8005, 0
-	special sub_8163AC4
-	waitstate
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC
-	goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC:: @ 825D5DC
-	applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
-	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC
-	waitmovement 0
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4
-	waitmovement 0
-	applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF
-	waitmovement 0
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605
-	lockall
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA
-	waitmovement 0
-	setvar VAR_0x8004, 12
-	special sub_81A703C
-	copyvar VAR_0x8004, VAR_RESULT
-	compare VAR_0x8004, 0
-	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643
-	compare VAR_0x8004, 1
-	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, 4
-	closemessage
-	releaseall
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4, 4
-	closemessage
-	waitse
-	playmoncry SPECIES_KIRLIA, 0
-	waitmoncry
-	setvar VAR_0x8004, 11
-	special sub_81A703C
-	compare VAR_RESULT, 2
-	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751
-	compare VAR_RESULT, 1
-	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758
-	compare VAR_RESULT, 3
-	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F
-	compare VAR_RESULT, 4
-	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766
-	setvar VAR_0x8004, 15
-	special sub_81A703C
-	waitstate
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2
-	waitmovement 0
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_KIRLIA, 0
-	waitmoncry
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4
-	waitse
-	playmoncry SPECIES_KIRLIA, 0
-	waitmoncry
-	closemessage
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4
-	waitmovement 0
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF, 4
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DC01, 4
-	closemessage
-	waitse
-	playmoncry SPECIES_DUSCLOPS, 0
-	waitmoncry
-	setvar VAR_0x8004, 11
-	special sub_81A703C
-	compare VAR_RESULT, 0
-	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D
-	compare VAR_RESULT, 1
-	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774
-	setvar VAR_0x8004, 15
-	special sub_81A703C
-	waitstate
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2
-	waitmovement 0
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_DUSCLOPS, 0
-	waitmoncry
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4
-	waitse
-	playmoncry SPECIES_DUSCLOPS, 0
-	waitmoncry
-	closemessage
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4
-	waitmovement 0
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD06, 4
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751:: @ 825D751
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC20
-	waitmessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758:: @ 825D758
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC63
-	waitmessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F:: @ 825D75F
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC49
-	waitmessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766:: @ 825D766
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC33
-	waitmessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D:: @ 825D76D
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC97
-	waitmessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774:: @ 825D774
-	message BattleFrontier_BattlePikeRandomRoom1_Text_25DC7C
-	waitmessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B
-	closemessage
-	applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
-	waitmovement 0
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	special sub_8163AC4
-	waitstate
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D795: @ 825D795
-	walk_down
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D798: @ 825D798
-	walk_up
-	walk_up
-	walk_up
-	set_invisible
-	walk_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E: @ 825D79E
-	walk_up
-	set_invisible
-	walk_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2: @ 825D7A2
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4: @ 825D7A4
-	walk_down
-	face_left
-	delay_16
-	delay_16
-	face_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA: @ 825D7AA
-	walk_fast_down
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_left
-	face_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1: @ 825D7B1
-	face_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3: @ 825D7B3
-	walk_left
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4: @ 825D7B4
-	face_right
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6: @ 825D7B6
-	walk_down
-	walk_down
-	walk_right
-	face_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB: @ 825D7BB
-	face_left
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD: @ 825D7BD
-	face_right
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF: @ 825D7BF
-	face_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1: @ 825D7C1
-	walk_right
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3: @ 825D7C3
-	walk_left
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5: @ 825D7C5
-	walk_down
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8: @ 825D7C8
-	face_right
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA: @ 825D7CA
-	face_left
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC: @ 825D7CC
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_up
-	set_invisible
-	walk_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4: @ 825D7D4
-	walk_up
-	walk_up
-	walk_up
-	walk_left
-	walk_up
-	set_invisible
-	walk_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC: @ 825D7DC
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF: @ 825D7DF
-	walk_down
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2: @ 825D7E2
-	walk_up
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7: @ 825D7E7
-	set_visible
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA
-	walk_left
-	face_right
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED
-	setvar VAR_0x8004, 5
-	special sub_81A703C
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B
-	case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831
-	case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B
-	lock
-	faceplayer
-	setvar VAR_0x8004, 14
-	special sub_81A703C
-	msgbox 0x2021fc4, 4
-	waitmessage
-	closemessage
-	release
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3, 4
-	closemessage
-	release
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E
-	setvar VAR_0x8004, 13
-	special sub_81A703C
-	compare VAR_RESULT, 2
-	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881
-	compare VAR_RESULT, 1
-	call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, 4
-	closemessage
-	release
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E
-	waitmovement 0
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875:: @ 825D875
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA51, 4
-	closemessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881:: @ 825D881
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E32E, 4
-	closemessage
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D:: @ 825D88D
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6, 4
-	closemessage
-	release
-	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4
-	waitmovement 0
-	end
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4:: @ 825D8A4
-	setmetatile 4, 1, 554, 1
-	setmetatile 3, 2, 561, 1
-	setmetatile 4, 2, 562, 1
-	setmetatile 5, 2, 563, 1
-	setmetatile 3, 3, 569, 1
-	setmetatile 4, 3, 570, 0
-	setmetatile 5, 3, 571, 1
-	special DrawWholeMapView
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7:: @ 825D8E7
-	setmetatile 4, 1, 522, 1
-	setmetatile 3, 2, 529, 1
-	setmetatile 4, 2, 530, 1
-	setmetatile 5, 2, 531, 1
-	setmetatile 3, 3, 537, 1
-	setmetatile 4, 3, 538, 0
-	setmetatile 5, 3, 539, 1
-	special DrawWholeMapView
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D92A:: @ 825D92A
-	setmetatile 4, 1, 683, 1
-	setmetatile 3, 2, 690, 1
-	setmetatile 4, 2, 691, 1
-	setmetatile 5, 2, 692, 1
-	setmetatile 3, 3, 698, 1
-	setmetatile 4, 3, 699, 0
-	setmetatile 5, 3, 700, 1
-	special DrawWholeMapView
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D:: @ 825D96D
-	setmetatile 4, 1, 586, 1
-	setmetatile 3, 2, 593, 1
-	setmetatile 4, 2, 594, 1
-	setmetatile 5, 2, 595, 1
-	setmetatile 3, 3, 601, 1
-	setmetatile 4, 3, 602, 0
-	setmetatile 5, 3, 603, 1
-	special DrawWholeMapView
-	return
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0: @ 825D9B0
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B3: @ 825D9B3
-	walk_down
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6: @ 825D9B6
-	.string "Welcome…\n"
-	.string "You must be commended for your luck…\p"
-	.string "Your POKéMON shall be restored\n"
-	.string "to full health…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DA13: @ 825DA13
-	.string "I urge you to enjoy the rest of your\n"
-	.string "Battle Choice challenge…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DA51: @ 825DA51
-	.string "Ah, you’re a lucky one.\n"
-	.string "I’m in somewhat-good spirits now.\p"
-	.string "I will restore one of your POKéMON\n"
-	.string "to full health.$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DABE: @ 825DABE
-	.string "The best of luck to you.\n"
-	.string "Farewell.$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DAE1: @ 825DAE1
-	.string "Excuse me…\p"
-	.string "Would you care for a battle?\n"
-	.string "I’ll restore your POKéMON if you win.$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DB2F: @ 825DB2F
-	.string "Very well…\n"
-	.string "Now, shall we?$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DB49: @ 825DB49
-	.string "I see…\n"
-	.string "How unsporting of you…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DB67: @ 825DB67
-	.string "Magnificent…\p"
-	.string "As promised, I shall restore your\n"
-	.string "POKéMON to full health.$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DBAE: @ 825DBAE
-	.string "The best of luck to you.\n"
-	.string "Farewell.$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1: @ 825DBD1
-	.string "Oh, my!\p"
-	.string "Watch out!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4: @ 825DBE4
-	.string "Now, now!\n"
-	.string "KIRLIA, stop that!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DC01: @ 825DC01
-	.string "Now, now!\n"
-	.string "DUSCLOPS, stop that!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DC20: @ 825DC20
-	.string "KIRLIA used TOXIC!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DC33: @ 825DC33
-	.string "KIRLIA used HYPNOSIS!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DC49: @ 825DC49
-	.string "KIRLIA used THUNDER WAVE!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DC63: @ 825DC63
-	.string "KIRLIA used WILL-O-WISP!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DC7C: @ 825DC7C
-	.string "DUSCLOPS used WILL-O-WISP!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DC97: @ 825DC97
-	.string "DUSCLOPS used ICE BEAM!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF: @ 825DCAF
-	.string "Look here!\n"
-	.string "That’s quite enough!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF: @ 825DCCF
-	.string "I must apologize to you…\p"
-	.string "My KIRLIA has a TIMID nature…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DD06: @ 825DD06
-	.string "I must apologize to you…\p"
-	.string "My DUSCLOPS has a TIMID nature…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F: @ 825DD3F
-	.string "It attacks without warning if it is\n"
-	.string "startled by another person…\p"
-	.string "Are you and your POKéMON all right?$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3: @ 825DDA3
-	.string "I do apologize for what happened…\n"
-	.string "I do hope your POKéMON are fine.$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6: @ 825DDE6
-	.string "… … … … … …\n"
-	.string "… … … … … …$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE: @ 825DDFE
-	.string "Welcome…\p"
-	.string "Here, we will have you battle\n"
-	.string "a somewhat-tough TRAINER…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F: @ 825DE3F
-	.string "How wonderful…\p"
-	.string "To honor your victory, your POKéMON\n"
-	.string "shall be restored to full health…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DE94: @ 825DE94
-	.string "I urge you to enjoy the rest of your\n"
-	.string "Battle Choice challenge…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DED2: @ 825DED2
-	.string "I am LUCY…\n"
-	.string "I am the law here…\l"
-	.string "For I am the PIKE QUEEN…\p"
-	.string "You already know it, but to advance,\n"
-	.string "you must defeat me…\p"
-	.string "…I’m not one for idle chatter.\n"
-	.string "Hurry. Come on…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DF71: @ 825DF71
-	.string "Your luck…\n"
-	.string "I hope you didn’t use it all up here…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2: @ 825DFA2
-	.string "LUCY: … … … … … …\n"
-	.string "Show me your FRONTIER PASS…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0: @ 825DFD0
-	.string "The Luck Symbol was embossed on\n"
-	.string "the FRONTIER PASS!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E003: @ 825E003
-	.string "…That’s all there is…\n"
-	.string "Disappear already…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E02C: @ 825E02C
-	.string "LUCY: …You again…\p"
-	.string "… … … … … …\p"
-	.string "…I’ve trampled flowers and braved\n"
-	.string "storms to get to where I am…\p"
-	.string "I don’t feel any compulsion to keep\n"
-	.string "losing to the same opponent…\p"
-	.string "… … … … … …\n"
-	.string "Fine… I’ll do it…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8: @ 825E0E8
-	.string "Now!\n"
-	.string "Come on!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6: @ 825E0F6
-	.string "LUCY: … … … … … …\p"
-	.string "…FRONTIER PASS…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E118: @ 825E118
-	.string "The Luck Symbol took on\n"
-	.string "a golden shine!$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E140: @ 825E140
-	.string "…You, I won’t forget…\n"
-	.string "…Ever…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E15D: @ 825E15D
-	.string "I welcome you…\p"
-	.string "Giggle…\n"
-	.string "You seem to be bereft of luck…\p"
-	.string "If only you hadn’t chosen this room,\n"
-	.string "your POKéMON could have been healed…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD: @ 825E1DD
-	.string "I welcome you…\p"
-	.string "Since you have chosen this room, I will\n"
-	.string "restore one POKéMON to full health…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E238: @ 825E238
-	.string "I welcome you…\p"
-	.string "Since you have chosen this room, I will\n"
-	.string "restore two POKéMON to full health…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E293: @ 825E293
-	.string "I welcome you…\p"
-	.string "Giggle…\n"
-	.string "You should thank your lucky stars…\p"
-	.string "Since you have chosen this room,\n"
-	.string "all your POKéMON will be restored…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E311: @ 825E311
-	.string "I shall go fetch our master…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25E32E: @ 825E32E
-	.string "Ah, you’re a lucky one!\n"
-	.string "I’m in good spirits now.\p"
-	.string "I will restore two of your POKéMON\n"
-	.string "to full health!$"
-
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc
deleted file mode 100644
index 39045c317..000000000
--- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392
-	map_script 2, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D
-	map_script 4, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE
-	.byte 0
-
-BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7
-	.2byte 0
-
-BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7
-	delay 16
-	applymovement 1, BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB
-	waitmovement 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special sub_81A1780
-	lockall
-	msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4
-	closemessage
-	releaseall
-	warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
-	waitstate
-	end
-
-BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB: @ 825E3DB
-	walk_down
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE
-	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8
-	.2byte 0
-
-BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8
-	setvar VAR_TEMP_4, 1
-	turnobject 255, 2
-	end
-
-BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2
-	.string "Congratulations…\n"
-	.string "Now, this way, please…$"
-
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc
deleted file mode 100644
index d93913df2..000000000
--- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom3_MapScripts:: @ 825E41A
-	map_script 5, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A
-	map_script 2, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A
-	map_script 4, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466
-	.byte 0
-
-BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C
-	map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A
-	.2byte 0
-
-BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C
-	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, 6
-	special sub_81A703C
-	end
-
-BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special sub_81A1780
-	warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
-	waitstate
-	end
-
-BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466
-	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470
-	.2byte 0
-
-BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470
-	setvar VAR_TEMP_4, 1
-	turnobject 255, 2
-	end
-
-BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A
-	call BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 5
-	special sub_81A1780
-	compare VAR_RESULT, 2
-	goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3
-	compare VAR_RESULT, 3
-	goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3
-	end
-
-BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3:: @ 825E4A3
-	setvar VAR_TEMP_1, 1
-	end
-
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc
deleted file mode 100644
index 6bef7ba12..000000000
--- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc
+++ /dev/null
@@ -1,393 +0,0 @@
-BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843
-	map_script 5, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E
-	map_script 2, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853
-	map_script 4, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D
-	.byte 0
-
-BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A
-	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4
-	map_script_2 VAR_TEMP_5, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78
-	map_script_2 VAR_TEMP_5, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97
-	.2byte 0
-
-BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D
-	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887
-	.2byte 0
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887
-	setvar VAR_TEMP_4, 1
-	turnobject 255, 2
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891
-	setvar VAR_0x8004, 0
-	special sub_81A1780
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A:: @ 825C89A
-	warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
-	waitstate
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
-	lockall
-	message BattleFrontier_BattlePikeThreePathRoom_Text_25CD75
-	waitmessage
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 1
-	special sub_81A703C
-	playse SE_SAVE
-	waitse
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, 4
-	closemessage
-	releaseall
-	setvar VAR_0x8004, 5
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 99
-	special sub_81A1780
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968
-	case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978
-	case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988
-	case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998
-	case 9, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8
-	case 11, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8
-	case 13, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968:: @ 825C968
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD, 4
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978:: @ 825C978
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC00, 4
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988:: @ 825C988
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC23, 4
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998:: @ 825C998
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC46, 4
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8:: @ 825C9A8
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC69, 4
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8:: @ 825C9B8
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C, 4
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8:: @ 825C9C8
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0, 4
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A
-	case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A
-	release
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
-	setvar VAR_0x8004, 6
-	special sub_81A1780
-	message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08
-	waitmessage
-	special LoadPlayerParty
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 2
-	special sub_81A703C
-	playse SE_SAVE
-	waitse
-	fadescreen 1
-	setvar VAR_0x8004, 4
-	special sub_81A1780
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB, 5
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD
-	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A
-	case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A
-	release
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A
-	message BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222
-	release
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78
-	setvar VAR_0x8004, 17
-	special sub_81A703C
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91
-	setvar VAR_TEMP_5, 255
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91:: @ 825CA91
-	setvar VAR_TEMP_5, 1
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97
-	applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE
-	waitmovement 0
-	lockall
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D094, 4
-	releaseall
-	applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5
-	waitmovement 0
-	setvar VAR_TEMP_5, 255
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB
-	setvar VAR_0x8004, 19
-	special sub_81A703C
-	compare VAR_RESULT, 4
-	goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, 5
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A
-	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00
-	case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00
-	release
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB, 4
-	release
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A
-	setvar VAR_0x8004, 18
-	special sub_81A703C
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39
-	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46
-	case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39:: @ 825CB39
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF64, 4
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46:: @ 825CB46
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF23, 4
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3, 4
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60
-	setvar VAR_0x8004, 19
-	special sub_81A703C
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A
-	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4
-	case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE
-	case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A:: @ 825CB9A
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D054, 4
-	release
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4:: @ 825CBA4
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D017, 4
-	release
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE:: @ 825CBAE
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3, 4
-	release
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8:: @ 825CBB8
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5, 4
-	release
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2:: @ 825CBC2
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D125, 4
-	release
-	end
-
-BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE: @ 825CBCE
-	walk_left
-	walk_left
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	step_end
-
-BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5: @ 825CBD5
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_right
-	face_down
-	step_end
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD: @ 825CBDD
-	.string "You are currently in\n"
-	.string "the 1st room…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CC00: @ 825CC00
-	.string "You are currently in\n"
-	.string "the 3rd room…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CC23: @ 825CC23
-	.string "You are currently in\n"
-	.string "the 5th room…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CC46: @ 825CC46
-	.string "You are currently in\n"
-	.string "the 7th room…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CC69: @ 825CC69
-	.string "You are currently in\n"
-	.string "the 9th room…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C: @ 825CC8C
-	.string "You are currently in\n"
-	.string "the 11th room…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0: @ 825CCB0
-	.string "You are currently in\n"
-	.string "the 13th room…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4: @ 825CCD4
-	.string "Will you continue with\n"
-	.string "your challenge?$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB: @ 825CCFB
-	.string "Would you like to save your challenge\n"
-	.string "and quit the game for now?$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C: @ 825CD3C
-	.string "Do you wish to retire from your\n"
-	.string "Battle Choice challenge?$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CD75: @ 825CD75
-	.string "We’ve been awaiting your return…\p"
-	.string "Before resuming your Battle Choice\n"
-	.string "challenge, let me save the game…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA: @ 825CDDA
-	.string "Please do enjoy your Battle Choice\n"
-	.string "challenge…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CE08: @ 825CE08
-	.string "I am saving your data…\n"
-	.string "A little time, please…$"
-
-BattleFrontier_BattlePikeRandomRoom1_Text_25CE36: @ 825CE36
-BattleFrontier_BattlePikeRandomRoom3_Text_25CE36: @ 825CE36
-BattleFrontier_BattlePikeThreePathRoom_Text_25CE36: @ 825CE36
-	.string "The path is blocked!\n"
-	.string "And there is no turning back…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CE69: @ 825CE69
-	.string "I beg your pardon, but…\p"
-	.string "Are you perhaps finding it difficult\n"
-	.string "to choose your path?$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB: @ 825CEBB
-	.string "I see…\n"
-	.string "I apologize for my impertinence…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3: @ 825CEE3
-	.string "Ah, let me see… There is something\n"
-	.string "about the path on the right…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CF23: @ 825CF23
-	.string "Ah, let me see… There is something\n"
-	.string "about the path in the center…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CF64: @ 825CF64
-	.string "Ah, let me see… There is something\n"
-	.string "about the path on the left…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3: @ 825CFA3
-	.string "It seems to have the distinct aroma\n"
-	.string "of POKéMON wafting around it…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5: @ 825CFE5
-	.string "Is it… A TRAINER?\n"
-	.string "I sense the presence of people…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25D017: @ 825D017
-	.string "I seem to have heard something…\n"
-	.string "It may have been whispering…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25D054: @ 825D054
-	.string "For some odd reason, I felt a wave\n"
-	.string "of nostalgia coming from it…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25D094: @ 825D094
-	.string "I am sorry to say…\p"
-	.string "A terrifying event, yes, a horrible one,\n"
-	.string "is about to befall you…\p"
-	.string "I urge you to pay the utmost care\n"
-	.string "and prepare for the worst…$"
-
-BattleFrontier_BattlePikeThreePathRoom_Text_25D125: @ 825D125
-	.string "From every path I sense a dreadful\n"
-	.string "presence…$"
diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
deleted file mode 100644
index 148ea97c1..000000000
--- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
+++ /dev/null
@@ -1,784 +0,0 @@
-BattleFrontier_BattlePyramidEmptySquare_MapScripts:: @ 8252A33
-	map_script 5, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2
-	map_script 2, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43
-	map_script 3, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA
-	.byte 0
-
-BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43
-	map_script_2 VAR_TEMP_D, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D
-	map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98
-	map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F
-	.2byte 0
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D
-	lockall
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 4
-	setvar VAR_0x8006, 1
-	setvar VAR_0x8007, 55
-	setvar VAR_RESULT, 0
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77
-	special sub_81A8E7C
-	delay 2
-	compare VAR_RESULT, 2
-	goto_if 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77
-	setvar VAR_TEMP_D, 0
-	releaseall
-	end
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F:: @ 8252A8F
-	special ShowMapNamePopup
-	setvar VAR_TEMP_F, 0
-	end
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98
-	playbgm MUS_PYRAMID, 0
-	setvar VAR_TEMP_E, 1
-	end
-
-BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
-	setvar VAR_0x8004, 15
-	special sub_81A8E7C
-	setvar VAR_0x8004, 0
-	special sub_81A1780
-	switch VAR_TEMP_0
-	case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
-	case 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66
-	case 2, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 5
-	special sub_81A1780
-	compare VAR_RESULT, 4
-	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
-	compare VAR_RESULT, 5
-	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
-	compare VAR_RESULT, 2
-	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
-	compare VAR_RESULT, 3
-	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
-	compare VAR_RESULT, 9
-	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 8
-	special sub_81A1780
-	setvar VAR_TEMP_D, 1
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39
-	setvar VAR_0x8004, 17
-	special sub_81A8E7C
-	end
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42
-BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	setvar VAR_0x8006, 255
-	special sub_81A8E7C
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66
-BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A8E7C
-	setvar VAR_0x8004, 14
-	special sub_81A8E7C
-	special HealPlayerParty
-	warpsilent BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
-	waitstate
-	end
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 1
-	special sub_81A8E7C
-	special SavePlayerParty
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_0x8004, 9
-	special sub_81A8E7C
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	setvar VAR_TEMP_F, 1
-	end
-
-BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA
-	call BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5
-	setvar VAR_TEMP_F, 1
-	end
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 32
-	setvar VAR_0x8006, 0
-	special sub_81A8E7C
-	return
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	compare VAR_RESULT, 7
-	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
-	setvar VAR_0x8004, 6
-	special sub_81A8E7C
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_RESULT, 0
-	warp BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
-	waitstate
-	end
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
-	warp BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17
-	waitstate
-	end
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F
-	trainerbattle 9, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
-	setvar VAR_0x8004, 10
-	special sub_81A8E7C
-	waitmessage
-	waitbuttonpress
-	closemessage
-	releaseall
-	end
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A
-	setvar VAR_0x8004, 7
-	special sub_81A8E7C
-	callstd 1
-	compare VAR_0x8007, 0
-	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87
-	setvar VAR_0x8004, 8
-	special sub_81A8E7C
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87:: @ 8252C87
-	end
-
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88
-	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252C8D: @ 8252C8D
-	.string "This is a sample message.$"
-
-gText_BattlePyramidConfirmRest:: @ 8252CA7
-	.string "Your BATTLE PYRAMID quest will be\n"
-	.string "saved so that you may quit for now.\l"
-	.string "Is that okay?$"
-
-gText_BattlePyramidConfirmRetire:: @ 8252CFB
-	.string "Are you sure you want to quit your\n"
-	.string "PYRAMID quest?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252D2D:: @ 8252D2D
-	.string "This floor’s exit is in\n"
-	.string "that direction: {UP_ARROW}$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252D57:: @ 8252D57
-	.string "This floor’s exit is in\n"
-	.string "that direction: {LEFT_ARROW}$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252D81:: @ 8252D81
-	.string "This floor’s exit is in\n"
-	.string "that direction: {RIGHT_ARROW}$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252DAB:: @ 8252DAB
-	.string "This floor’s exit is in\n"
-	.string "that direction: {DOWN_ARROW}$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252DD5:: @ 8252DD5
-	.string "The exit on this floor is in\n"
-	.string "the {UP_ARROW} direction.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252E03:: @ 8252E03
-	.string "The exit on this floor is in\n"
-	.string "the {LEFT_ARROW} direction.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252E31:: @ 8252E31
-	.string "The exit on this floor is in\n"
-	.string "the {RIGHT_ARROW} direction.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252E5F:: @ 8252E5F
-	.string "The exit on this floor is in\n"
-	.string "the {DOWN_ARROW} direction.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252E8D:: @ 8252E8D
-	.string "The exit is over\n"
-	.string "that {UP_ARROW} way.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252EAA:: @ 8252EAA
-	.string "The exit is over\n"
-	.string "that {LEFT_ARROW} way.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252EC7:: @ 8252EC7
-	.string "The exit is over\n"
-	.string "that {RIGHT_ARROW} way.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252EE4:: @ 8252EE4
-	.string "The exit is over\n"
-	.string "that {DOWN_ARROW} way.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252F01:: @ 8252F01
-	.string "On this floor, the exit is somewhere\n"
-	.string "in the {UP_ARROW} direction.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252F3A:: @ 8252F3A
-	.string "On this floor, the exit is somewhere\n"
-	.string "in the {LEFT_ARROW} direction.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252F73:: @ 8252F73
-	.string "On this floor, the exit is somewhere\n"
-	.string "in the {RIGHT_ARROW} direction.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252FAC:: @ 8252FAC
-	.string "On this floor, the exit is somewhere\n"
-	.string "in the {DOWN_ARROW} direction.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_252FE5:: @ 8252FE5
-	.string "The exit?\n"
-	.string "It’s that {UP_ARROW} way.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253000:: @ 8253000
-	.string "The exit?\n"
-	.string "It’s that {LEFT_ARROW} way.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25301B:: @ 825301B
-	.string "The exit?\n"
-	.string "It’s that {RIGHT_ARROW} way.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253036:: @ 8253036
-	.string "The exit?\n"
-	.string "It’s that {DOWN_ARROW} way.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253051:: @ 8253051
-	.string "The exit happens to be in\n"
-	.string "the {UP_ARROW} direction.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25307C:: @ 825307C
-	.string "The exit happens to be in\n"
-	.string "the {LEFT_ARROW} direction.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2530A7:: @ 82530A7
-	.string "The exit happens to be in\n"
-	.string "the {RIGHT_ARROW} direction.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2530D2:: @ 82530D2
-	.string "The exit happens to be in\n"
-	.string "the {DOWN_ARROW} direction.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2530FD:: @ 82530FD
-	.string "Are you looking for items?\p"
-	.string "There are eight items left to\n"
-	.string "be found.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253140:: @ 8253140
-	.string "Are you looking for items?\p"
-	.string "There are seven items left to\n"
-	.string "be found.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253183:: @ 8253183
-	.string "Are you looking for items?\p"
-	.string "There are six items left to\n"
-	.string "be found.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2531C4:: @ 82531C4
-	.string "Are you looking for items?\p"
-	.string "There are five items left to\n"
-	.string "be found.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253206:: @ 8253206
-	.string "Are you looking for items?\p"
-	.string "There are four items left to\n"
-	.string "be found.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253248:: @ 8253248
-	.string "Are you looking for items?\p"
-	.string "There are three items left to\n"
-	.string "be found.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25328B:: @ 825328B
-	.string "Are you looking for items?\p"
-	.string "There are two items left to\n"
-	.string "be found.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2532CC:: @ 82532CC
-	.string "Are you looking for items?\p"
-	.string "There is one item left to\n"
-	.string "be found.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25330B:: @ 825330B
-	.string "Are you looking for items?\p"
-	.string "There isn’t anything left to\n"
-	.string "be found!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25334D:: @ 825334D
-	.string "Because you won, I’ll tell you\n"
-	.string "a little secret!\p"
-	.string "There are eight items\n"
-	.string "lying around here.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2533A6:: @ 82533A6
-	.string "Because you won, I’ll tell you\n"
-	.string "a little secret!\p"
-	.string "There are seven items left\n"
-	.string "lying around here.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253404:: @ 8253404
-	.string "Because you won, I’ll tell you\n"
-	.string "a little secret!\p"
-	.string "There are six items left\n"
-	.string "lying around here.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253460:: @ 8253460
-	.string "Because you won, I’ll tell you\n"
-	.string "a little secret!\p"
-	.string "There are five items left\n"
-	.string "lying around here.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2534BD:: @ 82534BD
-	.string "Because you won, I’ll tell you\n"
-	.string "a little secret!\p"
-	.string "There are four items left\n"
-	.string "lying around here.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25351A:: @ 825351A
-	.string "Because you won, I’ll tell you\n"
-	.string "a little secret!\p"
-	.string "There are three items left\n"
-	.string "lying around here.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253578:: @ 8253578
-	.string "Because you won, I’ll tell you\n"
-	.string "a little secret!\p"
-	.string "There are two items left\n"
-	.string "lying around here.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2535D4:: @ 82535D4
-	.string "Because you won, I’ll tell you\n"
-	.string "a little secret!\p"
-	.string "There is just one item\n"
-	.string "lying around here.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25362E:: @ 825362E
-	.string "Because you won, I’ll tell you\n"
-	.string "a little secret!\p"
-	.string "There isn’t anything left\n"
-	.string "lying around here.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25368B:: @ 825368B
-	.string "How’s your stock of items holding up?\p"
-	.string "I reckon there are eight items left\n"
-	.string "waiting to be found on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2536F8:: @ 82536F8
-	.string "How’s your stock of items holding up?\p"
-	.string "I reckon there are seven items left\n"
-	.string "waiting to be found on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253765:: @ 8253765
-	.string "How’s your stock of items holding up?\p"
-	.string "I reckon there are six items left\n"
-	.string "waiting to be found on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2537D0:: @ 82537D0
-	.string "How’s your stock of items holding up?\p"
-	.string "I reckon there are five items left\n"
-	.string "waiting to be found on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25383C:: @ 825383C
-	.string "How’s your stock of items holding up?\p"
-	.string "I reckon there are four items left\n"
-	.string "waiting to be found on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2538A8:: @ 82538A8
-	.string "How’s your stock of items holding up?\p"
-	.string "I reckon there are three items left\n"
-	.string "waiting to be found on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253915:: @ 8253915
-	.string "How’s your stock of items holding up?\p"
-	.string "I reckon there are two items left\n"
-	.string "waiting to be found on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253980:: @ 8253980
-	.string "How’s your stock of items holding up?\p"
-	.string "I reckon there’s but one item left\n"
-	.string "waiting to be found on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2539EC:: @ 82539EC
-	.string "How’s your stock of items holding up?\p"
-	.string "I reckon there are no more items\n"
-	.string "waiting to be found on this floor.\l"
-	.string "You take care now!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253A69:: @ 8253A69
-	.string "You’re strong, so you’ve earned\n"
-	.string "a hint!\p"
-	.string "There appear to be eight more\n"
-	.string "items on the ground.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253AC4:: @ 8253AC4
-	.string "You’re strong, so you’ve earned\n"
-	.string "a hint!\p"
-	.string "There appear to be seven more\n"
-	.string "items on the ground.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253B1F:: @ 8253B1F
-	.string "You’re strong, so you’ve earned\n"
-	.string "a hint!\p"
-	.string "There appear to be six more\n"
-	.string "items on the ground.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253B78:: @ 8253B78
-	.string "You’re strong, so you’ve earned\n"
-	.string "a hint!\p"
-	.string "There appear to be five more\n"
-	.string "items on the ground.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253BD2:: @ 8253BD2
-	.string "You’re strong, so you’ve earned\n"
-	.string "a hint!\p"
-	.string "There appear to be four more\n"
-	.string "items on the ground.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253C2C:: @ 8253C2C
-	.string "You’re strong, so you’ve earned\n"
-	.string "a hint!\p"
-	.string "There appear to be three more\n"
-	.string "items on the ground.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253C87:: @ 8253C87
-	.string "You’re strong, so you’ve earned\n"
-	.string "a hint!\p"
-	.string "There appear to be two more\n"
-	.string "items on the ground.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253CE0:: @ 8253CE0
-	.string "You’re strong, so you’ve earned\n"
-	.string "a hint!\p"
-	.string "There appears to be only one more\n"
-	.string "item on the ground.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253D3E:: @ 8253D3E
-	.string "You’re strong, so you’ve earned\n"
-	.string "a hint!\p"
-	.string "There appear to be no more\n"
-	.string "items on the ground.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253D96:: @ 8253D96
-	.string "On this floor of the PYRAMID,\n"
-	.string "I hear there are eight items…$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253DD2:: @ 8253DD2
-	.string "On this floor of the PYRAMID,\n"
-	.string "I hear there are seven items…$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253E0E:: @ 8253E0E
-	.string "On this floor of the PYRAMID,\n"
-	.string "I hear there are six items…$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253E48:: @ 8253E48
-	.string "On this floor of the PYRAMID,\n"
-	.string "I hear there are five items…$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253E83:: @ 8253E83
-	.string "On this floor of the PYRAMID,\n"
-	.string "I hear there are four items…$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253EBE:: @ 8253EBE
-	.string "On this floor of the PYRAMID,\n"
-	.string "I hear there are three items…$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253EFA:: @ 8253EFA
-	.string "On this floor of the PYRAMID,\n"
-	.string "I hear there are two items…$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253F34:: @ 8253F34
-	.string "On this floor of the PYRAMID,\n"
-	.string "I hear there is one item…$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253F6C:: @ 8253F6C
-	.string "On this floor of the PYRAMID,\n"
-	.string "I hear there are no items…$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253FA5:: @ 8253FA5
-	.string "Have you collected any items?\p"
-	.string "I believe there are eight more\n"
-	.string "items on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_253FF7:: @ 8253FF7
-	.string "Have you collected any items?\p"
-	.string "I believe there are seven more\n"
-	.string "items on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254049:: @ 8254049
-	.string "Have you collected any items?\p"
-	.string "I believe there are six more\n"
-	.string "items on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254099:: @ 8254099
-	.string "Have you collected any items?\p"
-	.string "I believe there are five more\n"
-	.string "items on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2540EA:: @ 82540EA
-	.string "Have you collected any items?\p"
-	.string "I believe there are four more\n"
-	.string "items on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25413B:: @ 825413B
-	.string "Have you collected any items?\p"
-	.string "I believe there are three more\n"
-	.string "items on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25418D:: @ 825418D
-	.string "Have you collected any items?\p"
-	.string "I believe there are two more\n"
-	.string "items on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2541DD:: @ 82541DD
-	.string "Have you collected any items?\p"
-	.string "I believe there is one more\n"
-	.string "item on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25422B:: @ 825422B
-	.string "Have you collected any items?\p"
-	.string "I believe there are no more\n"
-	.string "items on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25427A:: @ 825427A
-	.string "You were really awesome!\p"
-	.string "But there are still seven tough\n"
-	.string "TRAINERS other than me!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2542CB:: @ 82542CB
-	.string "You were really awesome!\p"
-	.string "But there are still six tough\n"
-	.string "TRAINERS other than me!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25431A:: @ 825431A
-	.string "You were really awesome!\p"
-	.string "But there are still five tough\n"
-	.string "TRAINERS other than me!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25436A:: @ 825436A
-	.string "You were really awesome!\p"
-	.string "But there are still four tough\n"
-	.string "TRAINERS other than me!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2543BA:: @ 82543BA
-	.string "You were really awesome!\p"
-	.string "But there are still three tough\n"
-	.string "TRAINERS other than me!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25440B:: @ 825440B
-	.string "You were really awesome!\p"
-	.string "But there are still two tough\n"
-	.string "TRAINERS other than me!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25445A:: @ 825445A
-	.string "You were really awesome!\p"
-	.string "But there’s still one tough\n"
-	.string "TRAINER other than me!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2544A6:: @ 82544A6
-	.string "You were really awesome!\p"
-	.string "There’s no one left that\n"
-	.string "can beat you!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2544E6:: @ 82544E6
-	.string "This is so upsetting!\p"
-	.string "But there are seven TRAINERS left!\n"
-	.string "Someone will humble you!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254538:: @ 8254538
-	.string "This is so upsetting!\p"
-	.string "But there are six TRAINERS left!\n"
-	.string "Someone will humble you!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254588:: @ 8254588
-	.string "This is so upsetting!\p"
-	.string "But there are five TRAINERS left!\n"
-	.string "Someone will humble you!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2545D9:: @ 82545D9
-	.string "This is so upsetting!\p"
-	.string "But there are four TRAINERS left!\n"
-	.string "Someone will humble you!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25462A:: @ 825462A
-	.string "This is so upsetting!\p"
-	.string "But there are three TRAINERS left!\n"
-	.string "Someone will humble you!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25467C:: @ 825467C
-	.string "This is so upsetting!\p"
-	.string "But there are two TRAINERS left!\n"
-	.string "Someone will humble you!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2546CC:: @ 82546CC
-	.string "This is so upsetting!\p"
-	.string "But there’s one TRAINER left!\n"
-	.string "I’m sure you will be humbled!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25471E:: @ 825471E
-	.string "This is so upsetting!\p"
-	.string "But there are no more TRAINERS\n"
-	.string "who can engage you!$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254767:: @ 8254767
-	.string "That’s pretty impressive!\p"
-	.string "But there are seven more TRAINERS\n"
-	.string "on this floor. Can you beat them all?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2547C9:: @ 82547C9
-	.string "That’s pretty impressive!\p"
-	.string "But there are six more TRAINERS\n"
-	.string "on this floor. Can you beat them all?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254829:: @ 8254829
-	.string "That’s pretty impressive!\p"
-	.string "But there are five more TRAINERS\n"
-	.string "on this floor. Can you beat them all?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25488A:: @ 825488A
-	.string "That’s pretty impressive!\p"
-	.string "But there are four more TRAINERS\n"
-	.string "on this floor. Can you beat them all?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2548EB:: @ 82548EB
-	.string "That’s pretty impressive!\p"
-	.string "But there are three more TRAINERS\n"
-	.string "on this floor. Can you beat them all?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25494D:: @ 825494D
-	.string "That’s pretty impressive!\p"
-	.string "But there are two more TRAINERS\n"
-	.string "on this floor. Can you beat them both?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_2549AE:: @ 82549AE
-	.string "That’s pretty impressive!\p"
-	.string "But there’s still one more TRAINER\n"
-	.string "on this floor. Can you prevail?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254A0B:: @ 8254A0B
-	.string "That’s pretty impressive!\p"
-	.string "You’ve gone through all the TRAINERS\n"
-	.string "on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254A59:: @ 8254A59
-	.string "Maybe you could sweep through\n"
-	.string "the seven TRAINERS left on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254A9E:: @ 8254A9E
-	.string "Maybe you could sweep through\n"
-	.string "the six TRAINERS left on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254AE1:: @ 8254AE1
-	.string "Maybe you could sweep through\n"
-	.string "the five TRAINERS left on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254B25:: @ 8254B25
-	.string "Maybe you could sweep through\n"
-	.string "the four TRAINERS left on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254B69:: @ 8254B69
-	.string "Maybe you could sweep through\n"
-	.string "the three TRAINERS left on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254BAE:: @ 8254BAE
-	.string "Maybe you could sweep through\n"
-	.string "the two TRAINERS left on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254BF1:: @ 8254BF1
-	.string "Maybe you could complete your sweep\n"
-	.string "with the one TRAINER left on this floor.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254C3E:: @ 8254C3E
-	.string "There isn’t a single person left who\n"
-	.string "can defeat you now…$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254C77:: @ 8254C77
-	.string "You may have what it takes to beat\n"
-	.string "the seven expert TRAINERS who remain.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254CC0:: @ 8254CC0
-	.string "You may have what it takes to beat\n"
-	.string "the six expert TRAINERS who remain.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254D07:: @ 8254D07
-	.string "You may have what it takes to beat\n"
-	.string "the five expert TRAINERS who remain.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254D4F:: @ 8254D4F
-	.string "You may have what it takes to beat\n"
-	.string "the four expert TRAINERS who remain.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254D97:: @ 8254D97
-	.string "You may have what it takes to beat\n"
-	.string "the three expert TRAINERS who remain.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254DE0:: @ 8254DE0
-	.string "You may have what it takes to beat\n"
-	.string "the two expert TRAINERS who remain.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254E27:: @ 8254E27
-	.string "You may have what it takes to beat\n"
-	.string "the one expert TRAINER who remains.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254E6E:: @ 8254E6E
-	.string "Your skills are beyond reproach.\p"
-	.string "There are no more TRAINERS here\n"
-	.string "who have any chance of beating you.$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254ED3:: @ 8254ED3
-	.string "Can you keep winning against\n"
-	.string "the seven remaining TRAINERS?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254F0E:: @ 8254F0E
-	.string "Can you keep winning against\n"
-	.string "the six remaining TRAINERS?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254F47:: @ 8254F47
-	.string "Can you keep winning against\n"
-	.string "the five remaining TRAINERS?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254F81:: @ 8254F81
-	.string "Can you keep winning against\n"
-	.string "the four remaining TRAINERS?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254FBB:: @ 8254FBB
-	.string "Can you keep winning against\n"
-	.string "the three remaining TRAINERS?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_254FF6:: @ 8254FF6
-	.string "Can you keep winning against\n"
-	.string "the two remaining TRAINERS?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_25502F:: @ 825502F
-	.string "Can you keep winning against\n"
-	.string "the last remaining TRAINER?$"
-
-BattleFrontier_BattlePyramidEmptySquare_Text_255068:: @ 8255068
-	.string "There aren’t any TRAINERS left that\n"
-	.string "can take you on now…$"
-
diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc
deleted file mode 100644
index e92c8d97f..000000000
--- a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc
+++ /dev/null
@@ -1,970 +0,0 @@
-BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716
-	map_script 2, BattleFrontier_BattlePyramidLobby_MapScript2_250735
-	map_script 4, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB
-	.byte 0
-
-BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidLobby_EventScript_25072B
-	.2byte 0
-
-BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePyramidLobby_EventScript_25075F
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePyramidLobby_EventScript_250768
-	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePyramidLobby_EventScript_2508AC
-	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattlePyramidLobby_EventScript_2507B1
-	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattlePyramidLobby_EventScript_250852
-	.2byte 0
-
-BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F
-	setvar VAR_0x8004, 0
-	special sub_81A1780
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
-	lockall
-	message BattleFrontier_BattlePyramidLobby_Text_2516D6
-	waitmessage
-	playse SE_EXPMAX
-	waitse
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_81A8E7C
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special sub_81A8E7C
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1
-	lockall
-	setvar VAR_0x8004, 10
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, 4
-	goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA
-
-BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, 4
-
-BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
-	special sub_81B95E0
-	compare VAR_RESULT, 1
-	call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB
-	clearflag FLAG_SPECIAL_FLAG_0x4004
-	setvar VAR_0x8004, 8
-	special sub_81A1780
-	special LoadPlayerParty
-	setvar VAR_0x8004, 14
-	special sub_81A8E7C
-	special HealPlayerParty
-	message BattleFrontier_BattlePyramidLobby_Text_2519F8
-	waitmessage
-	playse SE_EXPMAX
-	waitse
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252662, 4
-	setvar VAR_0x8004, 11
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9
-	message BattleFrontier_BattlePyramidLobby_Text_251A77
-	waitmessage
-	setvar VAR_0x8004, 4
-	special sub_81A8E7C
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_81A8E7C
-	playse SE_SAVE
-	waitse
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
-	setvar VAR_0x8004, 8
-	special sub_81A1780
-	special LoadPlayerParty
-	setvar VAR_0x8004, 14
-	special sub_81A8E7C
-	special HealPlayerParty
-	lockall
-	message BattleFrontier_BattlePyramidLobby_Text_251B5A
-	waitmessage
-	playse SE_EXPMAX
-	waitse
-	message BattleFrontier_BattlePyramidLobby_Text_251A77
-	waitmessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special sub_81A8E7C
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_81A8E7C
-	playse SE_SAVE
-	waitse
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_2508AC:: @ 82508AC
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250A21
-
-BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1
-	lock
-	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 6
-	setvar VAR_0x40CE, 0
-	special SavePlayerParty
-	msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, 4
-
-BattleFrontier_BattlePyramidLobby_EventScript_2508C8:: @ 82508C8
-	message BattleFrontier_BattlePyramidLobby_Text_250FA7
-	waitmessage
-	multichoice 17, 6, 23, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250904
-	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A68
-	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
-	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
-
-BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
-	message BattleFrontier_BattlePyramidLobby_Text_251248
-	waitmessage
-	multichoice 17, 6, 24, 0
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
-	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
-	setvar VAR_0x8004, 15
-	special sub_81A1780
-	compare VAR_0x8004, 1
-	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251297, 4
-	fadescreen 1
-	call BattleFrontier_BattlePyramidLobby_EventScript_23F2B7
-	copyvar VAR_0x8004, VAR_RESULT
-	setvar VAR_0x8005, 3
-	special sub_80F9490
-	waitstate
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250AC1
-	case 1, BattleFrontier_BattlePyramidLobby_EventScript_2509A5
-	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC1
-
-BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
-	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	special sub_81A1780
-	setvar VAR_0x8004, 0
-	special sub_81A8E7C
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special sub_81A8E7C
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_0x8004, 6
-	special sub_81A8E7C
-	setvar VAR_0x8004, 9
-	special sub_81A8E7C
-	special LoadPlayerParty
-	closemessage
-	delay 2
-	call BattleFrontier_BattlePyramidLobby_EventScript_27134F
-	setvar VAR_TEMP_0, 255
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA
-
-BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21
-	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251531, 4
-	closemessage
-	call BattleFrontier_BattlePyramidLobby_EventScript_250D56
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_RESULT, 0
-	special HealPlayerParty
-	warp BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
-	setvar VAR_TEMP_0, 0
-	waitstate
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250A68:: @ 8250A68
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25100C, 4
-	goto BattleFrontier_BattlePyramidLobby_EventScript_2508C8
-
-BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250A90
-	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A9D
-
-BattleFrontier_BattlePyramidLobby_EventScript_250A90:: @ 8250A90
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, 4
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC
-
-BattleFrontier_BattlePyramidLobby_EventScript_250A9D:: @ 8250A9D
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2512E2, 4
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC
-
-BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250AC4
-
-BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1
-	special LoadPlayerParty
-
-BattleFrontier_BattlePyramidLobby_EventScript_250AC4:: @ 8250AC4
-	msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, 4
-
-BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC
-	release
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE
-	lockall
-	applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E
-	waitmovement 0
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, 4
-	call BattleFrontier_BattlePyramidLobby_EventScript_250AF0
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252461, 4
-	releaseall
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250AF0:: @ 8250AF0
-	multichoice 17, 6, 24, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250B28
-	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250B66
-	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250B27
-	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250B27
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 5
-	special sub_81A8E7C
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B53
-	setvar VAR_RESULT, 0
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 3
-	special sub_81A8E7C
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 6
-	special sub_81A8E7C
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B91
-	setvar VAR_RESULT, 0
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 4
-	special sub_81A8E7C
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250BA4:: @ 8250BA4
-	copyvar VAR_0x8004, VAR_RESULT
-	special sub_813B968
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250C8E
-	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250C97
-	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250CA0
-	case 3, BattleFrontier_BattlePyramidLobby_EventScript_250CA9
-	case 4, BattleFrontier_BattlePyramidLobby_EventScript_250CB2
-	case 5, BattleFrontier_BattlePyramidLobby_EventScript_250CBB
-	case 6, BattleFrontier_BattlePyramidLobby_EventScript_250CC4
-	case 7, BattleFrontier_BattlePyramidLobby_EventScript_250CCD
-	case 8, BattleFrontier_BattlePyramidLobby_EventScript_250CD6
-	case 9, BattleFrontier_BattlePyramidLobby_EventScript_250CDF
-	case 10, BattleFrontier_BattlePyramidLobby_EventScript_250CE8
-	case 11, BattleFrontier_BattlePyramidLobby_EventScript_250CF1
-	case 12, BattleFrontier_BattlePyramidLobby_EventScript_250CFA
-	case 13, BattleFrontier_BattlePyramidLobby_EventScript_250D03
-	case 14, BattleFrontier_BattlePyramidLobby_EventScript_250D0C
-	case 15, BattleFrontier_BattlePyramidLobby_EventScript_250D15
-	case 16, BattleFrontier_BattlePyramidLobby_EventScript_250D1E
-	case 17, BattleFrontier_BattlePyramidLobby_EventScript_250D27
-	case 18, BattleFrontier_BattlePyramidLobby_EventScript_250D30
-	case 19, BattleFrontier_BattlePyramidLobby_EventScript_250D39
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250C8E:: @ 8250C8E
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251CB3, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250C97:: @ 8250C97
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251D07, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250CA0:: @ 8250CA0
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251D54, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250CA9:: @ 8250CA9
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251D9C, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250CB2:: @ 8250CB2
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251E3D, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250CBB:: @ 8250CBB
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251EA1, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250CC4:: @ 8250CC4
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251F17, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250CCD:: @ 8250CCD
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251F6E, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250CD6:: @ 8250CD6
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251FC7, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250CDF:: @ 8250CDF
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25201B, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250CE8:: @ 8250CE8
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252068, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250CF1:: @ 8250CF1
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2520BA, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250CFA:: @ 8250CFA
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252158, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250D03:: @ 8250D03
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2521B4, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250D0C:: @ 8250D0C
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252206, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250D15:: @ 8250D15
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25225A, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250D1E:: @ 8250D1E
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2522AE, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250D27:: @ 8250D27
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25230B, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250D30:: @ 8250D30
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252364, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250D39:: @ 8250D39
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252403, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42
-	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 6
-	special sub_81A1780
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56
-	applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4
-	applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DCD
-	waitmovement 0
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251569, 4
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_81A8E7C
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, 4
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C
-
-BattleFrontier_BattlePyramidLobby_EventScript_250D94:: @ 8250D94
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, 4
-
-BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C
-	message BattleFrontier_BattlePyramidLobby_Text_25161E
-	waitmessage
-	playse SE_EXPMAX
-	waitse
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251647, 4
-	closemessage
-	applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5
-	waitmovement 0
-	applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DD8
-	waitmovement 0
-	return
-
-BattleFrontier_BattlePyramidLobby_Movement_250DC4: @ 8250DC4
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	face_down
-	step_end
-
-BattleFrontier_BattlePyramidLobby_Movement_250DCD: @ 8250DCD
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattlePyramidLobby_Movement_250DD5: @ 8250DD5
-	walk_right
-	face_left
-	step_end
-
-BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, 4
-	setflag FLAG_SPECIAL_FLAG_0x4004
-	special sub_81C6A94
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00
-	message BattleFrontier_BattlePyramidLobby_Text_2518C6
-	waitmessage
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250E09
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250E00:: @ 8250E00
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251881, 4
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250E09:: @ 8250E09
-	multichoice 17, 6, 83, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250E40
-	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250E50
-	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250E60
-	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250E60
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250E40:: @ 8250E40
-	special sub_81C4F24
-	waitstate
-	message BattleFrontier_BattlePyramidLobby_Text_25197E
-	waitmessage
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250E09
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50
-	special sub_81B9620
-	waitstate
-	message BattleFrontier_BattlePyramidLobby_Text_25197E
-	waitmessage
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250E09
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60
-	special sub_81B95E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F
-	return
-
-BattleFrontier_BattlePyramidLobby_EventScript_250E6F:: @ 8250E6F
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25194F, 4
-	message BattleFrontier_BattlePyramidLobby_Text_25197E
-	waitmessage
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250E09
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250E83:: @ 8250E83
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2524DA, 2
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250E8C:: @ 8250E8C
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252595, 2
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250E95:: @ 8250E95
-	lockall
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2526B6, 4
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250EA4:: @ 8250EA4
-	message BattleFrontier_BattlePyramidLobby_Text_2526D9
-	waitmessage
-	multichoice 15, 2, 101, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250EF7
-	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250F05
-	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250F13
-	case 3, BattleFrontier_BattlePyramidLobby_EventScript_250F21
-	case 4, BattleFrontier_BattlePyramidLobby_EventScript_250F2F
-	case 127, BattleFrontier_BattlePyramidLobby_EventScript_250F2F
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250EF7:: @ 8250EF7
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2526FC, 4
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250F05:: @ 8250F05
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2527A9, 4
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250F13:: @ 8250F13
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25285A, 4
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250F21:: @ 8250F21
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252924, 4
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
-	end
-
-BattleFrontier_BattlePyramidLobby_EventScript_250F2F:: @ 8250F2F
-	releaseall
-	end
-
-BattleFrontier_BattlePyramidLobby_Text_250F31: @ 8250F31
-	.string "Where the courage of TRAINERS\n"
-	.string "is put to the test!\p"
-	.string "Welcome to the BATTLE PYRAMID!\p"
-	.string "I am your guide to\n"
-	.string "the Battle Quest.$"
-
-BattleFrontier_BattlePyramidLobby_Text_250FA7: @ 8250FA7
-	.string "Have you the courage to embark on\n"
-	.string "the Battle Quest challenge?$"
-
-BattleFrontier_BattlePyramidLobby_Text_250FE5: @ 8250FE5
-	.string "We await your challenge in the future!$"
-
-BattleFrontier_BattlePyramidLobby_Text_25100C: @ 825100C
-	.string "The Battle Quest is a battling\n"
-	.string "event in which you must explore\l"
-	.string "the PYRAMID and try to reach the top.\p"
-	.string "In the PYRAMID are seven floors of\n"
-	.string "mazes, all of them filled with not only\l"
-	.string "skilled TRAINERS but also wild POKéMON.\p"
-	.string "You must enter with three POKéMON,\n"
-	.string "none of them holding an item.\p"
-	.string "On your ascent, you will be provided\n"
-	.string "with a BATTLE BAG for items.\p"
-	.string "If you fail in your challenge, any item\n"
-	.string "placed in the BATTLE BAG disappears.\p"
-	.string "If you want to interrupt your\n"
-	.string "challenge, you must select “REST”\l"
-	.string "and save the game.\p"
-	.string "If you don’t save before interrupting,\n"
-	.string "you will be disqualified.$"
-
-BattleFrontier_BattlePyramidLobby_Text_251248: @ 8251248
-	.string "The PYRAMID offers two courses,\n"
-	.string "Level 50 and Open Level.\l"
-	.string "Which will you enter?$"
-
-BattleFrontier_BattlePyramidLobby_Text_251297: @ 8251297
-	.string "Very good. Now, please select the three\n"
-	.string "POKéMON you wish to accompany you.$"
-
-BattleFrontier_BattlePyramidLobby_Text_2512E2: @ 82512E2
-	.string "A slight problem, adventurer!\p"
-	.string "You seem to not have the three\n"
-	.string "POKéMON qualified for the challenge.\p"
-	.string "Please also remember to take all\n"
-	.string "items from your POKéMON.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "When you are ready, please have\n"
-	.string "a word with me.$"
-
-BattleFrontier_BattlePyramidLobby_Text_2513C1: @ 82513C1
-	.string "A slight problem, adventurer!\p"
-	.string "You seem to not have the three\n"
-	.string "POKéMON qualified for the challenge.\p"
-	.string "The three POKéMON must be different\n"
-	.string "and each no higher than Level 50.\p"
-	.string "Please also remember to take all\n"
-	.string "items from your POKéMON.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "When you are ready, please have\n"
-	.string "a word with me.$"
-
-BattleFrontier_BattlePyramidLobby_Text_2514E6: @ 82514E6
-	.string "Before you enter the BATTLE PYRAMID,\n"
-	.string "the game must be saved. Is that okay?$"
-
-BattleFrontier_BattlePyramidLobby_Text_251531: @ 8251531
-	.string "Very good. I will now show you into\n"
-	.string "the BATTLE PYRAMID.$"
-
-BattleFrontier_BattlePyramidLobby_Text_251569: @ 8251569
-	.string "We will hold your BAG for safekeeping,\n"
-	.string "{PLAYER}, while you are exploring.$"
-
-BattleFrontier_BattlePyramidLobby_Text_2515AD: @ 82515AD
-	.string "In exchange, please take this BATTLE\n"
-	.string "BAG, the one you used previously.$"
-
-BattleFrontier_BattlePyramidLobby_Text_2515F4: @ 82515F4
-	.string "In exchange, please take this\n"
-	.string "BATTLE BAG.$"
-
-BattleFrontier_BattlePyramidLobby_Text_25161E: @ 825161E
-	.string "{PLAYER} exchanged the BAG for\n"
-	.string "the BATTLE BAG.$"
-
-BattleFrontier_BattlePyramidLobby_Text_251647: @ 8251647
-	.string "When you step on this floor panel,\n"
-	.string "you will be transported to a higher\l"
-	.string "floor in the PYRAMID.\p"
-	.string "I hope for your sake that your\n"
-	.string "quest goes safely!$"
-
-BattleFrontier_BattlePyramidLobby_Text_2516D6: @ 82516D6
-	.string "A major problem, explorer!\p"
-	.string "You did not save before ending\n"
-	.string "your challenge the last time.\p"
-	.string "Consequently, your challenge has\n"
-	.string "been disqualified, I’m sorry to say.\p"
-	.string "Here is the BAG we’ve been holding\n"
-	.string "for you.\p"
-	.string "{PLAYER} got the BAG back.$"
-
-BattleFrontier_BattlePyramidLobby_Text_2517B5: @ 82517B5
-	.string "Excellent to see you back!\p"
-	.string "You’ve conquered the PYRAMID!\n"
-	.string "How splendid!$"
-
-BattleFrontier_BattlePyramidLobby_Text_2517FC: @ 82517FC
-	.string "Ah, a slight problem.\p"
-	.string "At least one POKéMON is holding\n"
-	.string "an item.\p"
-	.string "I’m sorry to say, items obtained in\n"
-	.string "the PYRAMID cannot be taken away.$"
-
-BattleFrontier_BattlePyramidLobby_Text_251881: @ 8251881
-	.string "All items held by your POKéMON will be\n"
-	.string "moved to your BATTLE BAG, {PLAYER}.$"
-
-BattleFrontier_BattlePyramidLobby_Text_2518C6: @ 82518C6
-	.string "The BATTLE BAG cannot hold all your\n"
-	.string "items, I’m sorry to say.\p"
-	.string "Please pick the items you’ll keep in the\n"
-	.string "BATTLE BAG, and with your POKéMON.$"
-
-BattleFrontier_BattlePyramidLobby_Text_25194F: @ 825194F
-	.string "At least one POKéMON is still\n"
-	.string "holding an item.$"
-
-BattleFrontier_BattlePyramidLobby_Text_25197E: @ 825197E
-	.string "Please pick the items you’ll keep in the\n"
-	.string "BATTLE BAG, and with your POKéMON.$"
-
-BattleFrontier_BattlePyramidLobby_Text_2519CA: @ 82519CA
-	.string "{PLAYER} returned everything that\n"
-	.string "the POKéMON held.$"
-
-BattleFrontier_BattlePyramidLobby_Text_2519F8: @ 82519F8
-	.string "The BATTLE BAG you used will be kept\n"
-	.string "in readiness for your next challenge.\p"
-	.string "{PLAYER} turned the BATTLE BAG over\n"
-	.string "for the BAG’s return.$"
-
-BattleFrontier_BattlePyramidLobby_Text_251A77: @ 8251A77
-	.string "I must record your results.\n"
-	.string "Please wait.$"
-
-BattleFrontier_BattlePyramidLobby_Text_251AA0: @ 8251AA0
-	.string "As a memento for conquering\n"
-	.string "the BATTLE PYRAMID, please take this.$"
-
-BattleFrontier_BattlePyramidLobby_Text_251AE2: @ 8251AE2
-	.string "{PLAYER} received the prize\n"
-	.string "{STR_VAR_1}.$"
-
-BattleFrontier_BattlePyramidLobby_Text_251AFC: @ 8251AFC
-	.string "…Ah…\n"
-	.string "Your BAG appears to be filled.\p"
-	.string "Please return after you’ve organized\n"
-	.string "your BAG’s contents.$"
-
-BattleFrontier_BattlePyramidLobby_Text_251B5A: @ 8251B5A
-	.string "How disappointing for you…\p"
-	.string "Here is the BAG we’ve been holding\n"
-	.string "for you.\p"
-	.string "{PLAYER} got the BAG back.$"
-
-BattleFrontier_BattlePyramidLobby_Text_251BB6: @ 8251BB6
-	.string "We look forward to your\n"
-	.string "next challenge!$"
-
-BattleFrontier_BattlePyramidLobby_Text_251BDE: @ 8251BDE
-	.string "We have been looking forward to\n"
-	.string "your arrival!\p"
-	.string "Here is your prize for conquering\n"
-	.string "the PYRAMID.$"
-
-BattleFrontier_BattlePyramidLobby_Text_251C3B: @ 8251C3B
-	.string "Welcome…\p"
-	.string "I shall be pleased to tell you what\n"
-	.string "misfortunes await in the PYRAMID…$"
-
-BattleFrontier_BattlePyramidLobby_Text_251C8A: @ 8251C8A
-	.string "… … … … … …\n"
-	.string "… … … … … …\p"
-	.string "… … … … … …\n"
-	.string "Aah!$"
-
-BattleFrontier_BattlePyramidLobby_Text_251CB3: @ 8251CB3
-	.string "I see a shower of sparks…\p"
-	.string "…And in it, I see your POKéMON\n"
-	.string "struggling with paralysis…$"
-
-BattleFrontier_BattlePyramidLobby_Text_251D07: @ 8251D07
-	.string "I see poison…\p"
-	.string "…And, I see your POKéMON suffering\n"
-	.string "from the effects of poison…$"
-
-BattleFrontier_BattlePyramidLobby_Text_251D54: @ 8251D54
-	.string "I see bright red flames…\p"
-	.string "…And, I see your POKéMON suffering\n"
-	.string "from burns…$"
-
-BattleFrontier_BattlePyramidLobby_Text_251D9C: @ 8251D9C
-	.string "I sense the tremendous pressure of\n"
-	.string "unrequited anger…\p"
-	.string "It is a curse…\p"
-	.string "…And, I see your POKéMON drained of\n"
-	.string "Power Points and having no recourse\l"
-	.string "but to use STRUGGLE…$"
-
-BattleFrontier_BattlePyramidLobby_Text_251E3D: @ 8251E3D
-	.string "I see POKéMON loftily airborne…\p"
-	.string "…And, I see your POKéMON frustrated\n"
-	.string "by powerless GROUND-type moves…$"
-
-BattleFrontier_BattlePyramidLobby_Text_251EA1: @ 8251EA1
-	.string "I sense terrific energy rising from\n"
-	.string "the ground below…\p"
-	.string "…And, I see your POKéMON unable to\n"
-	.string "escape the power’s clutches…$"
-
-BattleFrontier_BattlePyramidLobby_Text_251F17: @ 8251F17
-	.string "I see ICE-type POKéMON…\p"
-	.string "…And, I see your POKéMON fighting\n"
-	.string "the freezing effects of ice…$"
-
-BattleFrontier_BattlePyramidLobby_Text_251F6E: @ 8251F6E
-	.string "I see a flurry of moves that imperil\n"
-	.string "the user…\p"
-	.string "…And, I see your POKéMON falling\n"
-	.string "to them…$"
-
-BattleFrontier_BattlePyramidLobby_Text_251FC7: @ 8251FC7
-	.string "I see PSYCHIC-type POKéMON…\p"
-	.string "…And, I see your POKéMON in torment\n"
-	.string "from PSYCHIC moves…$"
-
-BattleFrontier_BattlePyramidLobby_Text_25201B: @ 825201B
-	.string "I see ROCK-type POKéMON…\p"
-	.string "…And, I see your POKéMON suffering\n"
-	.string "from ROCK moves…$"
-
-BattleFrontier_BattlePyramidLobby_Text_252068: @ 8252068
-	.string "I see FIGHTING-type POKéMON…\p"
-	.string "…And, I see your POKéMON pummeled\n"
-	.string "by FIGHTING moves…$"
-
-BattleFrontier_BattlePyramidLobby_Text_2520BA: @ 82520BA
-	.string "RAIN DANCE… SUNNY DAY…\n"
-	.string "SANDSTORM… HAIL…\p"
-	.string "I see POKéMON that become stronger\n"
-	.string "with the weather…\p"
-	.string "…And, I see your POKéMON confounded\n"
-	.string "by different types of moves…$"
-
-BattleFrontier_BattlePyramidLobby_Text_252158: @ 8252158
-	.string "I see BUG-type POKéMON…\p"
-	.string "…And, I see your POKéMON suffering\n"
-	.string "from different kinds of attacks…$"
-
-BattleFrontier_BattlePyramidLobby_Text_2521B4: @ 82521B4
-	.string "I see DARK-type POKéMON…\p"
-	.string "…And, I see your POKéMON suffering\n"
-	.string "from DARK-type moves…$"
-
-BattleFrontier_BattlePyramidLobby_Text_252206: @ 8252206
-	.string "I see WATER-type POKéMON…\p"
-	.string "…And, I see your POKéMON suffering\n"
-	.string "from WATER-type moves…$"
-
-BattleFrontier_BattlePyramidLobby_Text_25225A: @ 825225A
-	.string "I see GHOST-type POKéMON…\p"
-	.string "…And, I see your POKéMON suffering\n"
-	.string "from GHOST-type moves…$"
-
-BattleFrontier_BattlePyramidLobby_Text_2522AE: @ 82522AE
-	.string "I see STEEL-type POKéMON…\p"
-	.string "…And, I see your POKéMON suffering\n"
-	.string "from enormously powerful moves…$"
-
-BattleFrontier_BattlePyramidLobby_Text_25230B: @ 825230B
-	.string "I see flying POKéMON…\p"
-	.string "…And, I see your POKéMON suffering\n"
-	.string "from enormously powerful moves…$"
-
-BattleFrontier_BattlePyramidLobby_Text_252364: @ 8252364
-	.string "I see those that have evolved from\n"
-	.string "the power of stones…\p"
-	.string "I also sense fire, water,\n"
-	.string "and electricity…\p"
-	.string "…And, I see your POKéMON suffering\n"
-	.string "from those three powers…$"
-
-BattleFrontier_BattlePyramidLobby_Text_252403: @ 8252403
-	.string "I see NORMAL-type POKéMON…\p"
-	.string "…And, I see your POKéMON suffering\n"
-	.string "from enormously powerful moves…$"
-
-BattleFrontier_BattlePyramidLobby_Text_252461: @ 8252461
-	.string "Whether you believe my fortunes\n"
-	.string "or not, the choice is yours…\p"
-	.string "The future can be changed anytime…\n"
-	.string "I wish you safe passage…$"
-
-BattleFrontier_BattlePyramidLobby_Text_2524DA: @ 82524DA
-	.string "Did you know?\p"
-	.string "If you run fast, TRAINERS may notice\n"
-	.string "and come after you for a battle.\p"
-	.string "So, if you want to avoid TRAINERS,\n"
-	.string "don’t catch their eyes, but sneak\l"
-	.string "cautiously and quietly past them.$"
-
-BattleFrontier_BattlePyramidLobby_Text_252595: @ 8252595
-	.string "Awaaaaaaarrrrgh!\p"
-	.string "I had a whole lot of items, but I lost\n"
-	.string "them all when I lost!\p"
-	.string "Awaaaaaaarrrrgh!$"
-
-BattleFrontier_BattlePyramidLobby_Text_2525F4: @ 82525F4
-	.string "Welcome back!\n"
-	.string "You’ve done the unthinkable!\p"
-	.string "You’ve defeated the PYRAMID KING\n"
-	.string "and conquered the BATTLE PYRAMID!$"
-
-BattleFrontier_BattlePyramidLobby_Text_252662: @ 8252662
-	.string "Young explorer!\n"
-	.string "In commendation of your courage,\l"
-	.string "we give you these Battle Point(s)!$"
-
-BattleFrontier_BattlePyramidLobby_Text_2526B6: @ 82526B6
-	.string "The Battle Quest rules are listed.$"
-
-BattleFrontier_BattlePyramidLobby_Text_2526D9: @ 82526D9
-	.string "Which heading do you want to read?$"
-
-BattleFrontier_BattlePyramidLobby_Text_2526FC: @ 82526FC
-	.string "When the PYRAMID is conquered,\n"
-	.string "the wild POKéMON that appear in it\l"
-	.string "are replaced by different kinds.\p"
-	.string "Explore, observe, and learn what kinds\n"
-	.string "of wild POKéMON you may encounter.$"
-
-BattleFrontier_BattlePyramidLobby_Text_2527A9: @ 82527A9
-	.string "TRAINERS are lying in wait for you\n"
-	.string "inside the PYRAMID.\p"
-	.string "On each floor, there are up to\n"
-	.string "eight TRAINERS.\p"
-	.string "When you defeat a TRAINER, you will\n"
-	.string "get a helpful hint for your adventure.$"
-
-BattleFrontier_BattlePyramidLobby_Text_25285A: @ 825285A
-	.string "The mazes in the PYRAMID rearrange\n"
-	.string "themselves every time you enter it.\p"
-	.string "The mazes are poorly lit.\n"
-	.string "You must advance with caution.\p"
-	.string "The light grows brighter whenever you\n"
-	.string "defeat a wild POKéMON or a TRAINER.$"
-
-BattleFrontier_BattlePyramidLobby_Text_252924: @ 8252924
-	.string "The BATTLE BAG serves as your BAG\n"
-	.string "while in the PYRAMID.\p"
-	.string "There are two separate BATTLE BAGS--\n"
-	.string "one each for the Level 50 and\l"
-	.string "Open Level adventures.\p"
-	.string "They each can hold up to 99 pieces\n"
-	.string "of ten kinds of items.\p"
-	.string "The contents of the BATTLE BAG are\n"
-	.string "lost if you fail in your quest.$"
-
diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
deleted file mode 100644
index 9d83ab4e0..000000000
--- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
+++ /dev/null
@@ -1,379 +0,0 @@
-BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
-	map_script 5, BattleFrontier_BattlePyramidTop_MapScript1_2550F4
-	map_script 2, BattleFrontier_BattlePyramidTop_MapScript2_25516E
-	map_script 3, BattleFrontier_BattlePyramidTop_MapScript1_2550B6
-	map_script 4, BattleFrontier_BattlePyramidTop_MapScript2_2550CE
-	.byte 0
-
-BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 200
-	setvar VAR_0x8006, 0
-	special sub_81A8E7C
-	setvar VAR_TEMP_F, 1
-	end
-
-BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidTop_EventScript_2550D8
-	.2byte 0
-
-BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	compare VAR_TEMP_C, 0
-	goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2550F3
-	setobjectxyperm 2, 0, 0
-
-BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3
-	end
-
-BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4
-	setvar VAR_0x8004, 9
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattlePyramidTop_EventScript_25510C
-	call BattleFrontier_BattlePyramidTop_EventScript_242170
-
-BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C
-	copyvar VAR_TEMP_C, VAR_RESULT
-	setvar VAR_0x8004, 0
-	special sub_81A1780
-	switch VAR_TEMP_0
-	case 0, BattleFrontier_BattlePyramidTop_EventScript_255193
-	case 1, BattleFrontier_BattlePyramidTop_EventScript_252B66
-	case 2, BattleFrontier_BattlePyramidTop_EventScript_255193
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 5
-	special sub_81A1780
-	compare VAR_RESULT, 2
-	goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
-	compare VAR_RESULT, 3
-	goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
-	compare VAR_RESULT, 9
-	goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
-	end
-
-BattleFrontier_BattlePyramidTop_MapScript2_25516E: @ 825516E
-	map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidTop_EventScript_255180
-	map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidTop_EventScript_25518A
-	.2byte 0
-
-BattleFrontier_BattlePyramidTop_EventScript_255180:: @ 8255180
-	playbgm MUS_PYRAMID_TOP, 0
-	setvar VAR_TEMP_E, 1
-	end
-
-BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A
-	special ShowMapNamePopup
-	setvar VAR_TEMP_F, 0
-	end
-
-BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 1
-	special sub_81A8E7C
-	special SavePlayerParty
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_0x8004, 9
-	special sub_81A8E7C
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	setvar VAR_TEMP_F, 1
-	end
-
-BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0
-	lock
-	faceplayer
-	compare VAR_TEMP_D, 0
-	goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255236
-	compare VAR_TEMP_C, 0
-	goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255240
-	msgbox BattleFrontier_BattlePyramidTop_Text_255410, 4
-	closemessage
-	applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD
-	waitmovement 0
-	applymovement 255, BattleFrontier_BattlePyramidTop_Movement_255403
-	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePyramidTop_Movement_255400
-	waitmovement 0
-	message BattleFrontier_BattlePyramidTop_Text_2554E8
-	waitmessage
-	playfanfare MUS_ME_POINTGET
-	waitfanfare
-	closemessage
-
-BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special sub_81A1780
-	warp BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
-	waitstate
-	end
-
-BattleFrontier_BattlePyramidTop_EventScript_255236:: @ 8255236
-	msgbox BattleFrontier_BattlePyramidTop_Text_255BFE, 4
-	closemessage
-	end
-
-BattleFrontier_BattlePyramidTop_EventScript_255240:: @ 8255240
-	msgbox BattleFrontier_BattlePyramidTop_Text_25551F, 4
-	applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD
-	setvar VAR_TEMP_D, 1
-	closemessage
-	end
-
-BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256
-	lockall
-	switch VAR_TEMP_C
-	case 2, BattleFrontier_BattlePyramidTop_EventScript_255335
-	case 3, BattleFrontier_BattlePyramidTop_EventScript_2552D0
-	case 4, BattleFrontier_BattlePyramidTop_EventScript_255388
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0
-	special SpawnScriptEventObject
-	applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C
-	waitmovement 0
-	msgbox BattleFrontier_BattlePyramidTop_Text_255669, 4
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
-	waitmovement 0
-	msgbox BattleFrontier_BattlePyramidTop_Text_25573E, 4
-	goto BattleFrontier_BattlePyramidTop_EventScript_2552DA
-	end
-
-BattleFrontier_BattlePyramidTop_EventScript_2552D0:: @ 82552D0
-	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
-	waitmovement 0
-
-BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA
-	msgbox BattleFrontier_BattlePyramidTop_Text_255846, 4
-	call BattleFrontier_BattlePyramidTop_EventScript_2553ED
-	playbgm MUS_PYRAMID_TOP, 0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB
-	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
-
-BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB
-	setvar VAR_0x8004, 12
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A
-	msgbox BattleFrontier_BattlePyramidTop_Text_255873, 4
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattlePyramidTop_Text_2558E9
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, 13
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePyramidTop_Text_25591D, 4
-	goto BattleFrontier_BattlePyramidTop_EventScript_25521A
-
-BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388
-	special SpawnScriptEventObject
-	applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C
-	waitmovement 0
-	msgbox BattleFrontier_BattlePyramidTop_Text_255951, 4
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
-	waitmovement 0
-	msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, 4
-	goto BattleFrontier_BattlePyramidTop_EventScript_255392
-	end
-
-BattleFrontier_BattlePyramidTop_EventScript_255388:: @ 8255388
-	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
-	waitmovement 0
-
-BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392
-	msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, 4
-	call BattleFrontier_BattlePyramidTop_EventScript_2553ED
-	playbgm MUS_PYRAMID_TOP, 0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3
-	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
-
-BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
-	setvar VAR_0x8004, 12
-	special sub_81A1780
-	compare VAR_RESULT, 2
-	goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A
-	msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, 4
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattlePyramidTop_Text_255B59
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, 13
-	special sub_81A1780
-	msgbox BattleFrontier_BattlePyramidTop_Text_255B82, 4
-	goto BattleFrontier_BattlePyramidTop_EventScript_25521A
-
-BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED
-	closemessage
-	setvar VAR_0x8004, 10
-	setvar VAR_0x8005, 0
-	special sub_8163AC4
-	waitstate
-	return
-
-BattleFrontier_BattlePyramidTop_Movement_2553FD: @ 82553FD
-	walk_right
-	walk_in_place_fastest_left
-	step_end
-
-BattleFrontier_BattlePyramidTop_Movement_255400: @ 8255400
-	walk_left
-	walk_in_place_fastest_up
-	step_end
-
-BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_down
-	step_end
-
-BattleFrontier_BattlePyramidTop_Movement_25540A: @ 825540A
-	walk_fast_down
-	step_end
-
-BattleFrontier_BattlePyramidTop_Movement_25540C: @ 825540C
-	walk_slow_up
-	walk_slow_up
-	delay_16
-	step_end
-
-BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410
-	.string "It is a delight to see you here!\n"
-	.string "You have reached the summit of\l"
-	.string "the BATTLE PYRAMID!\p"
-	.string "Above here is the PYRAMID’s\n"
-	.string "lookout point.\p"
-	.string "It is a place open only to those\n"
-	.string "who have conquered the PYRAMID.\p"
-	.string "Now, please!\n"
-	.string "Up you go!$"
-
-BattleFrontier_BattlePyramidTop_Text_2554E8: @ 82554E8
-	.string "The PYRAMID’s new conqueror!\n"
-	.string "Let the name {PLAYER} be known!$"
-
-BattleFrontier_BattlePyramidTop_Text_25551F: @ 825551F
-	.string "It is a delight to see you here!\p"
-	.string "Unfortunately, you were second by\n"
-	.string "a mere fraction of time!\p"
-	.string "Our chief has already conquered\n"
-	.string "the PYRAMID ahead of you.\p"
-	.string "However, my young explorer…\n"
-	.string "You are a TRAINER!\p"
-	.string "Assert your power and take the glory\n"
-	.string "of the pinnacle from our chief!\p"
-	.string "Now, please! When you are ready,\n"
-	.string "take one more step of courage!$"
-
-BattleFrontier_BattlePyramidTop_Text_255669: @ 8255669
-	.string "Young adventurer…\p"
-	.string "Wouldn’t you agree that explorations\n"
-	.string "are the grandest of adventures?\p"
-	.string "Your own wits!\p"
-	.string "Your own strength!\p"
-	.string "Your own POKéMON!\p"
-	.string "And, above all, only your own courage\n"
-	.string "to lead you through unknown worlds…$"
-
-BattleFrontier_BattlePyramidTop_Text_25573E: @ 825573E
-	.string "Aah, yes, indeed this life is grand!\n"
-	.string "Grand, it is! Eh?\p"
-	.string "I’m BRANDON!\p"
-	.string "I’m the PYRAMID KING, which means\n"
-	.string "I’m in charge here.\p"
-	.string "Most people call me the chief!\p"
-	.string "You coming here means you have\n"
-	.string "that much confidence in yourself,\l"
-	.string "am I right?\p"
-	.string "Hahahah!\n"
-	.string "This should be exciting!$"
-
-BattleFrontier_BattlePyramidTop_Text_255846: @ 8255846
-	.string "Now, then!\n"
-	.string "Bring your courage to our battle!$"
-
-BattleFrontier_BattlePyramidTop_Text_255873: @ 8255873
-	.string "BRANDON: Hahahah! Grand it was!\n"
-	.string "Grand, yes, indeed!\p"
-	.string "Well done! You’ve earned recognition!\n"
-	.string "Your FRONTIER PASS, please!$"
-
-BattleFrontier_BattlePyramidTop_Text_2558E9: @ 82558E9
-	.string "The Brave Symbol was embossed on\n"
-	.string "the FRONTIER PASS!$"
-
-BattleFrontier_BattlePyramidTop_Text_25591D: @ 825591D
-	.string "Young explorer!\n"
-	.string "I look forward to our next meeting!$"
-
-BattleFrontier_BattlePyramidTop_Text_255951: @ 8255951
-	.string "BRANDON: …You’ve finally returned,\n"
-	.string "young explorer…\p"
-	.string "Your love of adventure seems to come\n"
-	.string "deep from within your heart…\p"
-	.string "Yes… You are exactly as I was in\n"
-	.string "my own youth…\p"
-	.string "… … …Ah…\p"
-	.string "The passionate!\p"
-	.string "The dangerous!\p"
-	.string "The desperate!\p"
-	.string "Those days of death-defying,\n"
-	.string "life-affirming adventures are back…$"
-
-BattleFrontier_BattlePyramidTop_Text_255A6D: @ 8255A6D
-	.string "Now, then!\p"
-	.string "I sense my own courage is off\n"
-	.string "the meter!$"
-
-BattleFrontier_BattlePyramidTop_Text_255AA1: @ 8255AA1
-	.string "Everything you have!\n"
-	.string "I’m braced for it all!$"
-
-BattleFrontier_BattlePyramidTop_Text_255ACD: @ 8255ACD
-	.string "BRANDON: Hahahah!\n"
-	.string "Remarkable!\l"
-	.string "Yes, it’s grand, indeed!\p"
-	.string "Young explorer!\p"
-	.string "You’ve bested me through and through!\n"
-	.string "Here! I want you to have this!$"
-
-BattleFrontier_BattlePyramidTop_Text_255B59: @ 8255B59
-	.string "The Brave Symbol took on\n"
-	.string "a golden shine!$"
-
-BattleFrontier_BattlePyramidTop_Text_255B82: @ 8255B82
-	.string "Ah, yes! It just goes to show that\n"
-	.string "I have much to learn still!\p"
-	.string "May our paths cross again!\n"
-	.string "Farewell for now, young explorer!$"
-
-BattleFrontier_BattlePyramidTop_Text_255BFE: @ 8255BFE
-	.string "Now, when you are ready, take courage\n"
-	.string "and step forward.$"
-
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc
deleted file mode 100644
index 087752d8f..000000000
--- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc
+++ /dev/null
@@ -1,651 +0,0 @@
-BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40
-	map_script 2, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62
-	map_script 4, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B
-	.byte 0
-
-BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B: @ 8241B4B
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B55
-	.2byte 0
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241B55:: @ 8241B55
-	setvar VAR_TEMP_1, 1
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_242198
-	end
-
-BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62: @ 8241B62
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C
-	.2byte 0
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
-	setvar VAR_TEMP_0, 1
-	applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242179
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
-	waitmovement 0
-	applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E
-	waitmovement 0
-	setvar VAR_TEMP_2, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
-	setvar VAR_0x8004, 3
-	special sub_8161F74
-	addobject 1
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242182
-	waitmovement 0
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	special sub_8161F74
-	msgbox 0x2021fc4, 4
-	waitmessage
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	special sub_8161F74
-	setvar VAR_0x8004, 3
-	special sub_813BF7C
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, 4
-	special sub_8161F74
-	switch VAR_RESULT
-	case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242188
-	waitmovement 0
-	removeobject 1
-	setvar VAR_0x8004, 9
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
-	waitmovement 0
-	applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E
-	waitmovement 0
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, 4
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F
-	setvar VAR_0x8004, 9
-	special sub_81A1780
-	copyvar VAR_TEMP_F, VAR_RESULT
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A
-	multichoice 19, 4, 103, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40
-	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
-	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
-	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A:: @ 8241D0A
-	multichoice 20, 6, 104, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
-	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
-	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241D40:: @ 8241D40
-	message BattleFrontier_BattleTowerBattleRoom_Text_2423A3
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
-	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241D72
-	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E22
-	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA
-	message BattleFrontier_BattleTowerBattleRoom_Text_24244C
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
-	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_24220E
-	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC
-	closemessage
-	applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242180
-	waitmovement 0
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192
-	waitmovement 0
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	special sub_8161F74
-	setvar VAR_0x8004, 3
-	special sub_813BF7C
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22
-	message BattleFrontier_BattleTowerBattleRoom_Text_242426
-	waitmessage
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 2
-	special sub_8161F74
-	playse SE_SAVE
-	waitse
-	fadescreen 1
-	setvar VAR_0x8004, 4
-	special sub_81A1780
-	end
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241E44:: @ 8241E44
-	copyvar VAR_TEMP_F, VAR_RESULT
-	switch VAR_TEMP_F
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E90
-	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241E97
-	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E
-	case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_241EA5
-	case 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EAC
-	case 6, BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241E90:: @ 8241E90
-	message BattleFrontier_BattleTowerBattleRoom_Text_242277
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241E97:: @ 8241E97
-	message BattleFrontier_BattleTowerBattleRoom_Text_2422A9
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E:: @ 8241E9E
-	message BattleFrontier_BattleTowerBattleRoom_Text_2422DB
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241EA5:: @ 8241EA5
-	message BattleFrontier_BattleTowerBattleRoom_Text_24230D
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241EAC:: @ 8241EAC
-	message BattleFrontier_BattleTowerBattleRoom_Text_24233F
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3:: @ 8241EB3
-	message BattleFrontier_BattleTowerBattleRoom_Text_242371
-	waitmessage
-	return
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_241EBA:: @ 8241EBA
-BattleFrontier_BattleDomeLobby_EventScript_241EBA:: @ 8241EBA
-BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA:: @ 8241EBA
-BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA:: @ 8241EBA
-BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA:: @ 8241EBA
-BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA
-	setvar VAR_0x8004, 17
-	special sub_81A1780
-	return
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_24219A
-	waitmovement 0
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6
-	waitmovement 0
-	playse SE_PIN
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_272598
-	waitmovement 0
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_27259A
-	waitmovement 0
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB
-	waitmovement 0
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A1
-	waitmovement 0
-	return
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A
-	compare VAR_TEMP_2, 1
-	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, 4
-	setvar VAR_TEMP_2, 1
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22
-	message BattleFrontier_BattleTowerBattleRoom_Text_242542
-	waitmessage
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79
-	multichoice 19, 4, 103, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40
-	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
-	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
-	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79
-	multichoice 20, 6, 104, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF
-	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C
-	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA
-	case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_242170
-	closemessage
-	applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242180
-	waitmovement 0
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192
-	waitmovement 0
-	addobject 1
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_2421B2
-	waitmovement 0
-	switch VAR_TEMP_F
-	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_242085
-	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_242029
-	case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, 4
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, 4
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, 12
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, 4
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattleTowerBattleRoom_Text_24270E
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, 13
-	special sub_81A1780
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, 4
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, 4
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, 4
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF
-	call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, 12
-	special sub_81A1780
-	compare VAR_RESULT, 2
-	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, 4
-	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattleTowerBattleRoom_Text_242932
-	waitmessage
-	waitfanfare
-	setvar VAR_0x8004, 13
-	special sub_81A1780
-	msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, 4
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E
-BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
-	closemessage
-	setvar VAR_TEMP_2, 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special HealPlayerParty
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 0
-	special sub_8163AC4
-	waitstate
-	copyvar VAR_0x8004, VAR_0x40CE
-	compare VAR_0x8004, 3
-	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A
-	setvar VAR_0x8004, 18
-	special sub_81A1780
-	special HealPlayerParty
-	setvar VAR_0x8004, 21
-	special sub_81A1780
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A
-	setvar VAR_0x8004, 15
-	special sub_8161F74
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 5
-	special sub_81A1780
-	return
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_242170:: @ 8242170
-BattleFrontier_BattleDomeBattleRoom_EventScript_242170:: @ 8242170
-BattleFrontier_BattleFactoryBattleRoom_EventScript_242170:: @ 8242170
-BattleFrontier_BattlePalaceBattleRoom_EventScript_242170:: @ 8242170
-BattleFrontier_BattlePyramidTop_EventScript_242170:: @ 8242170
-BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170
-	setvar VAR_0x8004, 22
-	special sub_81A1780
-	return
-
-BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179
-	walk_up
-	walk_up
-	walk_up
-	face_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_24217E: @ 824217E
-	face_down
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_242180: @ 8242180
-	face_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	face_left
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_242188: @ 8242188
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_24218D: @ 824218D
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	face_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_242198: @ 8242198
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A
-	set_visible
-	delay_16
-	walk_up
-	walk_left
-	walk_left
-	delay_8
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_2421A1: @ 82421A1
-	walk_right
-	walk_right
-	walk_down
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_2421A6: @ 82421A6
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB
-	face_right
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_in_place_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2
-	walk_slow_down
-	walk_slow_down
-	walk_slow_down
-	walk_slow_down
-	face_left
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8
-BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8
-	copyvar VAR_RESULT, VAR_0x40CE
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8
-	compare VAR_RESULT, 2
-	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2
-	compare VAR_RESULT, 3
-	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC
-	warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6
-	waitstate
-	end
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8:: @ 82421E8
-	warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6
-	waitstate
-	end
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2:: @ 82421F2
-	warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6
-	waitstate
-	end
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC:: @ 82421FC
-	setvar VAR_0x8004, 13
-	special sub_8161F74
-	warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6
-	waitstate
-	end
-
-BattleFrontier_BattleTowerBattleRoom_EventScript_24220E:: @ 824220E
-	setflag FLAG_0x077
-	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_Text_242217: @ 8242217
-BattleFrontier_BattleTowerBattleRoom_Text_242217: @ 8242217
-	.string "We will restore your POKéMON to\n"
-	.string "full health.$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_242244: @ 8242244
-	.string "You will be facing opponent no. {STR_VAR_1}.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_242277: @ 8242277
-	.string "You will be facing opponent no. 2.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_2422A9: @ 82422A9
-	.string "You will be facing opponent no. 3.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_2422DB: @ 82422DB
-	.string "You will be facing opponent no. 4.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_24230D: @ 824230D
-	.string "You will be facing opponent no. 5.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_24233F: @ 824233F
-	.string "You will be facing opponent no. 6.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_242371: @ 8242371
-	.string "You will be facing opponent no. 7.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_2423A3: @ 82423A3
-BattleFrontier_BattleTowerBattleRoom_Text_2423A3: @ 82423A3
-	.string "Record your battle on your\n"
-	.string "FRONTIER PASS?$"
-
-BattleFrontier_BattleTowerLobby_Text_2423CD: @ 82423CD
-	.string "{PLAYER}’s battle was recorded\n"
-	.string "on the FRONTIER PASS.$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_2423FC: @ 82423FC
-BattleFrontier_BattleTowerBattleRoom_Text_2423FC: @ 82423FC
-	.string "Would you like to save and\n"
-	.string "quit the game?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_242426: @ 8242426
-BattleFrontier_BattleTowerBattleRoom_Text_242426: @ 8242426
-	.string "Saving your battle data.\n"
-	.string "Please wait.$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24244C: @ 824244C
-BattleFrontier_BattleTowerBattleRoom_Text_24244C: @ 824244C
-	.string "Would you like to cancel your BATTLE\n"
-	.string "ROOM challenge?$"
-
-gText_BattleRecordCouldntBeSaved:: @ 8242481
-	.string "There was an error of some sort.\n"
-	.string "Your record could not be saved.$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_2424C2: @ 82424C2
-	.string "Excuse me, but…\p"
-	.string "Our leader, the SALON MAIDEN, is on\n"
-	.string "her way here in hopes of battling you.\p"
-	.string "She should be arriving very shortly.$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_242542: @ 8242542
-	.string "You will be facing the SALON MAIDEN.\n"
-	.string "Are you prepared?$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_242579: @ 8242579
-	.string "Greetings…\n"
-	.string "My name is ANABEL.\p"
-	.string "I am the SALON MAIDEN, and I am in\n"
-	.string "charge of running the BATTLE TOWER…\p"
-	.string "I have heard several rumors\n"
-	.string "about you…\p"
-	.string "In all honesty, what I have heard does\n"
-	.string "not seem attractive in any way…\p"
-	.string "The reason I’ve come to see you…\n"
-	.string "Well, there is but one reason…$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_24268C: @ 824268C
-	.string "Let me see your talent in\n"
-	.string "its entirety…$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_2426B4: @ 82426B4
-	.string "ANABEL: Fufufu, nicely done…\p"
-	.string "Your FRONTIER PASS, please…\n"
-	.string "Your talent shall be recognized.$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_24270E: @ 824270E
-	.string "The Ability Symbol was embossed on\n"
-	.string "the FRONTIER PASS!$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_242744: @ 8242744
-	.string "… … … … … …\p"
-	.string "You have confidence in your POKéMON\n"
-	.string "battling talent, don’t you?\p"
-	.string "I urge you to keep battling and\n"
-	.string "keep on winning.\p"
-	.string "I will be waiting for you.\n"
-	.string "Until the next time we meet…$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_2427F9: @ 82427F9
-	.string "ANABEL: You really did come back to\n"
-	.string "see me…\p"
-	.string "… … … … … …\p"
-	.string "You’ve won straight matches to see me…\n"
-	.string "I won’t have to hold back against you…\p"
-	.string "It’s been too long now…\p"
-	.string "Too long since I’ve been able to battle\n"
-	.string "without thinking about anything…$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_2428E0: @ 82428E0
-	.string "Let’s begin, shall we?$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_2428F7: @ 82428F7
-	.string "ANABEL: Fufu, congratulations…\n"
-	.string "Your FRONTIER PASS, please…$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_242932: @ 8242932
-	.string "The Ability Symbol took on\n"
-	.string "a golden shine!$"
-
-BattleFrontier_BattleTowerBattleRoom_Text_24295D: @ 824295D
-	.string "That was fun…\p"
-	.string "I have never had a POKéMON battle\n"
-	.string "so enjoyable before…\p"
-	.string "I wish I could battle with you again…$"
-
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc
deleted file mode 100644
index 81c2dd563..000000000
--- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc
+++ /dev/null
@@ -1,540 +0,0 @@
-BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8
-	map_script 3, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8
-	map_script 4, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33
-	map_script 2, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43
-	.byte 0
-
-BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8
-	compare VAR_0x40CE, 2
-	call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F
-	compare VAR_0x40CE, 3
-	call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
-	setvar VAR_0x8004, 14
-	special sub_8161F74
-	checkplayergender
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
-	setvar VAR_OBJ_GFX_ID_F, 0
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29
-	setvar VAR_OBJ_GFX_ID_F, 89
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F
-	special sub_813A76C
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D
-	.2byte 0
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D
-	hideobjectat 255, BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D
-	.2byte 0
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
-	setvar VAR_TEMP_0, 1
-	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518
-	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
-	waitmovement 0
-	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
-	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
-	waitmovement 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
-	setvar VAR_0x8004, 3
-	special sub_8161F74
-	addobject 1
-	addobject 4
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528
-	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E
-	waitmovement 0
-	compare VAR_0x40CE, 3
-	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	special sub_8161F74
-	delay 15
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
-	waitmovement 0
-	msgbox 0x2021fc4, 4
-	waitmessage
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 1
-	special sub_8161F74
-	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
-	waitmovement 0
-	msgbox 0x2021fc4, 4
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249026:: @ 8249026
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	special sub_8161F74
-	delay 15
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
-	waitmovement 0
-	messageautoscroll 0x2021fc4
-	waitmessage
-	delay 48
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 1
-	special sub_8161F74
-	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
-	waitmovement 0
-	messageautoscroll 0x2021fc4
-	waitmessage
-	delay 48
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	special sub_8161F74
-	setvar VAR_0x8004, 3
-	special sub_813BF7C
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA
-	setvar VAR_0x8004, 4
-	special sub_8161F74
-	switch VAR_RESULT
-	case 7, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF
-	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249534
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249539
-	waitmovement 0
-	removeobject 1
-	removeobject 4
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
-	waitmovement 0
-	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
-	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
-	waitmovement 0
-	compare VAR_0x40CE, 3
-	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118
-	msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, 4
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118
-	messageautoscroll BattleFrontier_BattleTowerBattleRoom2_Text_242217
-	waitmessage
-	delay 48
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
-	special LoadPlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	compare VAR_0x40CE, 3
-	call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD
-	compare VAR_0x40CE, 3
-	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1
-	multichoice 19, 4, 103, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
-	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1:: @ 82491B1
-	multichoice 20, 6, 104, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249219
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223
-	msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
-	closemessage
-	clearflag FLAG_0x002
-	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
-	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
-	waitmovement 0
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_249541
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_249541
-	waitmovement 0
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	special sub_8161F74
-	setvar VAR_0x8004, 3
-	special sub_813BF7C
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
-	message BattleFrontier_BattleTowerBattleRoom2_Text_242426
-	waitmessage
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 2
-	special sub_8161F74
-	playse SE_SAVE
-	waitse
-	fadescreen 1
-	setvar VAR_0x8004, 4
-	special sub_81A1780
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD
-	compare VAR_0x40CE, 3
-	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E
-	copyvar VAR_TEMP_F, VAR_RESULT
-	switch VAR_TEMP_F
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B
-	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249362
-	case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_249369
-	case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_249370
-	case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249377
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249354:: @ 8249354
-	message BattleFrontier_BattleTowerBattleRoom2_Text_249547
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B:: @ 824935B
-	message BattleFrontier_BattleTowerBattleRoom2_Text_249578
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249362:: @ 8249362
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249369:: @ 8249369
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249370:: @ 8249370
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24960B
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249377:: @ 8249377
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24963C
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E:: @ 824937E
-	copyvar VAR_TEMP_F, VAR_RESULT
-	switch VAR_TEMP_F
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6
-	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2
-	case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE
-	case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA
-	case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249406
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA:: @ 82493CA
-	message BattleFrontier_BattleTowerBattleRoom2_Text_249547
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6:: @ 82493D6
-	message BattleFrontier_BattleTowerBattleRoom2_Text_249578
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2:: @ 82493E2
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE:: @ 82493EE
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA:: @ 82493FA
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24960B
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249406:: @ 8249406
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24963C
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412
-	waitmessage
-	delay 48
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417
-	checkflag FLAG_0x002
-	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249457
-	multichoice 19, 6, 105, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249457:: @ 8249457
-	multichoice 20, 8, 106, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 0
-	message gText_LinkStandby3
-	waitmessage
-	special sub_813B568
-	waitstate
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4
-	setflag FLAG_0x002
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA:: @ 82494FA
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 0
-	message gText_LinkStandby3
-	waitmessage
-	special sub_813B568
-	waitstate
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249514:: @ 8249514
-	special sub_813B534
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249518: @ 8249518
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	face_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	face_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524
-	face_left
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526
-	walk_in_place_fastest_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	face_left
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E
-	walk_right
-	walk_down
-	walk_down
-	walk_down
-	face_left
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534
-	walk_up
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E
-	walk_right
-	walk_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541
-	walk_left
-	walk_left
-	walk_in_place_fastest_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545
-	walk_in_place_left
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Text_249547: @ 8249547
-	.string "The 2nd set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_249578: @ 8249578
-	.string "The 3rd set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_2495A9: @ 82495A9
-	.string "The 4th set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_2495DA: @ 82495DA
-	.string "The 5th set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24960B: @ 824960B
-	.string "The 6th set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24963C: @ 824963C
-	.string "The 7th set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24966D: @ 824966D
-	.string "The 2nd set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24969D: @ 824969D
-	.string "The 3rd set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_2496CD: @ 82496CD
-	.string "The 4th set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_2496FD: @ 82496FD
-	.string "The 5th set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24972D: @ 824972D
-	.string "The 6th set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24975D: @ 824975D
-	.string "The 7th set of opponents is next.\n"
-	.string "Do your best!$"
-
-gText_LinkStandby3:: @ 824978D
-	.string "Link standby…$"
-
-gText_YourPartnerHasRetired:: @ 824979B
-	.string "Your partner has retired.\p"
-	.string "Your BATTLE ROOM challenge\n"
-	.string "will be canceled.$"
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc
deleted file mode 100644
index ef1102175..000000000
--- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc
+++ /dev/null
@@ -1,59 +0,0 @@
-BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA
-	map_script 1, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5
-	map_script 2, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6
-	.byte 0
-
-BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5
-	compare VAR_0x8006, 1
-	goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3
-	setmetatile 12, 0, 519, 0
-	setmetatile 12, 1, 527, 0
-	end
-
-BattleFrontier_BattleTowerCorridor_EventScript_241AD3:: @ 8241AD3
-	setmetatile 15, 0, 519, 0
-	setmetatile 15, 1, 527, 0
-	end
-
-BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_241AF0
-	.2byte 0
-
-BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0
-	setvar VAR_TEMP_0, 1
-	compare VAR_0x8006, 1
-	goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16
-	applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A
-	applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B39
-	waitmovement 0
-	goto BattleFrontier_BattleTowerCorridor_EventScript_241B27
-
-BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16
-	applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B37
-	applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B36
-	waitmovement 0
-
-BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27
-	setvar VAR_TEMP_0, 0
-	warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
-	waitstate
-	end
-
-BattleFrontier_BattleTowerCorridor_Movement_241B36: @ 8241B36
-	walk_right
-
-BattleFrontier_BattleTowerCorridor_Movement_241B37: @ 8241B37
-	walk_right
-	walk_right
-
-BattleFrontier_BattleTowerCorridor_Movement_241B39: @ 8241B39
-	walk_right
-
-BattleFrontier_BattleTowerCorridor_Movement_241B3A: @ 8241B3A
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	set_invisible
-	step_end
-
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc
deleted file mode 100644
index 39157609e..000000000
--- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc
+++ /dev/null
@@ -1,172 +0,0 @@
-BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A
-	map_script 3, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A
-	map_script 4, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95
-	map_script 2, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2
-	.byte 0
-
-BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A
-	compare VAR_0x40CE, 2
-	call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D71
-	compare VAR_0x40CE, 3
-	call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D91
-	end
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71
-	setvar VAR_0x8004, 14
-	special sub_8161F74
-	checkplayergender
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B
-	setvar VAR_OBJ_GFX_ID_F, 0
-	return
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B
-	setvar VAR_OBJ_GFX_ID_F, 89
-	return
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91
-	special sub_813A76C
-	return
-
-BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248D9F
-	.2byte 0
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F
-	hideobjectat 255, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2
-	hideobjectat 1, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2
-	hideobjectat 4, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2
-	special sub_8139980
-	end
-
-BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2: @ 8248DB2
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248DBC
-	.2byte 0
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC
-	lockall
-	setflag FLAG_SPECIAL_FLAG_0x4002
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 1
-	opendoor 1, 1
-	waitdooranim
-	clearflag FLAG_SPECIAL_FLAG_0x4002
-	showobjectat 1, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2
-	showobjectat 4, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2
-	applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EE6
-	applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EE6
-	waitmovement 0
-	setflag FLAG_SPECIAL_FLAG_0x4002
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 1
-	closedoor 1, 1
-	waitdooranim
-	clearflag FLAG_SPECIAL_FLAG_0x4002
-	applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EBC
-	applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EC4
-	applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_248ECC
-	applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5
-	waitmovement 0
-	delay 40
-	applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_2725A6
-	applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_2725A6
-	waitmovement 0
-	opendoor 7, 1
-	waitdooranim
-	applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_248EE3
-	applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248EE3
-	applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EDE
-	applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EDE
-	waitmovement 0
-	closedoor 7, 1
-	waitdooranim
-	delay 30
-	setvar VAR_TEMP_1, 1
-	call BattleFrontier_BattleTowerCorridor2_EventScript_248E71
-	releaseall
-	end
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
-	compare VAR_0x40CE, 2
-	call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EA8
-	compare VAR_0x40CE, 3
-	call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EB2
-	return
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E
-	warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
-	waitstate
-	return
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248EA8:: @ 8248EA8
-	warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2, 255, 4, 5
-	waitstate
-	return
-
-BattleFrontier_BattleTowerCorridor2_EventScript_248EB2:: @ 8248EB2
-	warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2, 255, 4, 5
-	waitstate
-	return
-
-BattleFrontier_BattleTowerCorridor2_Movement_248EBC: @ 8248EBC
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248EC4: @ 8248EC4
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248ECC: @ 8248ECC
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_in_place_fastest_right
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248ED5: @ 8248ED5
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_in_place_fastest_left
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248EDE: @ 8248EDE
-	delay_16
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248EE3: @ 8248EE3
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248EE6: @ 8248EE6
-	walk_down
-	step_end
-
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc
deleted file mode 100644
index 433d8e181..000000000
--- a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc
+++ /dev/null
@@ -1,91 +0,0 @@
-BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB
-	map_script 2, BattleFrontier_BattleTowerElevator_MapScript2_2419E6
-	map_script 4, BattleFrontier_BattleTowerElevator_MapScript2_241A96
-	.byte 0
-
-BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_2419F0
-	.2byte 0
-
-BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
-	setvar VAR_TEMP_0, 1
-	applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86
-	applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A8A
-	waitmovement 0
-	special sub_813A080
-	waitse
-	special sub_8139A78
-	waitstate
-	delay 48
-	applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E
-	applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A92
-	waitmovement 0
-	call BattleFrontier_BattleTowerElevator_EventScript_241A28
-	end
-
-BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55
-	compare VAR_0x40CE, 2
-	call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A5F
-	compare VAR_0x40CE, 3
-	call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A72
-	return
-
-BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55
-	warp BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1
-	waitstate
-	return
-
-BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F
-	checkflag FLAG_0x152
-	goto_if 0, BattleFrontier_BattleTowerElevator_EventScript_241A7C
-	warp BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2, 255, 7, 2
-	waitstate
-	return
-
-BattleFrontier_BattleTowerElevator_EventScript_241A72:: @ 8241A72
-	warp BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2, 255, 7, 2
-	waitstate
-	return
-
-BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C
-	warp BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 1
-	waitstate
-	return
-
-BattleFrontier_BattleTowerElevator_Movement_241A86: @ 8241A86
-	walk_up
-	walk_right
-	face_down
-	step_end
-
-BattleFrontier_BattleTowerElevator_Movement_241A8A: @ 8241A8A
-	walk_up
-	walk_up
-	face_down
-	step_end
-
-BattleFrontier_BattleTowerElevator_Movement_241A8E: @ 8241A8E
-	walk_down
-	walk_down
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerElevator_Movement_241A92: @ 8241A92
-	walk_right
-	walk_down
-	walk_down
-	step_end
-
-BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_241AA0
-	.2byte 0
-
-BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
deleted file mode 100644
index d899b1cbe..000000000
--- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
+++ /dev/null
@@ -1,1589 +0,0 @@
-BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B
-	map_script 5, BattleFrontier_BattleTowerLobby_MapScript1_23E690
-	map_script 3, BattleFrontier_BattleTowerLobby_MapScript1_23E694
-	map_script 2, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD
-	map_script 4, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9
-	.byte 0
-
-BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690
-	special sub_81653CC
-	end
-
-BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
-	call BattleFrontier_BattleTowerLobby_EventScript_28CC84
-	setvar VAR_0x8004, 10
-	special sub_81A085C
-	compare VAR_0x8004, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5
-	checkflag FLAG_0x934
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6C1
-
-BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5
-	clearflag FLAG_0x2BD
-	setvar VAR_0x8004, 23
-	special sub_81A085C
-
-BattleFrontier_BattleTowerLobby_EventScript_23E6C0:: @ 823E6C0
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23E6C1:: @ 823E6C1
-	setflag FLAG_0x2BD
-	goto BattleFrontier_BattleTowerLobby_EventScript_23E6C0
-
-BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerLobby_EventScript_23E6D3
-	.2byte 0
-
-BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E707
-	map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattleTowerLobby_EventScript_23E710
-	map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattleTowerLobby_EventScript_23E8EE
-	map_script_2 VAR_TEMP_0, 3, BattleFrontier_BattleTowerLobby_EventScript_23E758
-	map_script_2 VAR_TEMP_0, 4, BattleFrontier_BattleTowerLobby_EventScript_23E7F2
-	.2byte 0
-
-BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707
-	setvar VAR_0x8004, 0
-	special sub_81A1780
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
-	lock
-	faceplayer
-	msgbox BattleFrontier_BattleTowerLobby_Text_23F583, 4
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	release
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758
-	lock
-	faceplayer
-	setvar VAR_0x8004, 10
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E778
-	message BattleFrontier_BattleTowerLobby_Text_23F60D
-	waitmessage
-	goto BattleFrontier_BattleTowerLobby_EventScript_23E780
-
-BattleFrontier_BattleTowerLobby_EventScript_23E778:: @ 823E778
-	msgbox BattleFrontier_BattleTowerLobby_Text_241486, 4
-
-BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780
-	setvar VAR_0x8004, 5
-	special sub_8161F74
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5
-	message BattleFrontier_BattleTowerLobby_Text_23F844
-	waitmessage
-	playfanfare MUS_FANFA4
-	waitfanfare
-	msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, 4
-
-BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5
-	msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, 4
-	setvar VAR_0x8004, 11
-	special sub_81A1780
-	msgbox BattleFrontier_BattleTowerLobby_Text_241520, 9
-	call BattleFrontier_BattleTowerLobby_EventScript_23E84D
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_8161F74
-	compare VAR_RESULT, 49
-	goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E7E2
-	msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, 4
-
-BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2
-	msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	release
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2
-	compare VAR_0x40CE, 2
-	goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E81E
-	checkflag FLAG_0x152
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E81E
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_8161F74
-	compare VAR_RESULT, 0
-	goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E830
-
-BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special sub_8161F74
-
-BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830
-	lock
-	faceplayer
-	message BattleFrontier_BattleTowerLobby_Text_23F6F7
-	waitmessage
-	call BattleFrontier_BattleTowerLobby_EventScript_23E84D
-	msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	release
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
-	message BattleFrontier_BattleTowerLobby_Text_23F70F
-	waitmessage
-	setvar VAR_0x8004, 8
-	special sub_81A1780
-	special LoadPlayerParty
-	special HealPlayerParty
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 0
-	special sub_8161F74
-	playse SE_SAVE
-	waitse
-	call BattleFrontier_BattleTowerLobby_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF
-	message BattleFrontier_BattleTowerLobby_Text_23FE3C
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23E8DF
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23E8B4
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23E8DF
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleArenaLobby_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleDomeLobby_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleFactoryLobby_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattlePalaceLobby_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4:: @ 823E8B4
-BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4
-	setvar VAR_0x8004, 19
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7
-	playse SE_SAVE
-	msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23E8DF
-
-BattleFrontier_BattleTowerLobby_EventScript_23E8D7:: @ 823E8D7
-	msgbox gText_BattleRecordCouldntBeSaved, 4
-
-BattleFrontier_BattleTowerLobby_EventScript_23E8DF:: @ 823E8DF
-	return
-
-BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0:: @ 823E8E0
-BattleFrontier_BattleArenaLobby_EventScript_23E8E0:: @ 823E8E0
-BattleFrontier_BattleDomeLobby_EventScript_23E8E0:: @ 823E8E0
-BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0:: @ 823E8E0
-BattleFrontier_BattleFactoryLobby_EventScript_23E8E0:: @ 823E8E0
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0:: @ 823E8E0
-BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0:: @ 823E8E0
-BattleFrontier_BattlePalaceLobby_EventScript_23E8E0:: @ 823E8E0
-BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0:: @ 823E8E0
-BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0:: @ 823E8E0
-BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 6
-	special sub_81A1780
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
-	lock
-	faceplayer
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23E930
-	message BattleFrontier_BattleTowerLobby_Text_23F737
-	waitmessage
-	message BattleFrontier_BattleTowerLobby_Text_23F754
-	waitmessage
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 1
-	special sub_8161F74
-	playse SE_SAVE
-	waitse
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23E930:: @ 823E930
-	setvar VAR_0x40BC, 1
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936
-	lock
-	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 0
-	special SavePlayerParty
-	msgbox BattleFrontier_BattleTowerLobby_Text_240537, 4
-
-BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948
-	message BattleFrontier_BattleTowerLobby_Text_2405B3
-	waitmessage
-	multichoice 17, 6, 23, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23E984
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA91
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-
-BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
-	setvar VAR_0x40CE, 0
-	message BattleFrontier_BattleTowerLobby_Text_23FD3B
-	waitmessage
-	multichoice 17, 6, 24, 0
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	setvar VAR_0x8004, 15
-	special sub_81A1780
-	compare VAR_0x8004, 1
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, 4
-	fadescreen 1
-	call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
-	copyvar VAR_0x8004, VAR_RESULT
-	setvar VAR_0x8005, 3
-	special sub_80F9490
-	waitstate
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-	msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA2A
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-
-BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	special sub_81A1780
-	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special sub_8161F74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special LoadPlayerParty
-	closemessage
-	delay 2
-	call BattleFrontier_BattleTowerLobby_EventScript_27134F
-	setvar VAR_TEMP_0, 255
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
-	incrementgamestat 30
-	setvar VAR_0x40BC, 1
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EA91:: @ 823EA91
-	msgbox BattleFrontier_BattleTowerLobby_Text_2405EC, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23E948
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EA9F:: @ 823EA9F
-	lock
-	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 0
-	special SavePlayerParty
-	msgbox BattleFrontier_BattleTowerLobby_Text_2407E2, 4
-
-BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1
-	message BattleFrontier_BattleTowerLobby_Text_24085E
-	waitmessage
-	multichoice 17, 6, 23, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23EAED
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EBFA
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-
-BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
-	setvar VAR_0x40CE, 1
-	message BattleFrontier_BattleTowerLobby_Text_23FD3B
-	waitmessage
-	multichoice 17, 6, 24, 0
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	setvar VAR_0x8004, 15
-	special sub_81A1780
-	compare VAR_0x8004, 1
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	msgbox BattleFrontier_BattleTowerLobby_Text_240A50, 4
-	fadescreen 1
-	call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
-	copyvar VAR_0x8004, VAR_RESULT
-	setvar VAR_0x8005, 4
-	special sub_80F9490
-	waitstate
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-	msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EB93
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-
-BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	special sub_81A1780
-	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special sub_8161F74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special LoadPlayerParty
-	closemessage
-	delay 2
-	call BattleFrontier_BattleTowerLobby_EventScript_27134F
-	setvar VAR_TEMP_0, 255
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
-	incrementgamestat 30
-	setvar VAR_0x40BC, 0
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EBFA:: @ 823EBFA
-	msgbox BattleFrontier_BattleTowerLobby_Text_240897, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23EAB1
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08
-	lock
-	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 0
-	clearflag FLAG_0x152
-	special SavePlayerParty
-	msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, 4
-
-BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D
-	message BattleFrontier_BattleTowerLobby_Text_240B06
-	waitmessage
-	multichoice 17, 6, 23, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23EC59
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23ED66
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-
-BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
-	setvar VAR_0x40CE, 2
-	message BattleFrontier_BattleTowerLobby_Text_23FD3B
-	waitmessage
-	multichoice 17, 6, 24, 0
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	setvar VAR_0x8004, 15
-	special sub_81A1780
-	compare VAR_0x8004, 1
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, 4
-	fadescreen 1
-	call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
-	copyvar VAR_0x8004, VAR_RESULT
-	setvar VAR_0x8005, 2
-	special sub_80F9490
-	waitstate
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-	msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23ECFF
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-
-BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	special sub_81A1780
-	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special sub_8161F74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special LoadPlayerParty
-	closemessage
-	delay 2
-	call BattleFrontier_BattleTowerLobby_EventScript_27134F
-	setvar VAR_TEMP_0, 255
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
-	incrementgamestat 30
-	setvar VAR_0x40BC, 0
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23ED66:: @ 823ED66
-	msgbox BattleFrontier_BattleTowerLobby_Text_240B3E, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23EC1D
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23ED74:: @ 823ED74
-	lock
-	faceplayer
-	setvar VAR_FRONTIER_FACILITY, 0
-	special SavePlayerParty
-	msgbox BattleFrontier_BattleTowerLobby_Text_240E15, 4
-
-BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86
-	message BattleFrontier_BattleTowerLobby_Text_240E95
-	waitmessage
-	multichoice 17, 6, 23, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23EDC2
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F3DA
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-
-BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
-	setvar VAR_0x40CE, 3
-	message BattleFrontier_BattleTowerLobby_Text_23FD3B
-	waitmessage
-	multichoice 17, 6, 24, 0
-	switch VAR_RESULT
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	setvar VAR_0x8004, 15
-	special sub_81A1780
-	compare VAR_0x8004, 1
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	msgbox BattleFrontier_BattleTowerLobby_Text_24115E, 4
-	fadescreen 1
-	call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
-	copyvar VAR_0x8004, VAR_RESULT
-	setvar VAR_0x8005, 2
-	special sub_80F9490
-	waitstate
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-	msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EE68
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
-
-BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	special sub_81A1780
-	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special sub_8161F74
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special LoadPlayerParty
-	closemessage
-	delay 2
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 0
-	special sub_8161F74
-	call BattleFrontier_BattleTowerLobby_EventScript_27134F
-	setvar VAR_TEMP_0, 255
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
-	incrementgamestat 30
-	specialvar VAR_RESULT, sub_80093CC
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F2C5
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7
-	lock
-	faceplayer
-	message BattleFrontier_BattleTowerLobby_Text_23F8CD
-	waitmessage
-	multichoice 16, 4, 109, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23EF32
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23EF4C
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_23EF66
-	case 3, BattleFrontier_BattleTowerLobby_EventScript_23EF80
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23EF80
-	release
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32
-	msgbox BattleFrontier_BattleTowerLobby_Text_23F969, 4
-	setvar VAR_0x8004, 1
-	call BattleFrontier_BattleTowerLobby_EventScript_271E7C
-	lock
-	faceplayer
-	goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C
-	msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, 4
-	setvar VAR_0x8004, 2
-	call BattleFrontier_BattleTowerLobby_EventScript_271E7C
-	lock
-	faceplayer
-	goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66
-	msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, 4
-	setvar VAR_0x8004, 3
-	call BattleFrontier_BattleTowerLobby_EventScript_271E7C
-	lock
-	faceplayer
-	goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EF80:: @ 823EF80
-	msgbox BattleFrontier_BattleTowerLobby_Text_23FA0F, 4
-	release
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EF8A:: @ 823EF8A
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFA1
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFAB
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EFA1:: @ 823EFA1
-	msgbox BattleFrontier_BattleTowerLobby_Text_23FA4F, 4
-	release
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EFAB:: @ 823EFAB
-	msgbox BattleFrontier_BattleTowerLobby_Text_23FA83, 4
-	release
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EFB5:: @ 823EFB5
-	msgbox BattleFrontier_BattleTowerLobby_Text_23FAC0, 2
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EFBE:: @ 823EFBE
-	msgbox BattleFrontier_BattleTowerLobby_Text_23FB26, 2
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7
-	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0
-	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9
-	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 2
-	special sub_81A1780
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012
-	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special sub_81A1780
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F02B:: @ 823F02B
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F046
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F08B
-
-BattleFrontier_BattleTowerLobby_EventScript_23F046:: @ 823F046
-	switch VAR_0x40CE
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F06F
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F07D
-	msgbox BattleFrontier_BattleTowerLobby_Text_24038B, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F06F:: @ 823F06F
-	msgbox BattleFrontier_BattleTowerLobby_Text_240027, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F07D:: @ 823F07D
-	msgbox BattleFrontier_BattleTowerLobby_Text_2401DB, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F08B:: @ 823F08B
-	switch VAR_0x40CE
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0B4
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F0C2
-	msgbox BattleFrontier_BattleTowerLobby_Text_24046B, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F0B4:: @ 823F0B4
-	msgbox BattleFrontier_BattleTowerLobby_Text_24010B, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2
-	msgbox BattleFrontier_BattleTowerLobby_Text_2402BD, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	special sub_81A1780
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F0E3:: @ 823F0E3
-	special LoadPlayerParty
-
-BattleFrontier_BattleTowerLobby_EventScript_23F0E6:: @ 823F0E6
-	special CloseLink
-	msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4
-
-BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1
-	release
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F0F3:: @ 823F0F3
-	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	call BattleFrontier_BattleTowerLobby_EventScript_23F272
-	special sub_81A1780
-	setvar VAR_RESULT, 0
-
-BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108
-	setvar VAR_0x8004, 12
-	special sub_8161F74
-	delay 1
-	compare VAR_RESULT, 6
-	goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23F108
-	call BattleFrontier_BattleTowerLobby_EventScript_23F135
-	clearflag FLAG_0x077
-	warp BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6
-	setvar VAR_TEMP_0, 0
-	waitstate
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135
-	call BattleFrontier_BattleTowerLobby_EventScript_23F1A7
-	compare VAR_0x40CE, 3
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152
-	msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F15B
-
-BattleFrontier_BattleTowerLobby_EventScript_23F152:: @ 823F152
-	messageautoscroll BattleFrontier_BattleTowerLobby_Text_23FE11
-	waitmessage
-	delay 48
-
-BattleFrontier_BattleTowerLobby_EventScript_23F15B:: @ 823F15B
-	closemessage
-	call BattleFrontier_BattleTowerLobby_EventScript_23F1E8
-	call BattleFrontier_BattleTowerLobby_EventScript_23F22D
-	applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F195
-	applymovement 255, BattleFrontier_BattleTowerLobby_Movement_23F195
-	waitmovement 0
-	opendoor VAR_0x8004, 1
-	waitdooranim
-	applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F199
-	applymovement 255, BattleFrontier_BattleTowerLobby_Movement_23F19C
-	waitmovement 0
-	closedoor VAR_0x8004, 1
-	waitdooranim
-	return
-
-BattleFrontier_BattleTowerLobby_Movement_23F195: @ 823F195
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattleTowerLobby_Movement_23F199: @ 823F199
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerLobby_Movement_23F19C: @ 823F19C
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D4
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D9
-	compare VAR_0x40CE, 2
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1DE
-	compare VAR_0x40CE, 3
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1E3
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F1D4:: @ 823F1D4
-	bufferstdstring 0, 19
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F1D9:: @ 823F1D9
-	bufferstdstring 0, 20
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F1DE:: @ 823F1DE
-	bufferstdstring 0, 21
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3
-	bufferstdstring 0, 22
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F215
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F21B
-	compare VAR_0x40CE, 2
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F221
-	compare VAR_0x40CE, 3
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F227
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F215:: @ 823F215
-	setvar VAR_LAST_TALKED, 1
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F21B:: @ 823F21B
-	setvar VAR_LAST_TALKED, 7
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F221:: @ 823F221
-	setvar VAR_LAST_TALKED, 8
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227
-	setvar VAR_LAST_TALKED, 9
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F25A
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F260
-	compare VAR_0x40CE, 2
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F266
-	compare VAR_0x40CE, 3
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F26C
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F25A:: @ 823F25A
-	setvar VAR_0x8004, 6
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F260:: @ 823F260
-	setvar VAR_0x8004, 10
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F266:: @ 823F266
-	setvar VAR_0x8004, 14
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C
-	setvar VAR_0x8004, 18
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272
-	compare VAR_0x40CE, 0
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F29F
-	compare VAR_0x40CE, 1
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2A5
-	compare VAR_0x40CE, 2
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2AB
-	compare VAR_0x40CE, 3
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2B1
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F29F:: @ 823F29F
-	setvar VAR_0x8005, 3
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F2A5:: @ 823F2A5
-	setvar VAR_0x8005, 4
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F2AB:: @ 823F2AB
-	setvar VAR_0x8005, 2
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F2B1:: @ 823F2B1
-	setvar VAR_0x8005, 2
-	return
-
-BattleFrontier_BattleArenaLobby_EventScript_23F2B7:: @ 823F2B7
-BattleFrontier_BattleDomeLobby_EventScript_23F2B7:: @ 823F2B7
-BattleFrontier_BattleDomePreBattleRoom_EventScript_23F2B7:: @ 823F2B7
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7:: @ 823F2B7
-BattleFrontier_BattlePalaceLobby_EventScript_23F2B7:: @ 823F2B7
-BattleFrontier_BattlePikeLobby_EventScript_23F2B7:: @ 823F2B7
-BattleFrontier_BattlePyramidLobby_EventScript_23F2B7:: @ 823F2B7
-BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_81A1780
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
-	setvar VAR_0x8004, 9
-	message OldaleTown_PokemonCenter_2F_Text_278091
-	waitmessage
-	setvar VAR_0x8005, 0
-	special sub_80B2DA4
-	waitstate
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF
-	compare VAR_RESULT, 2
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2
-	compare VAR_RESULT, 3
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F327
-	compare VAR_RESULT, 4
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F351
-	compare VAR_RESULT, 5
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	compare VAR_RESULT, 6
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5
-	compare VAR_RESULT, 11
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327
-	special CloseLink
-	compare VAR_0x8005, 3
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F
-	msgbox BattleFrontier_BattleTowerLobby_Text_278255, 4
-	release
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F
-	msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, 4
-	msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4
-	release
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351
-	msgbox BattleFrontier_BattleTowerLobby_Text_241240, 4
-	special CloseLink
-	msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, 4
-	release
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366
-	special CloseLink
-	compare VAR_0x8005, 0
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F394
-	compare VAR_0x8005, 1
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F39D
-	compare VAR_0x8005, 2
-	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F3A6
-	msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4
-	release
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F394:: @ 823F394
-	msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, 4
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F39D:: @ 823F39D
-	msgbox BattleFrontier_BattleTowerLobby_Text_241285, 4
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6
-	msgbox BattleFrontier_BattleTowerLobby_Text_2412B3, 4
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF
-	incrementgamestat 30
-	setvar VAR_0x40BC, 0
-	message BattleFrontier_BattleTowerLobby_Text_24144D
-	waitmessage
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 1
-	special sub_8161F74
-	special sub_80A08CC
-	waitstate
-	playse SE_SAVE
-	waitse
-	special sub_80B3BC4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F3DA:: @ 823F3DA
-	msgbox BattleFrontier_BattleTowerLobby_Text_240ED2, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23ED86
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8
-	setvar VAR_0x8004, 20
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F3F3
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3
-	message BattleFrontier_BattleTowerLobby_Text_2792CD
-	waitmessage
-	multichoice 16, 6, 81, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F463
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F430
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430
-	call BattleFrontier_BattleTowerLobby_EventScript_277B30
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496
-	compare VAR_RESULT, 5
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3
-	compare VAR_RESULT, 8
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F430
-	compare VAR_RESULT, 11
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
-	release
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463
-	call BattleFrontier_BattleTowerLobby_EventScript_277B35
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496
-	compare VAR_RESULT, 5
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3
-	compare VAR_RESULT, 8
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F463
-	compare VAR_RESULT, 11
-	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
-	release
-	return
-
-BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496
-	incrementgamestat 30
-	setvar VAR_0x40BC, 0
-	message BattleFrontier_BattleTowerLobby_Text_24144D
-	waitmessage
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 1
-	special sub_8161F74
-	special sub_80A08CC
-	waitstate
-	playse SE_SAVE
-	waitse
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F4BE:: @ 823F4BE
-	lockall
-	msgbox BattleFrontier_BattleTowerLobby_Text_241540, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F4CD:: @ 823F4CD
-	message BattleFrontier_BattleTowerLobby_Text_241563
-	waitmessage
-	multichoice 17, 2, 97, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerLobby_EventScript_23F520
-	case 1, BattleFrontier_BattleTowerLobby_EventScript_23F52E
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_23F53C
-	case 3, BattleFrontier_BattleTowerLobby_EventScript_23F54A
-	case 4, BattleFrontier_BattleTowerLobby_EventScript_23F558
-	case 127, BattleFrontier_BattleTowerLobby_EventScript_23F558
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F520:: @ 823F520
-	msgbox BattleFrontier_BattleTowerLobby_Text_241586, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F52E:: @ 823F52E
-	msgbox BattleFrontier_BattleTowerLobby_Text_241693, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F53C:: @ 823F53C
-	msgbox BattleFrontier_BattleTowerLobby_Text_241777, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F54A:: @ 823F54A
-	msgbox BattleFrontier_BattleTowerLobby_Text_24187E, 4
-	goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F558:: @ 823F558
-	releaseall
-	end
-
-BattleFrontier_BattleTowerLobby_EventScript_23F55A: @ 823F55A
-	.string "I’ll direct you to your BATTLE ROOM now.$"
-
-BattleFrontier_BattleTowerLobby_Text_23F583: @ 823F583
-	.string "Excuse me!\p"
-	.string "You didn’t save before you quit your\n"
-	.string "challenge last time.\p"
-	.string "Because of that, your challenge so far\n"
-	.string "has been disqualified. Sorry!$"
-
-BattleFrontier_BattleTowerLobby_Text_23F60D: @ 823F60D
-	.string "Congratulations!\n"
-	.string "You’ve beaten all seven TRAINERS!\p"
-	.string "$"
-
-BattleFrontier_BattleTowerLobby_Text_23F641: @ 823F641
-	.string "For beating seven TRAINERS in a row,\n"
-	.string "you have earned this fabulous prize!\p"
-	.string "$"
-
-SlateportCity_BattleTentLobby_Text_23F68C: @ 823F68C
-	.string "{PLAYER} received the prize\n"
-	.string "{STR_VAR_1}.$"
-
-SlateportCity_BattleTentLobby_Text_23F6A6: @ 823F6A6
-	.string "Oh, your BAG appears to be full.\p"
-	.string "Please make room in your BAG, then come\n"
-	.string "see me.$"
-
-BattleFrontier_BattleTowerLobby_Text_23F6F7: @ 823F6F7
-	.string "Thank you for playing!\p"
-	.string "$"
-
-BattleFrontier_BattleTowerLobby_Text_23F70F: @ 823F70F
-	.string "Your record will be saved.\n"
-	.string "Please wait.$"
-
-BattleFrontier_BattleTowerLobby_Text_23F737: @ 823F737
-	.string "We’ve been waiting for you!\p"
-	.string "$"
-
-BattleFrontier_BattleTowerLobby_Text_23F754: @ 823F754
-	.string "Before entering a BATTLE ROOM, your\n"
-	.string "progress will be saved. Please wait.$"
-
-BattleFrontier_BattleTowerLobby_Text_23F79D: @ 823F79D
-	.string "You’re finally about to face the\n"
-	.string "50th TRAINER.\p"
-	.string "From here on, every time you beat seven\n"
-	.string "TRAINERS in a row, your POKéMON will\l"
-	.string "receive a commemorative RIBBON.\p"
-	.string "Good luck!$"
-
-BattleFrontier_BattleTowerLobby_Text_23F844: @ 823F844
-	.string "Here are some RIBBONS for beating\n"
-	.string "seven tough TRAINERS in a row.\p"
-	.string "{PLAYER} received some RIBBONS!$"
-
-BattleFrontier_BattleTowerLobby_Text_23F89F: @ 823F89F
-	.string "{PLAYER} put the RIBBONS on\n"
-	.string "the challenger POKéMON.$"
-
-BattleFrontier_BattleTowerLobby_Text_23F8CD: @ 823F8CD
-	.string "Excuse me, do you have a moment?\p"
-	.string "Can you describe your feelings when\n"
-	.string "you’re about to begin a BATTLE TOWER\l"
-	.string "match, or when you’ve either won or\l"
-	.string "lost a match?$"
-
-BattleFrontier_BattleTowerLobby_Text_23F969: @ 823F969
-	.string "Okay, what are your feelings when\n"
-	.string "you’re about to begin a match?$"
-
-BattleFrontier_BattleTowerLobby_Text_23F9AA: @ 823F9AA
-	.string "What do you feel when you’ve won\n"
-	.string "a match?$"
-
-BattleFrontier_BattleTowerLobby_Text_23F9D4: @ 823F9D4
-	.string "Can I hear about your feelings when\n"
-	.string "you have lost a match?$"
-
-BattleFrontier_BattleTowerLobby_Text_23FA0F: @ 823FA0F
-	.string "Oh, so you don’t think much about it?\n"
-	.string "You’re one cool customer.$"
-
-BattleFrontier_BattleTowerLobby_Text_23FA4F: @ 823FA4F
-	.string "Hunh? You changed your mind?\n"
-	.string "I guess you’re fickle.$"
-
-BattleFrontier_BattleTowerLobby_Text_23FA83: @ 823FA83
-	.string "Okay, so that’s how you feel?\n"
-	.string "That’s quite original.\p"
-	.string "Thanks!$"
-
-BattleFrontier_BattleTowerLobby_Text_23FAC0: @ 823FAC0
-	.string "The number of matches you win in a row\n"
-	.string "is recorded.\p"
-	.string "I’d better not get beaten in\n"
-	.string "an embarrassing way!$"
-
-BattleFrontier_BattleTowerLobby_Text_23FB26: @ 823FB26
-	.string "Once you’ve entered the BATTLE TOWER,\n"
-	.string "you can’t leave until you either lose\l"
-	.string "or you beat seven TRAINERS in a row.\p"
-	.string "You’d best be certain that you’re up\n"
-	.string "to the challenge.$"
-
-BattleFrontier_BattleTowerLobby_Text_23FBCE: @ 823FBCE
-	.string "Welcome to the BATTLE TOWER\n"
-	.string "DOUBLE BATTLE CORNER!\p"
-	.string "Unfortunately, the BATTLE ROOMS\n"
-	.string "are still under construction.\p"
-	.string "Please come back when the work\n"
-	.string "is completed.$"
-
-BattleFrontier_BattleTowerLobby_Text_23FC6B: @ 823FC6B
-	.string "Welcome to the BATTLE TOWER\n"
-	.string "MULTI BATTLE CORNER!\p"
-	.string "Unfortunately, the BATTLE ROOMS\n"
-	.string "are still under construction.\p"
-	.string "Please come back when the work\n"
-	.string "is completed.$"
-
-BattleFrontier_BattleTowerLobby_Text_23FD07: @ 823FD07
-	.string "We look forward to seeing you on\n"
-	.string "another challenge!$"
-
-BattleFrontier_BattleTowerLobby_Text_23FD3B: @ 823FD3B
-	.string "The BATTLE ROOM offers two levels\n"
-	.string "of challenge, Level 50 and Open Level.\l"
-	.string "Which is your choice?$"
-
-BattleFrontier_BattleTowerLobby_Text_23FD9A: @ 823FD9A
-	.string "Please select the POKéMON you wish\n"
-	.string "to enter.$"
-
-BattleFrontier_BattleTowerLobby_Text_23FDC7: @ 823FDC7
-	.string "Before entering a BATTLE ROOM, your\n"
-	.string "progress must be saved. Is that okay?$"
-
-BattleFrontier_BattleTowerLobby_Text_23FE11: @ 823FE11
-	.string "I will now show you to the\n"
-	.string "{STR_VAR_1} BATTLE ROOM.$"
-
-BattleFrontier_BattleTowerLobby_Text_23FE3C: @ 823FE3C
-	.string "Shall I record your last BATTLE TOWER\n"
-	.string "match on your FRONTIER PASS?$"
-
-BattleFrontier_BattleTowerLobby_Text_23FE7F: @ 823FE7F
-	.string "Excuse me!\p"
-	.string "You don’t have {STR_VAR_2} eligible POKéMON.\p"
-	.string "You must have {STR_VAR_2} different POKéMON\n"
-	.string "of Level 50 or less to enter.\p"
-	.string "They also must be holding different\n"
-	.string "kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "Please come see me when you are ready.$"
-
-BattleFrontier_BattleTowerLobby_Text_23FF5D: @ 823FF5D
-	.string "Excuse me!\p"
-	.string "You don’t have {STR_VAR_2} eligible POKéMON.\p"
-	.string "You must have {STR_VAR_2} different POKéMON\n"
-	.string "to enter.\p"
-	.string "They also must be holding different\n"
-	.string "kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "Please come see me when you are ready.$"
-
-BattleFrontier_BattleTowerLobby_Text_240027: @ 8240027
-	.string "Excuse me!\p"
-	.string "You don’t have three eligible POKéMON.\p"
-	.string "You must have three different POKéMON\n"
-	.string "of Level 50 or less to enter.\p"
-	.string "They also must be holding different\n"
-	.string "kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "Please come see me when you are ready.$"
-
-BattleFrontier_BattleTowerLobby_Text_24010B: @ 824010B
-	.string "Excuse me!\p"
-	.string "You don’t have three eligible POKéMON.\p"
-	.string "You must have three different POKéMON\n"
-	.string "to enter.\p"
-	.string "They also must be holding different\n"
-	.string "kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "Please come see me when you are ready.$"
-
-BattleFrontier_BattleTowerLobby_Text_2401DB: @ 82401DB
-	.string "Excuse me!\p"
-	.string "You don’t have four eligible POKéMON.\p"
-	.string "You must have four different POKéMON\n"
-	.string "of Level 50 or less to enter.\p"
-	.string "They also must be holding different\n"
-	.string "kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "Please come see me when you are ready.$"
-
-BattleFrontier_BattleTowerLobby_Text_2402BD: @ 82402BD
-	.string "Excuse me!\p"
-	.string "You don’t have four eligible POKéMON.\p"
-	.string "You must have four different POKéMON\n"
-	.string "to enter.\p"
-	.string "They also must be holding different\n"
-	.string "kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "Please come see me when you are ready.$"
-
-BattleFrontier_BattleTowerLobby_Text_24038B: @ 824038B
-	.string "Excuse me!\p"
-	.string "You don’t have two eligible POKéMON.\p"
-	.string "You must have two different POKéMON\n"
-	.string "of Level 50 or less to enter.\p"
-	.string "They also must be holding different\n"
-	.string "kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "Please come see me when you are ready.$"
-
-BattleFrontier_BattleTowerLobby_Text_24046B: @ 824046B
-	.string "Excuse me!\p"
-	.string "You don’t have two eligible POKéMON.\p"
-	.string "You must have two different POKéMON\n"
-	.string "to enter.\p"
-	.string "They also must be holding different\n"
-	.string "kinds of items.\p"
-	.string "EGGS{STR_VAR_1} ineligible.\p"
-	.string "Please come see me when you are ready.$"
-
-BattleFrontier_BattleTowerLobby_Text_240537: @ 8240537
-	.string "Where the talents of TRAINERS\n"
-	.string "are put to the test!\p"
-	.string "Welcome to the BATTLE TOWER!\p"
-	.string "I am your guide to the SINGLE\n"
-	.string "BATTLE ROOMS.$"
-
-BattleFrontier_BattleTowerLobby_Text_2405B3: @ 82405B3
-	.string "Would you like to take the SINGLE\n"
-	.string "BATTLE ROOM challenge?$"
-
-BattleFrontier_BattleTowerLobby_Text_2405EC: @ 82405EC
-	.string "The BATTLE TOWER’s SINGLE BATTLE\n"
-	.string "ROOMS are facilities for conducting\l"
-	.string "SINGLE BATTLES with three POKéMON.\p"
-	.string "There are many SINGLE BATTLE ROOMS\n"
-	.string "in the BATTLE TOWER for team battles.\p"
-	.string "In each of the SINGLE BATTLE ROOMS,\n"
-	.string "seven TRAINERS await your challenge.\p"
-	.string "If you manage to defeat all seven,\n"
-	.string "you will earn Battle Points.\p"
-	.string "If you want to interrupt your\n"
-	.string "challenge, please save the game.\p"
-	.string "If you don’t save before interrupting,\n"
-	.string "you will be disqualified.$"
-
-BattleFrontier_BattleTowerLobby_Text_2407A6: @ 82407A6
-	.string "Now please select the three POKéMON\n"
-	.string "that are to be entered.$"
-
-BattleFrontier_BattleTowerLobby_Text_2407E2: @ 82407E2
-	.string "Where the talents of TRAINERS\n"
-	.string "are put to the test!\p"
-	.string "Welcome to the BATTLE TOWER!\p"
-	.string "I am your guide to the DOUBLE\n"
-	.string "BATTLE ROOMS.$"
-
-BattleFrontier_BattleTowerLobby_Text_24085E: @ 824085E
-	.string "Would you like to take the DOUBLE\n"
-	.string "BATTLE ROOM challenge?$"
-
-BattleFrontier_BattleTowerLobby_Text_240897: @ 8240897
-	.string "The BATTLE TOWER’s DOUBLE BATTLE\n"
-	.string "ROOMS are facilities for conducting\l"
-	.string "DOUBLE BATTLES with four POKéMON.\p"
-	.string "There are many DOUBLE BATTLE ROOMS\n"
-	.string "in the BATTLE TOWER for team battles.\p"
-	.string "In each of the DOUBLE BATTLE ROOMS,\n"
-	.string "seven TRAINERS await your challenge.\p"
-	.string "If you manage to defeat all seven,\n"
-	.string "you will earn Battle Points.\p"
-	.string "If you want to interrupt your\n"
-	.string "challenge, please save the game.\p"
-	.string "If you don’t save before interrupting,\n"
-	.string "you will be disqualified.$"
-
-BattleFrontier_BattleTowerLobby_Text_240A50: @ 8240A50
-	.string "Now please select the four POKéMON\n"
-	.string "that are to be entered.$"
-
-BattleFrontier_BattleTowerLobby_Text_240A8B: @ 8240A8B
-	.string "Where the talents of TRAINERS\n"
-	.string "are put to the test!\p"
-	.string "Welcome to the BATTLE TOWER!\p"
-	.string "I am your guide to the MULTI\n"
-	.string "BATTLE ROOMS.$"
-
-BattleFrontier_BattleTowerLobby_Text_240B06: @ 8240B06
-	.string "Would you like to take the MULTI\n"
-	.string "BATTLE ROOM challenge?$"
-
-BattleFrontier_BattleTowerLobby_Text_240B3E: @ 8240B3E
-	.string "The BATTLE TOWER’s MULTI BATTLE\n"
-	.string "ROOMS are facilities for conducting\l"
-	.string "MULTI BATTLES.\p"
-	.string "For MULTI BATTLES, you must partner\n"
-	.string "with a TRAINER in the TOWER and enter\l"
-	.string "with two POKéMON each.\p"
-	.string "Inside the TOWER is a room named\n"
-	.string "the BATTLE SALON where you may meet\l"
-	.string "other TRAINERS.\p"
-	.string "There, you must find a TRAINER to act\n"
-	.string "as your partner in MULTI BATTLES.\p"
-	.string "Once you have partnered up, you will\n"
-	.string "be shown to a MULTI BATTLE ROOM.\p"
-	.string "In the MULTI BATTLE ROOM, seven\n"
-	.string "tag teams await your challenge.\p"
-	.string "If you manage to defeat all seven\n"
-	.string "teams, you will earn Battle Points.\p"
-	.string "If you want to interrupt your\n"
-	.string "challenge, please save the game.\p"
-	.string "If you don’t save before interrupting,\n"
-	.string "you will be disqualified.$"
-
-BattleFrontier_BattleTowerLobby_Text_240DDB: @ 8240DDB
-	.string "Now please select the two POKéMON\n"
-	.string "that are to be entered.$"
-
-BattleFrontier_BattleTowerLobby_Text_240E15: @ 8240E15
-	.string "Where the talents of TRAINERS\n"
-	.string "are put to the test!\p"
-	.string "Welcome to the BATTLE TOWER!\p"
-	.string "I am your guide to the LINK MULTI\n"
-	.string "BATTLE ROOMS.$"
-
-BattleFrontier_BattleTowerLobby_Text_240E95: @ 8240E95
-	.string "Would you like to take the LINK MULTI\n"
-	.string "BATTLE ROOM challenge?$"
-
-BattleFrontier_BattleTowerLobby_Text_240ED2: @ 8240ED2
-	.string "The BATTLE TOWER’s MULTI BATTLE\n"
-	.string "ROOMS are facilities for conducting\l"
-	.string "MULTI BATTLES with a friend.\p"
-	.string "You must link with your friend using\n"
-	.string "Wireless Adapters or a Game Boy\l"
-	.string "Advance Game Link cable.\p"
-	.string "You must partner with your friend and\n"
-	.string "enter two different kinds of POKéMON.\p"
-	.string "There are many MULTI BATTLE ROOMS\n"
-	.string "in the BATTLE TOWER for team battles.\p"
-	.string "In a MULTI BATTLE ROOM, seven\n"
-	.string "tag teams await you and your friend\l"
-	.string "to make a tag-team challenge.\p"
-	.string "If you manage to defeat all seven\n"
-	.string "teams, you will earn Battle Points.\p"
-	.string "Please beware that unlike other ROOMS,\n"
-	.string "you may not interrupt your challenge.\p"
-	.string "Once you start, you must battle seven\n"
-	.string "MULTI BATTLES in a row nonstop.$"
-
-BattleFrontier_BattleTowerLobby_Text_24115E: @ 824115E
-	.string "Now please select the two POKéMON\n"
-	.string "that are to be entered.$"
-
-BattleFrontier_BattleTowerLobby_Text_241198: @ 8241198
-	.string "You have chosen the same kind of\n"
-	.string "POKéMON as your friend.\p"
-	.string "Please choose two POKéMON different\n"
-	.string "from your friend’s, match the level\l"
-	.string "you wish to enter, and register again.$"
-
-BattleFrontier_BattleTowerLobby_Text_241240: @ 8241240
-	.string "The LINK MULTI BATTLE ROOM challenge\n"
-	.string "is only for two linked players.$"
-
-BattleFrontier_BattleTowerLobby_Text_241285: @ 8241285
-	.string "Your friend has also selected\n"
-	.string "the POKéMON {STR_VAR_1}.$"
-
-BattleFrontier_BattleTowerLobby_Text_2412B3: @ 82412B3
-	.string "Your friend has also selected the\n"
-	.string "POKéMON {STR_VAR_1} and {STR_VAR_2}.$"
-
-BattleFrontier_BattleTowerLobby_Text_2412E8: @ 82412E8
-	.string "Your friend has chosen a different\n"
-	.string "battle level.$"
-
-BattleFrontier_BattleTowerLobby_Text_241319: @ 8241319
-	.string "Your friend has chosen a different\n"
-	.string "battle level.\p"
-	.string "Your friend has also selected\n"
-	.string "the POKéMON {STR_VAR_1}.$"
-
-BattleFrontier_BattleTowerLobby_Text_241378: @ 8241378
-	.string "Your friend has chosen a different\n"
-	.string "battle level.\p"
-	.string "Your friend has also selected the\n"
-	.string "POKéMON {STR_VAR_1} and {STR_VAR_2}.$"
-
-BattleFrontier_BattleTowerLobby_Text_2413DE: @ 82413DE
-	.string "Please choose two POKéMON different\n"
-	.string "from your friend’s, match the level\l"
-	.string "you wish to enter, and register again.$"
-
-BattleFrontier_BattleTowerLobby_Text_24144D: @ 824144D
-	.string "I will save the game before\n"
-	.string "showing you in. Please wait.$"
-
-BattleFrontier_BattleTowerLobby_Text_241486: @ 8241486
-	.string "Congratulations!\n"
-	.string "You have defeated the SALON MAIDEN\l"
-	.string "and swept seven TRAINERS!$"
-
-BattleFrontier_BattleTowerLobby_Text_2414D4: @ 82414D4
-	.string "In recognition of your infinite talent,\n"
-	.string "we award you these Battle Point(s).$"
-
-BattleFrontier_BattleArenaLobby_Text_241520: @ 8241520
-BattleFrontier_BattleDomeLobby_Text_241520: @ 8241520
-BattleFrontier_BattleFactoryLobby_Text_241520: @ 8241520
-BattleFrontier_BattlePalaceLobby_Text_241520: @ 8241520
-BattleFrontier_BattlePikeLobby_Text_241520: @ 8241520
-BattleFrontier_BattlePyramidLobby_Text_241520: @ 8241520
-BattleFrontier_BattleTowerLobby_Text_241520: @ 8241520
-	.string "{PLAYER} obtained {STR_VAR_1} Battle Point(s).$"
-
-BattleFrontier_BattleTowerLobby_Text_241540: @ 8241540
-	.string "The BATTLE TOWER rules are listed.$"
-
-BattleFrontier_BattleTowerLobby_Text_241563: @ 8241563
-	.string "Which heading do you want to read?$"
-
-BattleFrontier_BattleTowerLobby_Text_241586: @ 8241586
-	.string "The BATTLE TOWER is a facility where\n"
-	.string "four types of battles are waged--\l"
-	.string "SINGLE BATTLE, DOUBLE BATTLE, MULTI\l"
-	.string "BATTLE, and LINK MULTI BATTLE.\p"
-	.string "For each of these types, there are\n"
-	.string "separate BATTLE ROOMS.\p"
-	.string "Please speak with a guide offering\n"
-	.string "the type of battle you wish to enter.$"
-
-BattleFrontier_BattleTowerLobby_Text_241693: @ 8241693
-	.string "Depending on the BATTLE ROOM you are\n"
-	.string "entering, you will be required to take\l"
-	.string "a certain number of POKéMON.\p"
-	.string "The SINGLE BATTLE mode requires\n"
-	.string "three POKéMON.\p"
-	.string "The DOUBLE BATTLE mode requires four,\n"
-	.string "and the MULTI modes both require two.$"
-
-BattleFrontier_BattleTowerLobby_Text_241777: @ 8241777
-	.string "The BATTLE SALON is where you must\n"
-	.string "find a partner to form a tag team for\l"
-	.string "the MULTI BATTLE ROOM challenge.\p"
-	.string "Choose the best partner for you by\n"
-	.string "examining other TRAINERS’\l"
-	.string "POKéMON and their moves.\p"
-	.string "You may choose a new tag partner\n"
-	.string "after winning seven straight matches.$"
-
-BattleFrontier_BattleTowerLobby_Text_24187E: @ 824187E
-	.string "The LINK MULTI BATTLE Mode is for two\n"
-	.string "friends to mount a challenge together.\p"
-	.string "You and your friend must be linked with\n"
-	.string "Wireless Adapters or a GBA Game Link\l"
-	.string "cable.\p"
-	.string "You must choose two POKéMON at\n"
-	.string "the registration counter.\p"
-	.string "These POKéMON must be different\n"
-	.string "from those of your friend.\p"
-	.string "You may not interrupt this challenge\n"
-	.string "in the middle, unlike other modes.$"
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc
deleted file mode 100644
index c1d3534d3..000000000
--- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc
+++ /dev/null
@@ -1,1822 +0,0 @@
-BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92
-	map_script 5, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7
-	map_script 3, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0
-	map_script 4, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14
-	map_script 2, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23
-	.byte 0
-
-BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
-	setvar VAR_0x8004, 17
-	special sub_81A8E7C
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
-	checkflag FLAG_0x152
-	goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA
-	clearflag FLAG_0x2C7
-	clearflag FLAG_0x2C8
-	clearflag FLAG_0x2C9
-	clearflag FLAG_0x2CA
-	clearflag FLAG_0x2CB
-	clearflag FLAG_0x2CC
-	setflag FLAG_0x360
-	setflag FLAG_0x361
-	setvar VAR_0x8004, 10
-	special sub_8161F74
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA
-	setvar VAR_OBJ_GFX_ID_0, 7
-	setvar VAR_OBJ_GFX_ID_1, 7
-	setvar VAR_OBJ_GFX_ID_2, 7
-	setvar VAR_OBJ_GFX_ID_3, 7
-	setvar VAR_OBJ_GFX_ID_4, 7
-	setvar VAR_OBJ_GFX_ID_5, 7
-	setvar VAR_OBJ_GFX_ID_6, 7
-	setvar VAR_OBJ_GFX_ID_7, 7
-	setvar VAR_TEMP_1, 1
-	setvar VAR_TEMP_3, 1
-	setobjectxyperm 1, 10, 2
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14
-	map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E
-	.2byte 0
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E
-	turnobject 255, 2
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41
-	map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35
-	.2byte 0
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35:: @ 8243E35
-	lockall
-	setvar VAR_TEMP_3, 0
-	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41
-	lockall
-	applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75
-	waitmovement 0
-	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77
-	waitmovement 0
-	moveobjectoffscreen 1
-	applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6
-	waitmovement 0
-	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, 4
-	special HealPlayerParty
-	setvar VAR_TEMP_1, 1
-	releaseall
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75: @ 8243E75
-	walk_down
-	step_end
-
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77: @ 8243E77
-	walk_left
-	walk_in_place_fastest_down
-	step_end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A
-	lock
-	faceplayer
-	message BattleFrontier_BattleTowerMultiBattleRoom_Text_244094
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D
-	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, 4
-	release
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5
-	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, 4
-	closemessage
-	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6
-	waitmovement 0
-	opendoor 10, 1
-	waitdooranim
-	call BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4
-	closedoor 10, 1
-	waitdooranim
-	warp BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6
-	waitstate
-	releaseall
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4:: @ 8243EE4
-	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26
-	applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A
-	waitmovement 0
-	return
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EF6: @ 8243EF6
-	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26
-	applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E
-	waitmovement 0
-	return
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08
-	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26
-	applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22
-	waitmovement 0
-	return
-
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A: @ 8243F1A
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E: @ 8243F1E
-	walk_right
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22: @ 8243F22
-	walk_left
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26: @ 8243F26
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 0
-	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
-	checkflag FLAG_0x152
-	goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
-	setvar VAR_0x8004, 11
-	setvar VAR_0x8005, 0
-	special sub_8161F74
-	waitmessage
-	waitbuttonpress
-	setvar VAR_0x8004, 11
-	setvar VAR_0x8005, 1
-	special sub_8161F74
-	waitmessage
-	waitbuttonpress
-	setvar VAR_0x8004, 11
-	setvar VAR_0x8005, 2
-	special sub_8161F74
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
-	case 127, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
-	setvar VAR_0x8004, 11
-	setvar VAR_0x8005, 3
-	special sub_8161F74
-	waitmessage
-	waitbuttonpress
-	closemessage
-	compare VAR_FACING, 1
-	call_if 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4
-	compare VAR_FACING, 1
-	call_if 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF
-	removeobject VAR_LAST_TALKED
-	setflag FLAG_0x152
-	warpsilent BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3
-	waitstate
-	release
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3:: @ 8243FC3
-	setvar VAR_0x8004, 11
-	setvar VAR_0x8005, 4
-	special sub_8161F74
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4:: @ 8243FD4
-	applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FEA
-	waitmovement 0
-	return
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF:: @ 8243FDF
-	applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FF2
-	waitmovement 0
-	return
-
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FEA: @ 8243FEA
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	step_end
-
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FF2: @ 8243FF2
-	walk_fast_left
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	step_end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB:: @ 8243FFB
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 1
-	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008:: @ 8244008
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 2
-	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015:: @ 8244015
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 3
-	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022:: @ 8244022
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 4
-	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F:: @ 824402F
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 5
-	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C:: @ 824403C
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 6
-	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049:: @ 8244049
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 7
-	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36
-	end
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244056: @ 8244056
-	.string "Please find a partner from out of\n"
-	.string "the TRAINERS gathered here.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244094: @ 8244094
-	.string "{PLAYER}, you have not found a partner\n"
-	.string "for your tag team.\p"
-	.string "Would you like to quit looking and\n"
-	.string "return to the reception counter?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C: @ 824410C
-	.string "Then, please find a partner from\n"
-	.string "the TRAINERS gathered here.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244149:: @ 8244149
-	.string "Thank you for choosing a partner.\p"
-	.string "I will now show you to your\n"
-	.string "MULTI BATTLE ROOM.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24419A:: @ 824419A
-	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n"
-	.string "You can call me {STR_VAR_3}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2441CA:: @ 82441CA
-	.string "On {STR_VAR_1}’s advice, I brought\n"
-	.string "one {STR_VAR_3} with {STR_VAR_2} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2441F7:: @ 82441F7
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
-	.string "Please, let me join you as a tag team.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24422E:: @ 824422E
-	.string "Thank you!\n"
-	.string "I’ll go register right now.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244255:: @ 8244255
-	.string "I really wanted to form a tag team\n"
-	.string "with you, {PLAYER}…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244286:: @ 8244286
-	.string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n"
-	.string "My name is {STR_VAR_3}.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2442B2:: @ 82442B2
-	.string "I got advice from {STR_VAR_1} and chose\n"
-	.string "one {STR_VAR_3} with {STR_VAR_2} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2442E4:: @ 82442E4
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
-	.string "Please, let’s form a tag team!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244313:: @ 8244313
-	.string "Thank you very much!\n"
-	.string "I’ll be done with registration quickly!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244350:: @ 8244350
-	.string "{PLAYER}, I was hoping that I could\n"
-	.string "partner up with you…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244383:: @ 8244383
-	.string "Um, my name’s {STR_VAR_3}, and I’m\n"
-	.string "{STR_VAR_1}’s no. {STR_VAR_2} apprentice.\p"
-	.string "Snivel…\p"
-	.string "I’m sorry!\n"
-	.string "This tension is making me cry…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7:: @ 82443E7
-	.string "{STR_VAR_3} advised me, so I have\n"
-	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244413:: @ 8244413
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
-	.string "Snivel…\n"
-	.string "Please, please team up with me!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B:: @ 824444B
-	.string "Oh, really? You will?\n"
-	.string "Awesome! Wicked! Awoooh!\p"
-	.string "Oh… I’m sorry…\n"
-	.string "I’m so happy, I’m crying…\p"
-	.string "I’ll go register right away.\n"
-	.string "Please don’t go away!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6:: @ 82444D6
-	.string "Oh, b-but…\n"
-	.string "Sob… Waaaaah!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF:: @ 82444EF
-	.string "Hi, there! I’m {STR_VAR_3}!\n"
-	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E:: @ 824451E
-	.string "{STR_VAR_3} recommended my crew.\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244549:: @ 8244549
-	.string "one {STR_VAR_2} with {STR_VAR_1},\n"
-	.string "that’s what I have! Cool, huh?\p"
-	.string "So come on!\n"
-	.string "Let’s form a tag team!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B:: @ 824459B
-	.string "Yay! Great!\n"
-	.string "Okay, I’ll go register, okay?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5:: @ 82445C5
-	.string "Aww, why?\n"
-	.string "I wanted to team up, {PLAYER}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8:: @ 82445E8
-	.string "I’m {STR_VAR_3}, the no. {STR_VAR_2} apprentice\n"
-	.string "of the famous {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244618:: @ 8244618
-	.string "I looked to {STR_VAR_3} for advice.\n"
-	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244643:: @ 8244643
-	.string "and one {STR_VAR_2} with {STR_VAR_1},\n"
-	.string "that’s my pair.\p"
-	.string "Please, will you join me in\n"
-	.string "a tag team?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F:: @ 824468F
-	.string "Thank you!\n"
-	.string "I’ll register right away!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4:: @ 82446B4
-	.string "{PLAYER}, I had been hoping to join\n"
-	.string "you in a tag team…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5:: @ 82446E5
-	.string "Um… I’m sincerely happy that you\n"
-	.string "would take the time to talk to me.\p"
-	.string "I’m {STR_VAR_3}.\n"
-	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D:: @ 824474D
-	.string "{STR_VAR_3} gave me advice.\n"
-	.string "I’m very grateful for it.\p"
-	.string "I have a team of one {STR_VAR_2}\n"
-	.string "with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E:: @ 824479E
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\n"
-	.string "I know I’m asking a lot…\p"
-	.string "I don’t think you’ll be willing to,\n"
-	.string "but may I join you as a partner?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C:: @ 824480C
-	.string "Really? I can’t believe it!\n"
-	.string "I can’t believe you’ll let me join you!\l"
-	.string "I… I won’t let you down!\p"
-	.string "Um… If it’s really okay, I’ll go register\n"
-	.string "right this instant!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7:: @ 82448A7
-	.string "Oh…\n"
-	.string "I didn’t think I was good enough…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD:: @ 82448CD
-	.string "Hi, I’m {STR_VAR_3}.\n"
-	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5:: @ 82448F5
-	.string "{STR_VAR_3} told me that it would be\n"
-	.string "good to make this team:\l"
-	.string "one {STR_VAR_1}-using {STR_VAR_2}$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244939:: @ 8244939
-	.string "and one {STR_VAR_2} that knows how\n"
-	.string "to use {STR_VAR_1}.\p"
-	.string "Not bad, huh?\n"
-	.string "Want me to team up with you?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244989:: @ 8244989
-	.string "Okay, glad to join you!\n"
-	.string "I hope you won’t mess things up for me!\l"
-	.string "I’ll do my registration now.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6:: @ 82449E6
-	.string "Huh? Why did you turn me down?\n"
-	.string "You’re no judge of character!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23:: @ 8244A23
-	.string "I’m {STR_VAR_3} and I’m a TRIATHLETE.\n"
-	.string "I’m busy every day what with jogging,\l"
-	.string "training, and rapping.\p"
-	.string "I also happen to be {STR_VAR_1}’s\n"
-	.string "no. {STR_VAR_2} apprentice.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9:: @ 8244AA9
-	.string "This is what {STR_VAR_3} recommended.\n"
-	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6:: @ 8244AD6
-	.string "and one {STR_VAR_1}-using\n"
-	.string "{STR_VAR_2}.\p"
-	.string "I put a lot of effort into raising\n"
-	.string "them, even though I’m busy.\p"
-	.string "Let’s form a tag team\n"
-	.string "and give it a go!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52:: @ 8244B52
-	.string "Thanks, that’s the spirit!\n"
-	.string "Hang tight while I go register, okay?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93:: @ 8244B93
-	.string "I took time from my busy schedule\n"
-	.string "to be here! Give me a break!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2:: @ 8244BD2
-	.string "Hi!\n"
-	.string "How’s it going?\p"
-	.string "I’m {STR_VAR_3}, {STR_VAR_1}’s\n"
-	.string "no. {STR_VAR_2} apprentice. Glad to meet you!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18:: @ 8244C18
-	.string "Listen, listen! You have to hear about\n"
-	.string "the POKéMON {STR_VAR_3} recommended.\l"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E:: @ 8244C6E
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\n"
-	.string "Of course I raised them superbly!\p"
-	.string "So, want to team up?\n"
-	.string "I’m sure it’ll be a great combo!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6:: @ 8244CD6
-	.string "Yay, I think this will be fun!\n"
-	.string "I’ll go register!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07:: @ 8244D07
-	.string "Oh, you’re mean!\n"
-	.string "I come recommended, you know.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36:: @ 8244D36
-	.string "Please let me introduce myself.\n"
-	.string "I am {STR_VAR_3}.\p"
-	.string "I serve as {STR_VAR_1}’s\n"
-	.string "no. {STR_VAR_2} apprentice.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82:: @ 8244D82
-	.string "I sought the sage advice of\n"
-	.string "{STR_VAR_3} and raised my team\l"
-	.string "of one {STR_VAR_2} with {STR_VAR_1}$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6:: @ 8244DC6
-	.string "and one {STR_VAR_2} with {STR_VAR_1}.\p"
-	.string "Please agree to a tag team with me!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE:: @ 8244DFE
-	.string "Oh… I’m delighted!\n"
-	.string "I promise to give you my best!\p"
-	.string "Of course I will register us!\n"
-	.string "Please wait!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B:: @ 8244E5B
-	.string "I had been hoping to join you,\n"
-	.string "{PLAYER}…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E:: @ 8244E7E
-	.string "Eek! You spoke to me!\n"
-	.string "I… I’m overjoyed!\p"
-	.string "I’m {STR_VAR_3}! I’m {STR_VAR_1}’s\n"
-	.string "no. {STR_VAR_2} apprentice!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA:: @ 8244ECA
-	.string "On {STR_VAR_3}’s advice, I trained\n"
-	.string "one {STR_VAR_1}-using {STR_VAR_2}$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4:: @ 8244EF4
-	.string "and one {STR_VAR_1}-using\n"
-	.string "{STR_VAR_2}.\p"
-	.string "Please, can you grant me my wish?\n"
-	.string "I want to be your tag-team partner!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F:: @ 8244F4F
-	.string "Eek! I… I feel giddy!\n"
-	.string "Thank you so much!\l"
-	.string "I’ll go register us right away!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98:: @ 8244F98
-	.string "Waaah! Don’t you feel any pity?\n"
-	.string "But that makes you cooler…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3:: @ 8244FD3
-	.string "Yeehaw! I’m {STR_VAR_1}’s\n"
-	.string "no. {STR_VAR_2} apprentice!\p"
-	.string "{STR_VAR_3}’s my name, hello, hello!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245013:: @ 8245013
-	.string "My mentor {STR_VAR_3} recommended\n"
-	.string "one {STR_VAR_1}-master {STR_VAR_2}$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D:: @ 824503D
-	.string "and one {STR_VAR_1}-master\n"
-	.string "{STR_VAR_2}.\p"
-	.string "Good stuff, huh?\n"
-	.string "You’ll partner with me, won’t you?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245087:: @ 8245087
-	.string "Okay, excellent!\n"
-	.string "I’ll get the registration done quickly!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0:: @ 82450C0
-	.string "Gwaaah!\n"
-	.string "You’re a calculating one, {PLAYER}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6:: @ 82450E6
-	.string "Hey! There’s big trouble! This is\n"
-	.string "the BATTLE TOWER’s last day!\p"
-	.string "… … … … … …\n"
-	.string "I’m only joking!\p"
-	.string "People call me {STR_VAR_3} and I do, too!\n"
-	.string "I’m {STR_VAR_1}’s 1,000th apprentice!\l"
-	.string "Actually, I’m no. {STR_VAR_2}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245196:: @ 8245196
-	.string "{STR_VAR_3} gave me some advice.\n"
-	.string "{STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD:: @ 82451BD
-	.string "{STR_VAR_2} with {STR_VAR_1}.\n"
-	.string "I’ve got ten of each kind!\l"
-	.string "Actually, just one of each!\p"
-	.string "How about it?\n"
-	.string "Want to try tag battles with me?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F:: @ 824522F
-	.string "Yippee!\n"
-	.string "I’ll give you a POKéMON as my thanks!\p"
-	.string "Just joking! But I will really go do\n"
-	.string "the registration, okay?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A:: @ 824529A
-	.string "Oh, that’s so cold! I’ll have to wreck\n"
-	.string "the BATTLE TOWER for that!\p"
-	.string "Of course I won’t!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF:: @ 82452EF
-	.string "Hey, there, I’m rockin’ and a-rollin’!\n"
-	.string "POKéMON, I be controllin’!\p"
-	.string "I’m {STR_VAR_3} the rappin’ SAILOR.\n"
-	.string "Don’t be mistakin’ me for no wailer!\p"
-	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n"
-	.string "Me, you shouldn’t be quick to dismiss!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4:: @ 82453B4
-	.string "With the advice of {STR_VAR_3} I did\n"
-	.string "abide, put together my team of pride!\l"
-	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245406:: @ 8245406
-	.string "and one {STR_VAR_1}-using\n"
-	.string "{STR_VAR_2}!\p"
-	.string "Our meeting we should commemorate,\n"
-	.string "with a tag-team victory to celebrate!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245464:: @ 8245464
-	.string "Hey, hey, I like your style!\n"
-	.string "Our registration, I will go file!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3:: @ 82454A3
-	.string "Oh, hey, {PLAYER}, now that’s cold!\n"
-	.string "If I may be so bold!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6:: @ 82454D6
-	.string "Yippee-yahoo!\n"
-	.string "Oh, don’t run! I was just having fun!\p"
-	.string "Howdy! I’m {STR_VAR_3}!\n"
-	.string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245535:: @ 8245535
-	.string "{STR_VAR_3} told me what to do.\n"
-	.string "So one {STR_VAR_1}-using {STR_VAR_2}$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F:: @ 824555F
-	.string "and one {STR_VAR_1}-using\n"
-	.string "{STR_VAR_2}, I did choose.\p"
-	.string "So, what do you say?\n"
-	.string "Come on, make my day!\p"
-	.string "Please, I’m begging you!\n"
-	.string "Let me join you, don’t leave me blue!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC:: @ 82455EC
-	.string "Yeahah! Luck is with me!\n"
-	.string "It sure makes me happy!\p"
-	.string "Before we go join the fray,\n"
-	.string "I’ll go register right away!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245656:: @ 8245656
-	.string "You’re turning me down?\n"
-	.string "{PLAYER}, you’re making me frown!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A:: @ 824568A
-	.string "Cough!\p"
-	.string "Oh, sorry, I have a cold.\n"
-	.string "My POKéMON are fine, though.\p"
-	.string "My name’s {STR_VAR_3}, {STR_VAR_1}’s\n"
-	.string "no. {STR_VAR_2} apprentice. Cough!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5:: @ 82456F5
-	.string "I took {STR_VAR_3}’s advice to heart\n"
-	.string "and put together my team of\l"
-	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245740:: @ 8245740
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
-	.string "I trained them every day,\n"
-	.string "even in wind and rain.\p"
-	.string "That’s why I have this cold,\n"
-	.string "I think.\p"
-	.string "That’s what I’m about.\n"
-	.string "Want to be my tag partner?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9:: @ 82457D9
-	.string "Thanks, I appreciate this!\n"
-	.string "Cough, cough!\l"
-	.string "Hang on while I go register.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F:: @ 824581F
-	.string "Oh, you won’t?\n"
-	.string "{PLAYER}, I think we’d make a good pair.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245851:: @ 8245851
-	.string "Oh, hello!\n"
-	.string "This is nerve-racking.\p"
-	.string "I’m {STR_VAR_3}.\n"
-	.string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C:: @ 824589C
-	.string "{STR_VAR_3} said this team’ll be good--\n"
-	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE:: @ 82458CE
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
-	.string "I’m feeling self-conscious about this,\n"
-	.string "but will you let me join you?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245923:: @ 8245923
-	.string "Oh, gee, thank you!\n"
-	.string "I feel bashful, but I’ll do my best!\p"
-	.string "I’ll go get the registration done.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F:: @ 824597F
-	.string "Oh, please don’t say no!\n"
-	.string "I feel self-conscious enough already…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE:: @ 82459BE
-	.string "I am {STR_VAR_3}, and that’s no lie.\n"
-	.string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7:: @ 82459F7
-	.string "{STR_VAR_3} recommended my team.\p"
-	.string "Since the advice sounded sincere,\n"
-	.string "I decided to bring with me\l"
-	.string "my {STR_VAR_1}-using {STR_VAR_2} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F:: @ 8245A5F
-	.string "my {STR_VAR_1}-using {STR_VAR_2}.\p"
-	.string "If possible, I would like you to accept\n"
-	.string "me as your tag-team partner.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4:: @ 8245AB4
-	.string "You really will accept me?\n"
-	.string "It would be too terrible otherwise.\p"
-	.string "But since you’ve agreed, this is fine.\n"
-	.string "I shall go register the both of us.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E:: @ 8245B3E
-	.string "Hm? Now why would you refuse?\n"
-	.string "Is this your idea of a joke?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79:: @ 8245B79
-	.string "I’m {STR_VAR_1}, and I’m a LASS!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91:: @ 8245B91
-	.string "What I have are one {STR_VAR_2}\n"
-	.string "that uses {STR_VAR_1} and one$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD:: @ 8245BBD
-	.string "{STR_VAR_2} that uses {STR_VAR_1}.\n"
-	.string "Those are what I have with me.\p"
-	.string "Will you be my partner?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05:: @ 8245C05
-	.string "Thank you!\n"
-	.string "I’ll go do the registration!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D:: @ 8245C2D
-	.string "You don’t want to be my partner?\n"
-	.string "You’ll regret it later!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66:: @ 8245C66
-	.string "Hello!\p"
-	.string "I’m YOUNGSTER {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F:: @ 8245C7F
-	.string "Want to know what I have?\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC:: @ 8245CAC
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "You’ll be my tag-team partner,\n"
-	.string "won’t you?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6:: @ 8245CE6
-	.string "Yay!\n"
-	.string "I’ll go and register, okay?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07:: @ 8245D07
-	.string "Aww! If you’d form a tag team with\n"
-	.string "my POKéMON, we’d be unstoppable!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B:: @ 8245D4B
-	.string "Yahoo!\n"
-	.string "I’m HIKER {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60:: @ 8245D60
-	.string "Know what I have with me?\n"
-	.string "My {STR_VAR_1}-using {STR_VAR_2} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D:: @ 8245D8D
-	.string "my {STR_VAR_1}-using {STR_VAR_2}!\p"
-	.string "Sounds good, eh?\n"
-	.string "Want to form a tag team?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7:: @ 8245DC7
-	.string "Yahoo!\n"
-	.string "I’ll go do the registering, then.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0:: @ 8245DF0
-	.string "I would’ve liked to battle with you\n"
-	.string "at my side.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20:: @ 8245E20
-	.string "Hello!\n"
-	.string "I’m {STR_VAR_1}, and I’m a BEAUTY!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41:: @ 8245E41
-	.string "Do you know what I’ve been raising?\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78:: @ 8245E78
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "What do you think?\n"
-	.string "Want to make a tag team together?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD:: @ 8245EBD
-	.string "Wonderful!\n"
-	.string "I’ll get the registration done now!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC:: @ 8245EEC
-	.string "How disappointing!\p"
-	.string "We two together--we would’ve been\n"
-	.string "the best!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B:: @ 8245F2B
-	.string "Yo!\p"
-	.string "You know who I am?\n"
-	.string "I’m {STR_VAR_1} the FISHERMAN!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58:: @ 8245F58
-	.string "I’ve got with me a team of one\n"
-	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87:: @ 8245F87
-	.string "one {STR_VAR_1}-using {STR_VAR_2}.\p"
-	.string "So, how about it?\n"
-	.string "Will you battle at my side?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6:: @ 8245FC6
-	.string "Good, good!\n"
-	.string "Leave it up to me!\p"
-	.string "I’ll go and register us now.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246002:: @ 8246002
-	.string "We matched up perfectly, too…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246020:: @ 8246020
-	.string "Glad to make your acquaintance.\n"
-	.string "I am {STR_VAR_1}, a LADY.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246051:: @ 8246051
-	.string "I am accompanied by a team of\n"
-	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246082:: @ 8246082
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
-	.string "I hope I meet your approval.\n"
-	.string "For I wish to have you as my partner.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5:: @ 82460D5
-	.string "I thank you sincerely.\n"
-	.string "I shall handle the registration.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D:: @ 824610D
-	.string "I’m sure that you will regret not\n"
-	.string "having me as your partner.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A:: @ 824614A
-	.string "I’m TRIATHLETE {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D:: @ 824615D
-	.string "What I have…\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D:: @ 824617D
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\n"
-	.string "That’s my pair!\p"
-	.string "Please?\n"
-	.string "Will you form a tag team with me?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7:: @ 82461C7
-	.string "Gee, thanks!\n"
-	.string "I’ll go register at the counter.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5:: @ 82461F5
-	.string "We two together, we would’ve been\n"
-	.string "tough for certain!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A:: @ 824622A
-	.string "Hiya!\n"
-	.string "I’m BUG CATCHER {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246244:: @ 8246244
-	.string "Check out what I have!\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E:: @ 824626E
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "So, listen!\n"
-	.string "Do you want to form a tag team?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA:: @ 82462AA
-	.string "Gotcha!\p"
-	.string "I’ll go do the registration stuff\n"
-	.string "at the counter.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4:: @ 82462E4
-	.string "Aww, my POKéMON are awesome.\n"
-	.string "I hope you won’t regret this!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F:: @ 824631F
-	.string "Good day!\n"
-	.string "I’m SCHOOL KID {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C:: @ 824633C
-	.string "What I’ve been raising are one\n"
-	.string "{STR_VAR_2} that uses {STR_VAR_1}$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B:: @ 824636B
-	.string "and one {STR_VAR_2} that uses\n"
-	.string "{STR_VAR_1}.\p"
-	.string "Not too bad, don’t you think?\n"
-	.string "Would you care to form a tag team?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5:: @ 82463C5
-	.string "Thank you very much!\n"
-	.string "I’ll get done with the registration.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF:: @ 82463FF
-	.string "That’s too bad…\p"
-	.string "I was hoping that I could learn\n"
-	.string "from you as your partner…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246449:: @ 8246449
-	.string "Yo! Let me tell you who I am!\n"
-	.string "I’m RICH BOY {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246478:: @ 8246478
-	.string "Guess what I got!\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D:: @ 824649D
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "I’m willing to offer you the chance\n"
-	.string "to be in a tag team with me.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE:: @ 82464EE
-	.string "Smart move!\p"
-	.string "I’ll finish up the registration\n"
-	.string "process quick!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246529:: @ 8246529
-	.string "You’d turn me of all people down?\n"
-	.string "You’ll regret that decision for sure!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246571:: @ 8246571
-	.string "Hiyah!\n"
-	.string "I am BLACK BELT {STR_VAR_1}.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C:: @ 824658C
-	.string "As my companions, I have\n"
-	.string "one {STR_VAR_2} using {STR_VAR_1}$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5:: @ 82465B5
-	.string "and one {STR_VAR_2} using\n"
-	.string "{STR_VAR_1}.\p"
-	.string "Please, grant me my wish!\n"
-	.string "Allow me to be your tag partner!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246605:: @ 8246605
-	.string "Hiyah!\n"
-	.string "I will go register forthwith!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A:: @ 824662A
-	.string "I see… I hope for an opportunity\n"
-	.string "the next time we meet…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246662:: @ 8246662
-	.string "Hi, there!\n"
-	.string "I’m {STR_VAR_1}, and I’m a TUBER!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246686:: @ 8246686
-	.string "I’ll tell you what I have.\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4:: @ 82466B4
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\n"
-	.string "May I please be on your tag team?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6:: @ 82466E6
-	.string "Thank you!\n"
-	.string "I’ll go register us now!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A:: @ 824670A
-	.string "If we’d become partners, we could\n"
-	.string "have been so strong!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246741:: @ 8246741
-	.string "Greetings…\n"
-	.string "I am HEX MANIAC {STR_VAR_1}…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246760:: @ 8246760
-	.string "I bear with me one {STR_VAR_1}-using\n"
-	.string "{STR_VAR_2} together with one$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246791:: @ 8246791
-	.string "{STR_VAR_1}-using {STR_VAR_2}…\p"
-	.string "I beseech you…\n"
-	.string "Join me in a tag team…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4:: @ 82467C4
-	.string "I thank you…\n"
-	.string "I shall register us…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6:: @ 82467E6
-	.string "I so longed to join you…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF:: @ 82467FF
-	.string "How do you do? I’m {STR_VAR_1},\n"
-	.string "and I’m a POKéMON BREEDER!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246831:: @ 8246831
-	.string "I’m raising a couple good ones!\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246864:: @ 8246864
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "How about it?\n"
-	.string "Feel like making a tag team with me?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7:: @ 82468A7
-	.string "Thank you kindly!\p"
-	.string "I’ll go take care of the registration\n"
-	.string "stuff, so you wait right here!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE:: @ 82468FE
-	.string "I was looking forward to being\n"
-	.string "your partner…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B:: @ 824692B
-	.string "Well, hello!\n"
-	.string "I’m TRIATHLETE {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B:: @ 824694B
-	.string "Want to know what I run with?\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C:: @ 824697C
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "Well?\n"
-	.string "Want to be in a tag team with me?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4:: @ 82469B4
-	.string "Good going!\p"
-	.string "I’ll be quick and get the registration\n"
-	.string "all done!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1:: @ 82469F1
-	.string "You and me, we would’ve been tops.\n"
-	.string "It’s too bad…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22:: @ 8246A22
-	.string "Hey, there! My name’s {STR_VAR_1}!\n"
-	.string "I’m a TRIATHLETE!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E:: @ 8246A4E
-	.string "I go on runs with my durable team--\n"
-	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85:: @ 8246A85
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "Not too shabby, huh?\n"
-	.string "We should be in a tag team together!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF:: @ 8246ACF
-	.string "All right!\n"
-	.string "I’ll go register in a flash!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7:: @ 8246AF7
-	.string "I really wanted to battle as your\n"
-	.string "tag-team partner…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B:: @ 8246B2B
-	.string "I’m BATTLE GIRL {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F:: @ 8246B3F
-	.string "I’ve been toughening up one\n"
-	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B:: @ 8246B6B
-	.string "one {STR_VAR_1}-using {STR_VAR_2}!\p"
-	.string "Do you like that combo?\n"
-	.string "How about you and me join up?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2:: @ 8246BB2
-	.string "Why, thanks!\p"
-	.string "I’ll get the registration done\n"
-	.string "right now!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9:: @ 8246BE9
-	.string "With you, I thought we could form\n"
-	.string "the ultimate tag team…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22:: @ 8246C22
-	.string "I’m TRIATHLETE {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35:: @ 8246C35
-	.string "I’ve been running with one {STR_VAR_2}\n"
-	.string "that knows how to use {STR_VAR_1}$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C:: @ 8246C6C
-	.string "and one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "We could be in a tag team.\n"
-	.string "Wouldn’t that be great?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3:: @ 8246CB3
-	.string "Thank you!\p"
-	.string "I’ll go register us, and that’s\n"
-	.string "right now!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9:: @ 8246CE9
-	.string "Aww, that’s too bad. We would’ve been\n"
-	.string "the toughest tag team around!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D:: @ 8246D2D
-	.string "Me?\n"
-	.string "I’m TUBER {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F:: @ 8246D3F
-	.string "What do I have with me?\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A:: @ 8246D6A
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "Hey?\n"
-	.string "You’ll team up with me, right?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E:: @ 8246D9E
-	.string "Okay!\p"
-	.string "I’ll go register!\n"
-	.string "Let’s be excellent together!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3:: @ 8246DD3
-	.string "My POKéMON are tough for sure…\n"
-	.string "It’s too bad you don’t want to team up.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A:: @ 8246E1A
-	.string "Yay-hey!\n"
-	.string "Call me GUITARIST {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39:: @ 8246E39
-	.string "Check out my entourage!\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64:: @ 8246E64
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "Yay-hey! Pretty wild, huh?\n"
-	.string "We’ll have to do a duet in a tag team!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6:: @ 8246EB6
-	.string "Yay-hey! Right on!\n"
-	.string "I’ll do that registration stuff now!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE:: @ 8246EEE
-	.string "My POKéMON rock hard!\n"
-	.string "You’ll be sorry, I tell you!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21:: @ 8246F21
-	.string "Pleased to meet you.\n"
-	.string "I am {STR_VAR_1}, a GENTLEMAN.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C:: @ 8246F4C
-	.string "I am accompanied by my trusted\n"
-	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B:: @ 8246F7B
-	.string "one {STR_VAR_1}-using {STR_VAR_2}.\p"
-	.string "May I ask you to join me in a tag-team\n"
-	.string "partnership arrangement?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC:: @ 8246FCC
-	.string "Ah, I thank you for your trust.\n"
-	.string "I shall be done with the registration.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247013:: @ 8247013
-	.string "That is most unfortunate…\p"
-	.string "I shall look forward to the next\n"
-	.string "opportunity…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B:: @ 824705B
-	.string "Hello, I’m {STR_VAR_1},\n"
-	.string "and I’m a POKéFAN.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D:: @ 824707D
-	.string "I have with me now one {STR_VAR_2}\n"
-	.string "that knows the move {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2:: @ 82470B2
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
-	.string "Do you like what you see?\n"
-	.string "Why don’t you be my tag partner?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD:: @ 82470FD
-	.string "Thank you!\n"
-	.string "I’ll look after the registration!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A:: @ 824712A
-	.string "My POKéMON are top grade…\n"
-	.string "It’s too bad you can’t appreciate that.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C:: @ 824716C
-	.string "Hm!\n"
-	.string "I am {STR_VAR_1}, and an EXPERT am I!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D:: @ 824718D
-	.string "The POKéMON that I’ve toughened up are\n"
-	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7:: @ 82471C7
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "What say you to a tag team with me?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB:: @ 82471FB
-	.string "Hm!\n"
-	.string "I shall register us right away!\l"
-	.string "Let us both do our best!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247238:: @ 8247238
-	.string "I will hope that your choice is\n"
-	.string "indeed correct…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247268:: @ 8247268
-	.string "Hello, hello.\n"
-	.string "I’m {STR_VAR_1}, and I’m an EXPERT.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247291:: @ 8247291
-	.string "I’ve raised my POKéMON thoroughly.\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7:: @ 82472C7
-	.string "one {STR_VAR_2} with {STR_VAR_1}--\n"
-	.string "they’re what I have.\p"
-	.string "Wouldn’t you like to team up with me?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247313:: @ 8247313
-	.string "Good, good.\n"
-	.string "I’ll see to the registration right away.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247348:: @ 8247348
-	.string "Perhaps we can form a team the next\n"
-	.string "time we meet.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A:: @ 824737A
-	.string "I’m DRAGON TAMER {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F:: @ 824738F
-	.string "The team I’ve been toughening up is\n"
-	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6:: @ 82473C6
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "How about it?\n"
-	.string "Want to be my partner?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB:: @ 82473FB
-	.string "Okay, I’ll give it my best!\n"
-	.string "I’ll go register now, all right?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247438:: @ 8247438
-	.string "You’re not going to find many tougher\n"
-	.string "partners than me!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247470:: @ 8247470
-	.string "I’m BIRD KEEPER {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247484:: @ 8247484
-	.string "What POKéMON do I have?\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF:: @ 82474AF
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
-	.string "Don’t you think we’d make a decent\n"
-	.string "tag team?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC:: @ 82474EC
-	.string "Great, thanks!\n"
-	.string "I’ll look after the registration!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D:: @ 824751D
-	.string "My POKéMON and I are strong.\n"
-	.string "What a letdown.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A:: @ 824754A
-	.string "I’m NINJA BOY {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C:: @ 824755C
-	.string "My POKéMON team consists of one\n"
-	.string "{STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B:: @ 824758B
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "Let’s be in a tag team together!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC:: @ 82475BC
-	.string "Yay!\n"
-	.string "Let me go register!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5:: @ 82475D5
-	.string "You’ll regret not having my tough\n"
-	.string "POKéMON on your side!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D:: @ 824760D
-	.string "Hello!\n"
-	.string "I’m PARASOL LADY {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247629:: @ 8247629
-	.string "Escorting me now are my {STR_VAR_2}\n"
-	.string "that uses {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247655:: @ 8247655
-	.string "one {STR_VAR_2} that uses\n"
-	.string "{STR_VAR_1}.\p"
-	.string "Aren’t they nice?\n"
-	.string "Care to join us in a tag team?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B:: @ 824769B
-	.string "Thanks a bunch!\p"
-	.string "I’ll go register at the counter.\n"
-	.string "Let’s not disappoint each other!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED:: @ 82476ED
-	.string "My POKéMON are tremendously strong.\n"
-	.string "How disappointing…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247724:: @ 8247724
-	.string "Hello.\n"
-	.string "I’m {STR_VAR_1}, and I’m a BUG MANIAC!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247749:: @ 8247749
-	.string "I have found my POKéMON, yes.\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A:: @ 824777A
-	.string "one {STR_VAR_2} with {STR_VAR_1}--\n"
-	.string "they are what I found.\p"
-	.string "Could I interest you in forming\n"
-	.string "a tag team?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE:: @ 82477CE
-	.string "Okay!\n"
-	.string "Understood!\p"
-	.string "I won’t be long with the registration!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247807:: @ 8247807
-	.string "With the POKéMON I found, we wouldn’t\n"
-	.string "have lost…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247838:: @ 8247838
-	.string "Ahoy, there!\n"
-	.string "I’m SAILOR {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247854:: @ 8247854
-	.string "Let me show you my pride and joy!\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247889:: @ 8247889
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "Of course you’re not going to turn\n"
-	.string "me down. We will team up, right?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD:: @ 82478DD
-	.string "I didn’t expect any less!\n"
-	.string "I’ll go register now.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D:: @ 824790D
-	.string "We would’ve stormed through\n"
-	.string "the opposition! Too bad!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247942:: @ 8247942
-	.string "Hi, I’m {STR_VAR_1}.\n"
-	.string "I’m a COLLECTOR.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F:: @ 824795F
-	.string "The jewels in my collection are\n"
-	.string "my {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247991:: @ 8247991
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "Swell, huh?\n"
-	.string "We should be in a team together.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE:: @ 82479CE
-	.string "Oh, yeah!\p"
-	.string "Well, let’s not waste any time.\n"
-	.string "I’ll go register the two of us.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18:: @ 8247A18
-	.string "Well, that’s upsetting.\n"
-	.string "You don’t appreciate my POKéMON.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51:: @ 8247A51
-	.string "Howdy, I’m {STR_VAR_1}.\n"
-	.string "I’m a POKéMON RANGER.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76:: @ 8247A76
-	.string "Keeping me company are one\n"
-	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1:: @ 8247AA1
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "Don’t you think we’d make an impressive\n"
-	.string "tag team?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3:: @ 8247AE3
-	.string "That’s super!\n"
-	.string "I’ll deal with the registration now.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16:: @ 8247B16
-	.string "Next time, choose my POKéMON,\n"
-	.string "will you?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E:: @ 8247B3E
-	.string "My name’s {STR_VAR_1}.\n"
-	.string "I’m a POKéMON RANGER!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62:: @ 8247B62
-	.string "Let me tell you about my team. I have\n"
-	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B:: @ 8247B9B
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "How would you like to form a tag team\n"
-	.string "with my little posse?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7:: @ 8247BE7
-	.string "We’ll be at our best!\n"
-	.string "I’ll get the registration done quick!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23:: @ 8247C23
-	.string "I hope you’ll choose my POKéMON\n"
-	.string "next time.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E:: @ 8247C4E
-	.string "Pleased to meet you. I’m {STR_VAR_1}.\n"
-	.string "I consider myself an AROMA LADY.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C:: @ 8247C8C
-	.string "I travel with one {STR_VAR_2}\n"
-	.string "that uses {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2:: @ 8247CB2
-	.string "one {STR_VAR_2} that uses\n"
-	.string "{STR_VAR_1}.\p"
-	.string "I hope they strike your fancy.\n"
-	.string "Would you care to be my partner?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07:: @ 8247D07
-	.string "I’m honored by your acceptance.\n"
-	.string "I will go register right this instant.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E:: @ 8247D4E
-	.string "It would be wonderful if we could form\n"
-	.string "a tag team the next time we meet.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97:: @ 8247D97
-	.string "Want to know who I am?\n"
-	.string "I’m {STR_VAR_1}, the RUIN MANIAC!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7:: @ 8247DC7
-	.string "The POKéMON that I have with me are\n"
-	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE:: @ 8247DFE
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "Intriguing, eh?\n"
-	.string "How about you and I partner up?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E:: @ 8247E3E
-	.string "That’s a sound decision!\n"
-	.string "I’ll go do the registration paperwork.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E:: @ 8247E7E
-	.string "Hmm…\n"
-	.string "I think my POKéMON are tough…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1:: @ 8247EA1
-	.string "I’m COOLTRAINER {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5:: @ 8247EB5
-	.string "The POKéMON I have right now are one\n"
-	.string "{STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9:: @ 8247EE9
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\n"
-	.string "Cool, huh?\p"
-	.string "Don’t you think it’d be pretty cool\n"
-	.string "if we made a tag team?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F:: @ 8247F3F
-	.string "Cool!\n"
-	.string "I’ll go do the registration in a flash!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D:: @ 8247F6D
-	.string "I thought that we’d make just\n"
-	.string "the greatest team ever.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3:: @ 8247FA3
-	.string "I’m COOLTRAINER {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7:: @ 8247FB7
-	.string "The team I’ve been raising has one\n"
-	.string "{STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9:: @ 8247FE9
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
-	.string "Does that sound okay?\n"
-	.string "How about we become tag partners?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248031:: @ 8248031
-	.string "Sounds A-OK!\n"
-	.string "I’d better do the registration.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E:: @ 824805E
-	.string "I was thinking how we would be\n"
-	.string "one tough team…$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D:: @ 824808D
-	.string "Heyo!\n"
-	.string "I’m {STR_VAR_1}, the POKéMANIAC!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB:: @ 82480AB
-	.string "What does a guy like me have?\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC:: @ 82480DC
-	.string "one {STR_VAR_2} with {STR_VAR_1},\n"
-	.string "that’s what!\p"
-	.string "Let’s do it!\n"
-	.string "We’ll stomp around as a tag team!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248128:: @ 8248128
-	.string "Good call!\n"
-	.string "I’ll register the both of us!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248151:: @ 8248151
-	.string "My POKéMON are brutal!\n"
-	.string "It’s not my fault if you regret this!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E:: @ 824818E
-	.string "Yo, there!\n"
-	.string "I’m KINDLER {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9:: @ 82481A9
-	.string "You know what my training cooked up?\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1:: @ 82481E1
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "Well, what do you say?\n"
-	.string "Want to form a tag team?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248221:: @ 8248221
-	.string "All right!\n"
-	.string "I’ll get on with the registration.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F:: @ 824824F
-	.string "Promise you’ll partner up with me\n"
-	.string "the next time we run into each other.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248297:: @ 8248297
-	.string "I’m {STR_VAR_1}, and I’m a CAMPER!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1:: @ 82482B1
-	.string "I’ve been raising one {STR_VAR_1}-\n"
-	.string "using {STR_VAR_2} and one$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC:: @ 82482DC
-	.string "{STR_VAR_1}-using {STR_VAR_2}.\p"
-	.string "Do you think it’d be fun to team up?\n"
-	.string "I bet it would be!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248321:: @ 8248321
-	.string "Yeah!\n"
-	.string "Off I go to register!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D:: @ 824833D
-	.string "Next time, okay?\n"
-	.string "I want to be on your team.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248369:: @ 8248369
-	.string "Hello!\n"
-	.string "I’m {STR_VAR_1}, and I’m a PICNICKER!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D:: @ 824838D
-	.string "The POKéMON I’ve been taking are\n"
-	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1:: @ 82483C1
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
-	.string "Are you interested in joining me\n"
-	.string "on a tag team?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248401:: @ 8248401
-	.string "Why, thank you!\n"
-	.string "I will do the registration now.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248431:: @ 8248431
-	.string "It would be nice if I could join you\n"
-	.string "some other time.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248467:: @ 8248467
-	.string "I’m PSYCHIC {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248477:: @ 8248477
-	.string "The twosome I’ve been raising are\n"
-	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC:: @ 82484AC
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
-	.string "Would you like to form a tag team\n"
-	.string "with me?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7:: @ 82484E7
-	.string "Sure thing!\n"
-	.string "I’ll take care of the registration!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248517:: @ 8248517
-	.string "If we meet again, that’s when I’d like\n"
-	.string "to team up with you.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248553:: @ 8248553
-	.string "I’m {STR_VAR_1}.\n"
-	.string "I’m a PSYCHIC.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A:: @ 824856A
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D:: @ 824857D
-	.string "one {STR_VAR_2} with {STR_VAR_1}--\n"
-	.string "they’re my disciples.\p"
-	.string "Doesn’t the idea of forming a tag-team\n"
-	.string "partnership intrigue you?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5:: @ 82485E5
-	.string "Thank you.\n"
-	.string "I’ll go deal with the registration.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248614:: @ 8248614
-	.string "I hope there will be another chance\n"
-	.string "to forge an alliance.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E:: @ 824864E
-	.string "I’m SCHOOL KID {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248661:: @ 8248661
-	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248671:: @ 8248671
-	.string "and one {STR_VAR_1}-using\n"
-	.string "{STR_VAR_2} are my POKéMON pair.\p"
-	.string "May I please be your partner on\n"
-	.string "a tag team?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6:: @ 82486C6
-	.string "Ooh, thank you!\n"
-	.string "I’ll register at the counter right away!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF:: @ 82486FF
-	.string "Please?\n"
-	.string "May I join you the next time?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248725:: @ 8248725
-	.string "Hiya! The name’s {STR_VAR_1}!\n"
-	.string "I’m a POKéMON BREEDER!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248751:: @ 8248751
-	.string "The POKéMON I’ve raised are one\n"
-	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248781:: @ 8248781
-	.string "one {STR_VAR_1}-using {STR_VAR_2}.\p"
-	.string "Sound interesting?\n"
-	.string "How about we form a tag team, then?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9:: @ 82487C9
-	.string "All righty!\n"
-	.string "You leave the registration to me!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7:: @ 82487F7
-	.string "You have to team up with me next time,\n"
-	.string "all right?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248829:: @ 8248829
-	.string "I’m {STR_VAR_1}, and I’m proud to say\n"
-	.string "that I am a POKéFAN.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B:: @ 824885B
-	.string "The darling POKéMON I’ve raised are\n"
-	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248892:: @ 8248892
-	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
-	.string "Aren’t they just the cutest?\n"
-	.string "We ought to make a team!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8:: @ 82488D8
-	.string "Thank you, dear!\n"
-	.string "I’ll be on my way to register!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248908:: @ 8248908
-	.string "My darling POKéMON are the best,\n"
-	.string "I’ll have you know. How annoying!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B:: @ 824894B
-	.string "Hi, I’m SWIMMER {STR_VAR_1}.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F:: @ 824895F
-	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F:: @ 824896F
-	.string "and one {STR_VAR_1}-using\n"
-	.string "{STR_VAR_2} are what I’ve trained.\p"
-	.string "You and me, let’s make a tag team.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD:: @ 82489BD
-	.string "That’s cool!\n"
-	.string "I’ll register the two of us.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7:: @ 82489E7
-	.string "If we meet again, you owe me\n"
-	.string "a tag team!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10:: @ 8248A10
-	.string "What’s happening?\n"
-	.string "I’m {STR_VAR_1}, and I’m a TRIATHLETE.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40:: @ 8248A40
-	.string "I got a couple decent POKéMON.\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72:: @ 8248A72
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "It’d be neat if we made a tag team\n"
-	.string "together, so how about it?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0:: @ 8248AC0
-	.string "Right on!\n"
-	.string "You wait while I register, okay?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB:: @ 8248AEB
-	.string "I expect you’ll let me join you\n"
-	.string "next time, how’s that?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22:: @ 8248B22
-	.string "I’m the TRIATHLETE {STR_VAR_1}!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39:: @ 8248B39
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C:: @ 8248B4C
-	.string "another {STR_VAR_2} that knows how\n"
-	.string "to use {STR_VAR_1}. That’s my pair.\p"
-	.string "What do you think?\n"
-	.string "We’d make a good team, I’d say.$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4:: @ 8248BB4
-	.string "I like that answer!\n"
-	.string "I’ll get done with registration fast!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE:: @ 8248BEE
-	.string "You’ll give me another chance to form\n"
-	.string "a partnership, won’t you?$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E:: @ 8248C2E
-	.string "Hi, there! Hello!\n"
-	.string "I’m {STR_VAR_1}, and I’m a SWIMMER!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B:: @ 8248C5B
-	.string "Check out what I’ve been raising!\n"
-	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90:: @ 8248C90
-	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
-	.string "Sweet, huh?\n"
-	.string "It’d be sweet to form a team, too!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF:: @ 8248CCF
-	.string "Much obliged!\n"
-	.string "I’ll get this registration thing done!$"
-
-BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04:: @ 8248D04
-	.string "If we meet again, you have to team up\n"
-	.string "with me. You’ll do that, right?$"
-
diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/scripts/maps/BattleFrontier_OutsideWest.inc
deleted file mode 100644
index fa2ff7e36..000000000
--- a/data/scripts/maps/BattleFrontier_OutsideWest.inc
+++ /dev/null
@@ -1,526 +0,0 @@
-BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1
-	map_script 3, BattleFrontier_OutsideWest_MapScript1_23D3E7
-	.byte 0
-
-BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7
-	setvar VAR_0x40BC, 0
-	setflag FLAG_0x396
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0
-	lock
-	faceplayer
-	msgbox BattleFrontier_OutsideWest_Text_23D808, 4
-	checkitem ITEM_SS_TICKET, 1
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_OutsideWest_EventScript_23D44E
-	message BattleFrontier_OutsideWest_Text_23D89D
-	waitmessage
-	goto BattleFrontier_OutsideWest_EventScript_23D416
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D416:: @ 823D416
-	multichoicedefault 18, 6, 53, 2, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_OutsideWest_EventScript_23D458
-	case 1, BattleFrontier_OutsideWest_EventScript_23D483
-	case 2, BattleFrontier_OutsideWest_EventScript_23D4D8
-	case 127, BattleFrontier_OutsideWest_EventScript_23D4D8
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E
-	msgbox BattleFrontier_OutsideWest_Text_23D842, 4
-	release
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458
-	msgbox BattleFrontier_OutsideWest_Text_23D8F2, 5
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE
-	msgbox BattleFrontier_OutsideWest_Text_23D94B, 4
-	call BattleFrontier_OutsideWest_EventScript_23D4BA
-	warp SLATEPORT_CITY_HARBOR, 255, 8, 11
-	waitstate
-	release
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483
-	msgbox BattleFrontier_OutsideWest_Text_23D90E, 5
-	compare VAR_RESULT, 0
-	goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE
-	msgbox BattleFrontier_OutsideWest_Text_23D94B, 4
-	call BattleFrontier_OutsideWest_EventScript_23D4BA
-	warp LILYCOVE_CITY_HARBOR, 255, 8, 11
-	waitstate
-	release
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE
-	message BattleFrontier_OutsideWest_Text_23D97A
-	waitmessage
-	goto BattleFrontier_OutsideWest_EventScript_23D416
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA
-	closemessage
-	applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA
-	waitmovement 0
-	delay 30
-	hideobjectat 3, BATTLE_FRONTIER_OUTSIDE_WEST
-	setvar VAR_0x8004, 2
-	call BattleFrontier_OutsideWest_EventScript_272250
-	return
-
-BattleFrontier_OutsideWest_EventScript_23D4D8:: @ 823D4D8
-	msgbox BattleFrontier_OutsideWest_Text_23D929, 4
-	release
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D4E2:: @ 823D4E2
-	msgbox BattleFrontier_OutsideWest_Text_23D6F7, 3
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D4EB:: @ 823D4EB
-	msgbox BattleFrontier_OutsideWest_Text_23D737, 3
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D4F4:: @ 823D4F4
-	msgbox BattleFrontier_OutsideWest_Text_23D772, 3
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D4FD:: @ 823D4FD
-	msgbox BattleFrontier_OutsideWest_Text_23D7A6, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D506:: @ 823D4FD
-	msgbox BattleFrontier_OutsideWest_Text_23D9DD, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D50F:: @ 823D50F
-	msgbox BattleFrontier_OutsideWest_Text_23D99C, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518
-	lock
-	faceplayer
-	message BattleFrontier_OutsideWest_Text_23DA60
-	waitmessage
-	applymovement 18, BattleFrontier_OutsideWest_Movement_2725A0
-	waitmovement 0
-	waitbuttonpress
-	release
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D52D:: @ 823D52D
-	msgbox BattleFrontier_OutsideWest_Text_23DABF, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D536:: @ 823D536
-	lock
-	goto BattleFrontier_OutsideWest_EventScript_23D544
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D
-	lock
-	goto BattleFrontier_OutsideWest_EventScript_23D544
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544
-	applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8
-	waitmovement 0
-	msgbox BattleFrontier_OutsideWest_Text_23DB7D, 4
-	applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4
-	waitmovement 0
-	msgbox BattleFrontier_OutsideWest_Text_23DBCE, 4
-	closemessage
-	delay 25
-	applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6
-	applymovement 10, BattleFrontier_OutsideWest_Movement_2725A6
-	waitmovement 0
-	release
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F
-	lock
-	faceplayer
-	delay 20
-	compare VAR_FACING, 2
-	call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA
-	compare VAR_FACING, 1
-	call_if 1, BattleFrontier_OutsideWest_EventScript_23D5C5
-	compare VAR_FACING, 3
-	call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA
-	compare VAR_FACING, 4
-	call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA
-	msgbox BattleFrontier_OutsideWest_Text_23DC36, 4
-	release
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA
-	applymovement 14, BattleFrontier_OutsideWest_Movement_2725A6
-	waitmovement 0
-	return
-
-BattleFrontier_OutsideWest_EventScript_23D5C5:: @ 823D5C5
-	return
-
-BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6
-	lock
-	faceplayer
-	message BattleFrontier_OutsideWest_Text_23DCB0
-	waitmessage
-	compare VAR_FACING, 2
-	call_if 1, BattleFrontier_OutsideWest_EventScript_23D5FD
-	compare VAR_FACING, 1
-	call_if 1, BattleFrontier_OutsideWest_EventScript_23D608
-	compare VAR_FACING, 3
-	call_if 1, BattleFrontier_OutsideWest_EventScript_23D613
-	compare VAR_FACING, 4
-	call_if 1, BattleFrontier_OutsideWest_EventScript_23D61E
-	waitbuttonpress
-	release
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D5FD:: @ 823D5FD
-	applymovement 12, BattleFrontier_OutsideWest_Movement_23D629
-	waitmovement 0
-	return
-
-BattleFrontier_OutsideWest_EventScript_23D608:: @ 823D608
-	applymovement 12, BattleFrontier_OutsideWest_Movement_23D62C
-	waitmovement 0
-	return
-
-BattleFrontier_OutsideWest_EventScript_23D613:: @ 823D613
-	applymovement 12, BattleFrontier_OutsideWest_Movement_23D62F
-	waitmovement 0
-	return
-
-BattleFrontier_OutsideWest_EventScript_23D61E:: @ 823D61E
-	applymovement 12, BattleFrontier_OutsideWest_Movement_23D632
-	waitmovement 0
-	return
-
-BattleFrontier_OutsideWest_Movement_23D629: @ 823D629
-	walk_in_place_fastest_down
-	walk_in_place_fastest_down
-	step_end
-
-BattleFrontier_OutsideWest_Movement_23D62C: @ 823D62C
-	walk_in_place_fastest_up
-	walk_in_place_fastest_up
-	step_end
-
-BattleFrontier_OutsideWest_Movement_23D62F: @ 823D62F
-	walk_in_place_fastest_right
-	walk_in_place_fastest_right
-	step_end
-
-BattleFrontier_OutsideWest_Movement_23D632: @ 823D632
-	walk_in_place_fastest_left
-	walk_in_place_fastest_left
-	step_end
-
-BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635
-	lock
-	faceplayer
-	msgbox BattleFrontier_OutsideWest_Text_23DD3B, 4
-	random 2
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_OutsideWest_EventScript_23D653
-	goto BattleFrontier_OutsideWest_EventScript_23D65D
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D653:: @ 823D653
-	msgbox BattleFrontier_OutsideWest_Text_23DD7A, 4
-	release
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D65D:: @ 823D65D
-	msgbox BattleFrontier_OutsideWest_Text_23DDAD, 4
-	release
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D667:: @ 823D667
-	msgbox BattleFrontier_OutsideWest_Text_23DE15, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D670:: @ 823D670
-	msgbox BattleFrontier_OutsideWest_Text_23DF7D, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D679:: @ 823D679
-	msgbox BattleFrontier_OutsideWest_Text_23DEFD, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D682:: @ 823D682
-	msgbox BattleFrontier_OutsideWest_Text_23DEB4, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D68B:: @ 823D68B
-	msgbox BattleFrontier_OutsideWest_Text_23DFBF, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D694:: @ 823D694
-	msgbox BattleFrontier_OutsideWest_Text_23E01E, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D69D:: @ 823D69D
-	msgbox BattleFrontier_OutsideWest_Text_23E09F, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D6A6:: @ 823D6A6
-	msgbox BattleFrontier_OutsideWest_Text_23E102, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D6AF:: @ 823D6AF
-	msgbox BattleFrontier_OutsideWest_Text_23E154, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D6B8:: @ 823D6B8
-	lock
-	msgbox BattleFrontier_OutsideWest_Text_23E273, 4
-	release
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D6C3:: @ 823D6C3
-	lock
-	msgbox BattleFrontier_OutsideWest_Text_23E2E9, 4
-	release
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D6CE:: @ 823D6CE
-	msgbox BattleFrontier_OutsideWest_Text_23E37E, 2
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7
-	lock
-	faceplayer
-	msgbox BattleFrontier_OutsideWest_Text_23E410, 4
-	closemessage
-	applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-BattleFrontier_OutsideWest_EventScript_23D6EE:: @ 823D6EE
-	msgbox BattleFrontier_OutsideWest_Text_23E5A5, 2
-	end
-
-BattleFrontier_OutsideWest_Text_23D6F7: @ 823D6F7
-	.string "This is the BATTLE DOME!\n"
-	.string "Your path to the invincible superstar!$"
-
-BattleFrontier_OutsideWest_Text_23D737: @ 823D737
-	.string "This is the BATTLE FACTORY!\n"
-	.string "Seek out the toughest POKéMON!$"
-
-BattleFrontier_OutsideWest_Text_23D772: @ 823D772
-	.string "This is the BATTLE PIKE!\n"
-	.string "Choose one of three paths!$"
-
-BattleFrontier_OutsideWest_Text_23D7A6: @ 823D7A6
-	.string "This is the BATTLE TOWER.\p"
-	.string "TRAINERS bring their best-raised\n"
-	.string "POKéMON for elimination-style matches.$"
-
-BattleFrontier_OutsideWest_Text_23D808: @ 823D808
-	.string "Hello, are you here for the ferry?\n"
-	.string "May I see your TICKET?$"
-
-BattleFrontier_OutsideWest_Text_23D842: @ 823D842
-	.string "{PLAYER} doesn’t have the TICKET…\p"
-	.string "I’m terribly sorry.\p"
-	.string "You must have a TICKET to board\n"
-	.string "the ferry.$"
-
-BattleFrontier_OutsideWest_Text_23D89D: @ 823D89D
-	.string "{PLAYER} flashed the TICKET.\p"
-	.string "Perfect! That’s all you need!\p"
-	.string "And where would you like to go?$"
-
-BattleFrontier_OutsideWest_Text_23D8F2: @ 823D8F2
-	.string "SLATEPORT CITY it is, then!$"
-
-BattleFrontier_OutsideWest_Text_23D90E: @ 823D90E
-	.string "LILYCOVE CITY it is, then!$"
-
-BattleFrontier_OutsideWest_Text_23D929: @ 823D929
-	.string "Please sail with us another time!$"
-
-BattleFrontier_OutsideWest_Text_23D94B: @ 823D94B
-	.string "Please board the ferry and wait for\n"
-	.string "departure.$"
-
-BattleFrontier_OutsideWest_Text_23D97A: @ 823D97A
-	.string "Then, where would you like to go?$"
-
-BattleFrontier_OutsideWest_Text_23D99C: @ 823D99C
-	.string "I’m the best out of all my friends.\n"
-	.string "But here…\l"
-	.string "I’ve been useless!$"
-
-BattleFrontier_OutsideWest_Text_23D9DD: @ 823D9DD
-	.string "I want to go to the BATTLE TOWER,\n"
-	.string "but I can’t find it even though I have\l"
-	.string "a map of the BATTLE FRONTIER.\p"
-	.string "This place is just too big!$"
-
-BattleFrontier_OutsideWest_Text_23DA60: @ 823DA60
-	.string "I wanted to take a challenge as soon\n"
-	.string "as I arrived here.\p"
-	.string "But on the way, I got seasick…\n"
-	.string "Urrrrp…$"
-
-BattleFrontier_OutsideWest_Text_23DABF: @ 823DABF
-	.string "It’s not as if just anyone can come\n"
-	.string "here, you know?\p"
-	.string "Only those TRAINERS who’ve been\n"
-	.string "recognized as tough are brought here.\p"
-	.string "That’s why many TRAINERS don’t even\n"
-	.string "know about the BATTLE FRONTIER.$"
-
-BattleFrontier_OutsideWest_Text_23DB7D: @ 823DB7D
-	.string "Hey, bro…\p"
-	.string "Are you sure we can make challenges\n"
-	.string "even if we don’t have any POKéMON?$"
-
-BattleFrontier_OutsideWest_Text_23DBCE: @ 823DBCE
-	.string "Uh…\n"
-	.string "I’m sure it’ll be okay.\p"
-	.string "I think…\p"
-	.string "But remember that big scary guy?\n"
-	.string "He said, “I’ll lend you POKéMON!”$"
-
-BattleFrontier_OutsideWest_Text_23DC36: @ 823DC36
-	.string "That’s the BATTLE FACTORY.\n"
-	.string "You can rent strong POKéMON there.\p"
-	.string "But it makes me wonder.\n"
-	.string "Who’s raising those rental POKéMON?$"
-
-BattleFrontier_OutsideWest_Text_23DCB0: @ 823DCB0
-	.string "I’m scared of going into the BATTLE\n"
-	.string "PIKE because of SEVIPER…\p"
-	.string "B-but I came all the way here, so I will\n"
-	.string "try to conquer everything!\l"
-	.string "…Shudder…$"
-
-BattleFrontier_OutsideWest_Text_23DD3B: @ 823DD3B
-	.string "Let’s play rock, paper, scissors!\n"
-	.string "One, two, three!\p"
-	.string "… … … … … …$"
-
-BattleFrontier_OutsideWest_Text_23DD7A: @ 823DD7A
-	.string "Yay! I won!\n"
-	.string "I will take the BATTLE PIKE challenge!$"
-
-BattleFrontier_OutsideWest_Text_23DDAD: @ 823DDAD
-	.string "Oh, no…\n"
-	.string "I lost.\p"
-	.string "I guess I’m not very lucky today.\n"
-	.string "I’ll put off my BATTLE PIKE challenge\l"
-	.string "until tomorrow.$"
-
-BattleFrontier_OutsideWest_Text_23DE15: @ 823DE15
-	.string "I believe I’m the only person here who,\n"
-	.string "for some unknown reason, would choose\l"
-	.string "fishing over battling.\p"
-	.string "Huh? You can’t catch anything here?\n"
-	.string "That’s disappointing…$"
-
-BattleFrontier_OutsideWest_Text_23DEB4: @ 823DEB4
-	.string "Today, I’m going to keep battling, no\n"
-	.string "matter what, until I get a Symbol.$"
-
-BattleFrontier_OutsideWest_Text_23DEFD: @ 823DEFD
-	.string "Oh? You’re off to challenge\n"
-	.string "the BATTLE DOME?\p"
-	.string "I’ll wish you the best of luck.\n"
-	.string "Let us both win our way up and meet\l"
-	.string "in challenges.$"
-
-BattleFrontier_OutsideWest_Text_23DF7D: @ 823DF7D
-	.string "Grandpa, over here!\n"
-	.string "The BATTLE DOME is here!\l"
-	.string "Go get ’em, Grandpa!$"
-
-BattleFrontier_OutsideWest_Text_23DFBF: @ 823DFBF
-	.string "Ah, so this here is the BATTLE DOME?\n"
-	.string "I won’t let GENTLEMEN beat me!\p"
-	.string "But where is the entrance?$"
-
-BattleFrontier_OutsideWest_Text_23E01E: @ 823E01E
-	.string "There used to be nothing here not all\n"
-	.string "that long ago.\p"
-	.string "But, now look at this place! Amazing!\n"
-	.string "I’ll bring my mother out to see this.$"
-
-BattleFrontier_OutsideWest_Text_23E09F: @ 823E09F
-	.string "I’ve finally arrived at the BATTLE\n"
-	.string "FRONTIER!\p"
-	.string "I’m sure to grab attention with\n"
-	.string "my looks and ability!$"
-
-BattleFrontier_OutsideWest_Text_23E102: @ 823E102
-	.string "Munch, munch…\p"
-	.string "It looks like this square’s filled with\n"
-	.string "tough people.\p"
-	.string "Munch, munch…$"
-
-BattleFrontier_OutsideWest_Text_23E154: @ 823E154
-	.string "Crunch, munch…\p"
-	.string "A while back, I met this older girl\n"
-	.string "at the BATTLE PIKE.\p"
-	.string "She had these eyes that were scary\n"
-	.string "in a real ornery way.\p"
-	.string "Crunch, munch…\p"
-	.string "She got all furious: “Will you quit\n"
-	.string "eating!” Then she whaled on me.\p"
-	.string "It was a hair-raising kind of\n"
-	.string "scary experience, sure enough.\p"
-	.string "Crunch, munch…$"
-
-BattleFrontier_OutsideWest_Text_23E273: @ 823E273
-	.string "Huh? Will you listen to yourself?\n"
-	.string "That’s nothing!\p"
-	.string "Why, the last time I cheered for him,\n"
-	.string "our eyes met and sparks flew!$"
-
-BattleFrontier_OutsideWest_Text_23E2E9: @ 823E2E9
-	.string "Whaaaaaat?!\n"
-	.string "Pfft!\p"
-	.string "That only happened because\n"
-	.string "I happened to be sitting next to you!\p"
-	.string "The DOME ACE only looked our way\n"
-	.string "because my cheering was so loud!$"
-
-BattleFrontier_OutsideWest_Text_23E37E: @ 823E37E
-	.string "Oh, shush!\n"
-	.string "Keep that racket down!\p"
-	.string "You fair-weather fans should stick\n"
-	.string "to cheering for some GYM LEADER!\p"
-	.string "The DOME ACE is mine!\n"
-	.string "The only idol for me!$"
-
-BattleFrontier_OutsideWest_Text_23E410: @ 823E410
-	.string "Those people squabbling over there…\p"
-	.string "It’s hard to believe, but they once\n"
-	.string "were TRAINERS, and good ones, too.\p"
-	.string "They used to be incredibly tough,\n"
-	.string "and they were famous, too.\p"
-	.string "But they were obliterated by this\n"
-	.string "certain TRAINER at a tournament.\p"
-	.string "They were so thoroughly whipped,\n"
-	.string "they became smitten by the TRAINER.\p"
-	.string "Now they’re just fans of the TRAINER.\n"
-	.string "They go cheer for their idol at the\l"
-	.string "BATTLE DOME every day now.$"
-
-BattleFrontier_OutsideWest_Text_23E5A5: @ 823E5A5
-	.string "I heard a rumor that someone saw\n"
-	.string "a POKéMON with an unusually long tail\l"
-	.string "somewhere in the BATTLE FRONTIER.\p"
-	.string "It must be adorable. I’m sure of it…\p"
-	.string "Oh, challenges can wait. I feel driven\n"
-	.string "to find the delightful creature!$"
-
diff --git a/data/scripts/maps/BirthIsland_Harbor.inc b/data/scripts/maps/BirthIsland_Harbor.inc
deleted file mode 100644
index bf82aa6d1..000000000
--- a/data/scripts/maps/BirthIsland_Harbor.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-BirthIsland_Harbor_MapScripts:: @ 826805C
-	.byte 0
-
-BirthIsland_Harbor_EventScript_26805D:: @ 826805D
-	lock
-	faceplayer
-	msgbox BirthIsland_Harbor_Text_2C6B90, 5
-	compare VAR_RESULT, 0
-	goto_eq BirthIsland_Harbor_EventScript_2680A2
-	msgbox BirthIsland_Harbor_Text_2A6A5D, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA
-	waitmovement 0
-	delay 30
-	hideobjectat 1, BIRTH_ISLAND_HARBOR
-	setvar VAR_0x8004, 2
-	call BirthIsland_Harbor_EventScript_272250
-	warp LILYCOVE_CITY_HARBOR, 255, 8, 11
-	waitstate
-	release
-	end
-
-BirthIsland_Harbor_EventScript_2680A2:: @ 82680A2
-	msgbox BirthIsland_Harbor_Text_2A6A82, 4
-	release
-	end
-
diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.inc b/data/scripts/maps/CaveOfOrigin_Entrance.inc
deleted file mode 100644
index a4b96a48f..000000000
--- a/data/scripts/maps/CaveOfOrigin_Entrance.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-CaveOfOrigin_Entrance_MapScripts:: @ 8235759
-	map_script 5, CaveOfOrigin_Entrance_MapScript1_23575F
-	.byte 0
-
-CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F
-	setescapewarp SOOTOPOLIS_CITY, 255, 31, 17
-	end
-
diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc
deleted file mode 100644
index 1edc1407d..000000000
--- a/data/scripts/maps/DewfordTown.inc
+++ /dev/null
@@ -1,805 +0,0 @@
-DewfordTown_MapScripts:: @ 81E9507
-	map_script 3, DewfordTown_MapScript1_1E950D
-	.byte 0
-
-DewfordTown_MapScript1_1E950D: @ 81E950D
-	setflag FLAG_VISITED_DEWFORD_TOWN
-	end
-
-DewfordTown_EventScript_1E9511:: @ 81E9511
-	lock
-	faceplayer
-	checkflag FLAG_0x0BD
-	goto_if 0, DewfordTown_EventScript_1E9585
-	message DewfordTown_Text_1E9C8A
-	waitmessage
-	multichoicedefault 21, 6, 0, 2, 0
-	switch VAR_RESULT
-	case 0, DewfordTown_EventScript_1E955A
-	case 1, DewfordTown_EventScript_1E956A
-	case 2, DewfordTown_EventScript_1E957A
-	case 127, DewfordTown_EventScript_1E957A
-	end
-
-DewfordTown_EventScript_1E955A:: @ 81E955A
-	msgbox DewfordTown_Text_1E9CE5, 4
-	closemessage
-	goto DewfordTown_EventScript_1E9660
-	release
-	end
-
-DewfordTown_EventScript_1E956A:: @ 81E956A
-	msgbox DewfordTown_Text_1E9D3A, 4
-	closemessage
-	goto DewfordTown_EventScript_1E96E7
-	release
-	end
-
-DewfordTown_EventScript_1E957A:: @ 81E957A
-	msgbox DewfordTown_Text_1E9D8F, 4
-	closemessage
-	release
-	end
-
-DewfordTown_EventScript_1E9585:: @ 81E9585
-	msgbox DewfordTown_Text_1E9B24, 5
-	compare VAR_RESULT, 1
-	goto_eq DewfordTown_EventScript_1E95A2
-	msgbox DewfordTown_Text_1E9BD9, 4
-	release
-	end
-
-DewfordTown_EventScript_1E95A2:: @ 81E95A2
-	msgbox DewfordTown_Text_1E9B7F, 4
-	closemessage
-	goto DewfordTown_EventScript_1E9660
-	end
-
-DewfordTown_EventScript_1E95B1:: @ 81E95B1
-	msgbox DewfordTown_Text_1E99A8, 2
-	end
-
-DewfordTown_EventScript_1E95BA:: @ 81E95BA
-	msgbox DewfordTown_Text_1E9A0F, 3
-	end
-
-DewfordTown_EventScript_1E95C3:: @ 81E95C3
-	msgbox DewfordTown_Text_1E9A3D, 3
-	end
-
-DewfordTown_EventScript_1E95CC:: @ 81E95CC
-	msgbox DewfordTown_Text_1E9A7F, 3
-	end
-
-DewfordTown_EventScript_1E95D5:: @ 81E95D5
-	lock
-	faceplayer
-	checkflag FLAG_0x101
-	goto_eq DewfordTown_EventScript_1E962A
-	msgbox DewfordTown_Text_1E9DD1, 5
-	compare VAR_RESULT, 1
-	goto_eq DewfordTown_EventScript_1E95FF
-	compare VAR_RESULT, 0
-	goto_eq DewfordTown_EventScript_1E9620
-	end
-
-DewfordTown_EventScript_1E95FF:: @ 81E95FF
-	msgbox DewfordTown_Text_1E9E14, 4
-	giveitem_std ITEM_OLD_ROD
-	setflag FLAG_0x101
-	msgbox DewfordTown_Text_1E9E65, 4
-	release
-	end
-
-DewfordTown_EventScript_1E9620:: @ 81E9620
-	msgbox DewfordTown_Text_1E9F92, 4
-	release
-	end
-
-DewfordTown_EventScript_1E962A:: @ 81E962A
-	message DewfordTown_Text_1E9FB8
-	waitmessage
-	multichoice 20, 8, 50, 1
-	compare VAR_RESULT, 0
-	goto_eq DewfordTown_EventScript_1E964C
-	compare VAR_RESULT, 1
-	goto_eq DewfordTown_EventScript_1E9656
-	end
-
-DewfordTown_EventScript_1E964C:: @ 81E964C
-	msgbox DewfordTown_Text_1E9FD0, 4
-	release
-	end
-
-DewfordTown_EventScript_1E9656:: @ 81E9656
-	msgbox DewfordTown_Text_1EA004, 4
-	release
-	end
-
-DewfordTown_EventScript_1E9660:: @ 81E9660
-	call DewfordTown_EventScript_271E95
-	setobjectpriority 2, DEWFORD_TOWN, 0
-	setobjectpriority 255, DEWFORD_TOWN, 0
-	applymovement 2, DewfordTown_Movement_1E991D
-	waitmovement 0
-	removeobject 2
-	applymovement 255, DewfordTown_Movement_1E9911
-	waitmovement 0
-	hideobjectat 255, DEWFORD_TOWN
-	call DewfordTown_EventScript_2720A0
-	applymovement 4, DewfordTown_Movement_1E97A2
-	applymovement 255, DewfordTown_Movement_1E97A2
-	waitmovement 0
-	showobjectat 255, ROUTE_104
-	call DewfordTown_EventScript_2720A8
-	applymovement 255, DewfordTown_Movement_1E9914
-	waitmovement 0
-	showobjectat 255, ROUTE_104
-	clearflag FLAG_0x2E3
-	clearflag FLAG_0x371
-	clearflag FLAG_0x2E6
-	setflag FLAG_0x2E7
-	hideobjectat 4, DEWFORD_TOWN
-	setvar VAR_0x408E, 2
-	resetobjectpriority 255, DEWFORD_TOWN
-	warp ROUTE_104_MR_BRINEYS_HOUSE, 255, 5, 4
-	copyvar VAR_0x4096, VAR_0x8008
-	waitstate
-	release
-	end
-
-DewfordTown_EventScript_1E96E7:: @ 81E96E7
-	call DewfordTown_EventScript_271E95
-	setobjectpriority 2, DEWFORD_TOWN, 0
-	setobjectpriority 255, DEWFORD_TOWN, 1
-	applymovement 2, DewfordTown_Movement_1E991D
-	waitmovement 0
-	removeobject 2
-	applymovement 255, DewfordTown_Movement_1E9911
-	waitmovement 0
-	hideobjectat 255, DEWFORD_TOWN
-	call DewfordTown_EventScript_2720A0
-	applymovement 4, DewfordTown_Movement_1E9865
-	applymovement 255, DewfordTown_Movement_1E9865
-	waitmovement 0
-	call DewfordTown_EventScript_2720A8
-	showobjectat 255, ROUTE_109
-	applymovement 255, DewfordTown_Movement_1E9918
-	waitmovement 0
-	setobjectxyperm 2, 21, 26
-	addobject 2
-	setobjectpriority 2, ROUTE_109, 0
-	applymovement 2, DewfordTown_Movement_1E991F
-	waitmovement 0
-	clearflag FLAG_0x2E5
-	addobject 1
-	clearflag FLAG_0x2E8
-	setflag FLAG_0x2E7
-	hideobjectat 4, DEWFORD_TOWN
-	checkflag FLAG_0x095
-	call_if 0, DewfordTown_EventScript_1E9790
-	checkflag FLAG_0x095
-	call_if 1, DewfordTown_EventScript_1E9799
-	closemessage
-	copyvar VAR_0x4096, VAR_0x8008
-	resetobjectpriority 255, DEWFORD_TOWN
-	resetobjectpriority 2, ROUTE_109
-	moveobjectoffscreen 2
-	release
-	end
-
-DewfordTown_EventScript_1E9790:: @ 81E9790
-	msgbox DewfordTown_Text_1EEC1D, 4
-	return
-
-DewfordTown_EventScript_1E9799:: @ 81E9799
-	msgbox DewfordTown_Text_1EEDA7, 4
-	return
-
-DewfordTown_Movement_1E97A2: @ 81E97A2
-	walk_up
-	walk_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_up
-	walk_up
-	walk_left
-	walk_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_left
-	walk_fast_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_up
-	walk_fast_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-DewfordTown_Movement_1E9865: @ 81E9865
-	walk_right
-	walk_fast_right
-	walk_fast_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	walk_fast_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	step_end
-
-DewfordTown_Movement_1E9911: @ 81E9911
-	walk_right
-	walk_up
-	step_end
-
-DewfordTown_Movement_1E9914: @ 81E9914
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-DewfordTown_Movement_1E9918: @ 81E9918
-	walk_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_down
-	step_end
-
-DewfordTown_Movement_1E991D: @ 81E991D
-	walk_up
-	step_end
-
-DewfordTown_Movement_1E991F: @ 81E991F
-	walk_up
-	walk_up
-	step_end
-
-DewfordTown_EventScript_1E9922:: @ 81E9922
-	lock
-	faceplayer
-	call DewfordTown_EventScript_271E8B
-	msgbox DewfordTown_Text_1EA136, 5
-	compare VAR_RESULT, 1
-	goto_eq DewfordTown_EventScript_1E9948
-	compare VAR_RESULT, 0
-	goto_eq DewfordTown_EventScript_1E9952
-	end
-
-DewfordTown_EventScript_1E9948:: @ 81E9948
-	msgbox DewfordTown_Text_1EA491, 4
-	release
-	end
-
-DewfordTown_EventScript_1E9952:: @ 81E9952
-	msgbox DewfordTown_Text_1EA242, 4
-	setvar VAR_0x8004, 9
-	call DewfordTown_EventScript_271E7C
-	lock
-	faceplayer
-	compare VAR_RESULT, 1
-	goto_eq DewfordTown_EventScript_1E997D
-	compare VAR_RESULT, 0
-	goto_eq DewfordTown_EventScript_1E9994
-	end
-
-DewfordTown_EventScript_1E997D:: @ 81E997D
-	incrementgamestat 2
-	compare VAR_0x8004, 0
-	goto_eq DewfordTown_EventScript_1E999E
-	msgbox DewfordTown_Text_1EA2AA, 4
-	release
-	end
-
-DewfordTown_EventScript_1E9994:: @ 81E9994
-	msgbox DewfordTown_Text_1EA443, 4
-	release
-	end
-
-DewfordTown_EventScript_1E999E:: @ 81E999E
-	msgbox DewfordTown_Text_1EA3FE, 4
-	release
-	end
-
-DewfordTown_Text_1E99A8: @ 81E99A8
-	.string "DEWFORD is a tiny island community.\n"
-	.string "If something gets trendy here,\l"
-	.string "everyone picks up on it right away.$"
-
-DewfordTown_Text_1E9A0F: @ 81E9A0F
-	.string "DEWFORD TOWN\n"
-	.string "“A tiny island in the blue sea.”$"
-
-DewfordTown_Text_1E9A3D: @ 81E9A3D
-	.string "DEWFORD TOWN POKéMON GYM\n"
-	.string "LEADER: BRAWLY\l"
-	.string "“A big wave in fighting!”$"
-
-DewfordTown_Text_1E9A7F: @ 81E9A7F
-	.string "DEWFORD HALL\n"
-	.string "“Everyone’s information exchange!”$"
-
-Route104_Text_1E9AAF: @ 81E9AAF
-	.string "MR. BRINEY: Ahoy!\n"
-	.string "We’ve hit land in DEWFORD.\p"
-	.string "I suppose you’re off to deliver that\n"
-	.string "LETTER to, who was it now, STEVEN!$"
-
-DewfordTown_Text_1E9B24: @ 81E9B24
-	.string "MR. BRINEY: Have you delivered your\n"
-	.string "LETTER?\p"
-	.string "Or were you meaning to sail back to\n"
-	.string "PETALBURG?$"
-
-DewfordTown_Text_1E9B7F: @ 81E9B7F
-	.string "MR. BRINEY: PETALBURG it is, then!\p"
-	.string "Anchors aweigh!\n"
-	.string "PEEKO, we’re setting sail, my darling!$"
-
-DewfordTown_Text_1E9BD9: @ 81E9BD9
-	.string "MR. BRINEY: Then you go on and deliver\n"
-	.string "the LETTER. I’ll be waiting.$"
-
-Route104_Text_1E9C1D: @ 81E9C1D
-Route109_Text_1E9C1D: @ 81E9C1D
-	.string "MR. BRINEY: Ahoy!\n"
-	.string "We’ve hit land in DEWFORD!\p"
-	.string "You just go on and tell me whenever\n"
-	.string "you want to set sail again!$"
-
-DewfordTown_Text_1E9C8A: @ 81E9C8A
-	.string "MR. BRINEY: Ahoy!\n"
-	.string "For you, I’ll go out to sea anytime!\p"
-	.string "Now, my friend, where are we bound?$"
-
-DewfordTown_Text_1E9CE5: @ 81E9CE5
-	.string "MR. BRINEY: PETALBURG, is it?\p"
-	.string "Anchors aweigh!\n"
-	.string "PEEKO, we’re setting sail, my darling!$"
-
-DewfordTown_Text_1E9D3A: @ 81E9D3A
-	.string "MR. BRINEY: SLATEPORT, is it?\p"
-	.string "Anchors aweigh!\n"
-	.string "PEEKO, we’re setting sail, my darling!$"
-
-DewfordTown_Text_1E9D8F: @ 81E9D8F
-	.string "MR. BRINEY: You just tell me whenever\n"
-	.string "you need to set sail again!$"
-
-DewfordTown_Text_1E9DD1: @ 81E9DD1
-	.string "This is a renowned fishing spot.\n"
-	.string "Are you getting the itch to fish?$"
-
-DewfordTown_Text_1E9E14: @ 81E9E14
-	.string "I hear you, and I like what\n"
-	.string "you’re saying!\p"
-	.string "I’ll give you one of my fishing RODS.$"
-
-DewfordTown_Text_1E9E65: @ 81E9E65
-	.string "And, as an added bonus, I’ll even throw\n"
-	.string "in a little fishing advice!\p"
-	.string "First, you want to face the water,\n"
-	.string "then use the ROD.\p"
-	.string "Focus your mind…\n"
-	.string "If you get a bite, pull on the ROD.\p"
-	.string "Sometimes you can snag something\n"
-	.string "immediately, but with bigger catches,\l"
-	.string "you need to time the pulls on your ROD\l"
-	.string "to haul them in.$"
-
-DewfordTown_Text_1E9F92: @ 81E9F92
-	.string "Oh, is that so?\n"
-	.string "That’s too bad, then.$"
-
-DewfordTown_Text_1E9FB8: @ 81E9FB8
-	.string "Yo!\n"
-	.string "How’s your fishing?$"
-
-DewfordTown_Text_1E9FD0: @ 81E9FD0
-	.string "Is that right! That’s great!\n"
-	.string "Haul in some big ones!$"
-
-DewfordTown_Text_1EA004: @ 81EA004
-	.string "Oh, hey, don’t get down on yourself!\n"
-	.string "I’ll give you a little fishing advice.\p"
-	.string "First, you want to face the water,\n"
-	.string "then use the ROD.\p"
-	.string "Focus your mind…\n"
-	.string "If you get a bite, pull the ROD.\p"
-	.string "Sometimes you can snag something\n"
-	.string "immediately, but with bigger catches,\l"
-	.string "you need to time the pulls on your ROD\l"
-	.string "to haul them in.$"
-
-DewfordTown_Text_1EA136: @ 81EA136
-	.string "I like what’s hip, happening, and trendy.\n"
-	.string "I’m always checking it out.\p"
-	.string "Listen, have you heard about this new\n"
-	.string "“{STR_VAR_1}”?\p"
-	.string "That’s right!\n"
-	.string "Of course you know!\p"
-	.string "I mean, sheesh,\n"
-	.string "“{STR_VAR_1}”…\l"
-	.string "It’s the hottest thing in cool!\p"
-	.string "Wherever you’re from,\n"
-	.string "“{STR_VAR_1}”\l"
-	.string "is the biggest happening thing, right?$"
-
-DewfordTown_Text_1EA242: @ 81EA242
-	.string "Hunh?\n"
-	.string "It’s not the hip and happening thing?\p"
-	.string "Well, hey, you have to tell me,\n"
-	.string "what’s new and what’s “in”?$"
-
-DewfordTown_Text_1EA2AA: @ 81EA2AA
-	.string "Hunh?\n"
-	.string "“{STR_VAR_2}”?\p"
-	.string "… …\p"
-	.string "…Uh… Yeah! That’s right!\n"
-	.string "Yeah, I knew that! Knew it all along!\p"
-	.string "Of course I know about that!\n"
-	.string "“{STR_VAR_2},” right?\p"
-	.string "Yeah, that’s it, it’s there!\n"
-	.string "Isn’t “{STR_VAR_2}”\l"
-	.string "the coolest, or what?\p"
-	.string "It’s the hippest thing in hip.\n"
-	.string "You think I’d not know about it?\p"
-	.string "“{STR_VAR_1}”…\n"
-	.string "It’s, like, so five minutes ago.\p"
-	.string "Now, “{STR_VAR_2}” is\n"
-	.string "what’s vital and in tune with the times!$"
-
-DewfordTown_Text_1EA3FE: @ 81EA3FE
-	.string "Hmm…\n"
-	.string "“{STR_VAR_2},” huh?\p"
-	.string "But personally, I think\n"
-	.string "“{STR_VAR_1}”\l"
-	.string "is what’s real in cool.$"
-
-DewfordTown_Text_1EA443: @ 81EA443
-	.string "Well, if you hear of any happening new\n"
-	.string "trends, come share them with me, okay?$"
-
-DewfordTown_Text_1EA491: @ 81EA491
-	.string "Yeah, absolutely right!\p"
-	.string "“{STR_VAR_1}” is the\n"
-	.string "definition of “in” right now.$"
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
deleted file mode 100644
index bed242a2b..000000000
--- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
+++ /dev/null
@@ -1,346 +0,0 @@
-EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF
-	map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_2289FF
-	map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_228A05
-	map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_228A14
-	.byte 0
-
-EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF
-	call EverGrandeCity_ChampionsRoom_EventScript_271ED7
-	end
-
-EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A0F
-	.2byte 0
-
-EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F
-	turnobject 255, 2
-	end
-
-EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A1E
-	.2byte 0
-
-EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E
-	lockall
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725C1
-	waitmovement 0
-	delay 40
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228A42
-	waitmovement 0
-	setvar VAR_TEMP_1, 1
-	goto EverGrandeCity_ChampionsRoom_EventScript_228A45
-    releaseall
-    end
-
-EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42
-	walk_up
-	walk_up
-	step_end
-
-EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45
-	playbgm MUS_DAIGO, 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, 4
-	trainerbattle 3, TRAINER_WALLACE, 0, EverGrandeCity_ChampionsRoom_Text_228EAC
-	goto EverGrandeCity_ChampionsRoom_EventScript_228A61
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61
-	playse SE_DOOR
-	setmetatile 6, 1, 838, 0
-	setmetatile 6, 2, 839, 0
-	special DrawWholeMapView
-	msgbox EverGrandeCity_ChampionsRoom_Text_228F66, 4
-	closemessage
-	playse SE_DOOR
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228ABC
-	compare VAR_RESULT, 1
-	call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228AC1
-	addobject 2
-	call EverGrandeCity_ChampionsRoom_EventScript_228BFD
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6
-	compare VAR_RESULT, 1
-	goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_228ABC:: @ 8228ABC
-	playbgm MUS_GIRL_SUP, 0
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_228AC1:: @ 8228AC1
-	playbgm MUS_BOY_SUP, 0
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6
-	msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, 4
-	delay 40
-	playse SE_PIN
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598
-	waitmovement 0
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A
-	waitmovement 0
-	call EverGrandeCity_ChampionsRoom_EventScript_228C12
-	msgbox EverGrandeCity_ChampionsRoom_Text_22910B, 4
-	goto EverGrandeCity_ChampionsRoom_EventScript_228B30
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB
-	msgbox EverGrandeCity_ChampionsRoom_Text_229152, 4
-	delay 40
-	playse SE_PIN
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598
-	waitmovement 0
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A
-	waitmovement 0
-	call EverGrandeCity_ChampionsRoom_EventScript_228C12
-	msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, 4
-	goto EverGrandeCity_ChampionsRoom_EventScript_228B30
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
-	closemessage
-	addobject 3
-	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43
-	waitmovement 0
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A8
-	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, 4
-	call EverGrandeCity_ChampionsRoom_EventScript_272184
-	msgbox EverGrandeCity_ChampionsRoom_Text_22934D, 4
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6
-	waitmovement 0
-	delay 20
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA
-	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_229399, 4
-	closemessage
-	delay 30
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C1D
-	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_2725A6
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38
-	waitmovement 0
-	delay 20
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725AA
-	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, 4
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BEB
-	compare VAR_RESULT, 1
-	call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BF4
-	closemessage
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C20
-	waitmovement 0
-	setflag FLAG_0x30D
-	warp EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
-	waitstate
-	releaseall
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_228BEB:: @ 8228BEB
-	msgbox EverGrandeCity_ChampionsRoom_Text_229479, 4
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4
-	msgbox EverGrandeCity_ChampionsRoom_Text_2294F5, 4
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26
-	waitmovement 0
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A4
-	waitmovement 0
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_228C12:: @ 8228C12
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C2F
-	waitmovement 0
-	return
-
-EverGrandeCity_ChampionsRoom_Movement_228C1D: @ 8228C1D
-	walk_up
-	walk_up
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20
-	walk_up
-	delay_16
-	walk_up
-	delay_8
-	set_invisible
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_left
-	walk_up
-	walk_in_place_fastest_right
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F
-	walk_in_place_fastest_up
-	delay_16
-	walk_in_place_fastest_right
-	delay_16
-	walk_in_place_fastest_up
-	delay_8
-	walk_in_place_fastest_right
-	delay_16
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_228C38: @ 8228C38
-	walk_right
-	walk_up
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_228C3B: @ 8228C3B
-	walk_up
-	walk_up
-	walk_in_place_fastest_down
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_228C3F: @ 8228C3F
-	walk_up
-	delay_8
-	set_invisible
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_up
-	walk_in_place_fastest_left
-	step_end
-
-EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C
-	.string "WALLACE: Welcome, {PLAYER}{KUN}.\p"
-	.string "That incident in SOOTOPOLIS CITY…\n"
-	.string "That was superb work, putting an end\l"
-	.string "to that crisis all by yourself.\p"
-	.string "Oops!\p"
-	.string "It wouldn’t be fair to say that you\n"
-	.string "alone ended the crisis.\p"
-	.string "You overcame that difficult situation\n"
-	.string "by working as one with your POKéMON.\p"
-	.string "We TRAINERS raise POKéMON by giving\n"
-	.string "them items and by teaching them new\l"
-	.string "techniques for battle.\p"
-	.string "But we ourselves also learn many\n"
-	.string "things from POKéMON.\p"
-	.string "And this is where your achievements\n"
-	.string "are put to the test against what\l"
-	.string "others like you have achieved.\p"
-	.string "Now!\p"
-	.string "Who can most elegantly dance with\n"
-	.string "their POKéMON in HOENN?\p"
-	.string "Show me right here and now!$"
-
-EverGrandeCity_ChampionsRoom_Text_228EAC: @ 8228EAC
-	.string "I, the CHAMPION, fall in defeat…\p"
-	.string "That was wonderful work.\n"
-	.string "You were elegant, infuriatingly so.\l"
-	.string "And yet it was utterly glorious!\p"
-	.string "Kudos to you, {PLAYER}{KUN}!\p"
-	.string "You are a truly noble POKéMON\n"
-	.string "TRAINER!$"
-
-EverGrandeCity_ChampionsRoom_Text_228F66: @ 8228F66
-	.string "WALLACE: The POKéMON you sent into\n"
-	.string "battle…\p"
-	.string "At times they danced like a spring\n"
-	.string "breeze, and at times they struck\l"
-	.string "like lightning.\p"
-	.string "It was with light, yet surefooted,\n"
-	.string "elegance that you led your POKéMON.\p"
-	.string "Even I felt bedazzled by your\n"
-	.string "masterful performance!\p"
-	.string "You now stand at the glorious peak\n"
-	.string "of the POKéMON LEAGUE.\p"
-	.string "I now proclaim you to be the new\n"
-	.string "HOENN region…$"
-
-EverGrandeCity_ChampionsRoom_Text_2290CA: @ 82290CA
-	.string "MAY: {PLAYER}{KUN}!\p"
-	.string "Here’s some advice before you challenge\n"
-	.string "the CHAMPION…$"
-
-EverGrandeCity_ChampionsRoom_Text_22910B: @ 822910B
-	.string "MAY: Huh?\n"
-	.string "What, what, what?\p"
-	.string "{PLAYER}{KUN}…\n"
-	.string "Could it be that…\l"
-	.string "It’s already over?$"
-
-EverGrandeCity_ChampionsRoom_Text_229152: @ 8229152
-	.string "BRENDAN: {PLAYER}!\p"
-	.string "How would you like some advice before\n"
-	.string "you challenge the CHAMPION?…$"
-
-EverGrandeCity_ChampionsRoom_Text_2291A2: @ 82291A2
-	.string "BRENDAN: {PLAYER}…\p"
-	.string "Are you trying to tell me…\n"
-	.string "You’ve beaten the CHAMPION?$"
-
-EverGrandeCity_ChampionsRoom_Text_2291E6: @ 82291E6
-	.string "PROF. BIRCH: See?\n"
-	.string "What did I tell you, {RIVAL}?\p"
-	.string "Didn’t I tell you that you don’t need\n"
-	.string "to worry about {PLAYER}{KUN}?\p"
-	.string "… … … … … … … …\n"
-	.string "{PLAYER}{KUN}, you’ve finally done it.\p"
-	.string "When I heard that you defeated your\n"
-	.string "own father at the PETALBURG GYM,\l"
-	.string "I thought perhaps you had a chance…\p"
-	.string "But to think you’ve actually become\n"
-	.string "the CHAMPION!\p"
-	.string "Ah, yes!\p"
-	.string "What became of your POKéDEX?\n"
-	.string "Here, let me see.$"
-
-EverGrandeCity_ChampionsRoom_Text_22934D: @ 822934D
-	.string "PROF. BIRCH: Anyways,\n"
-	.string "congratulations!\p"
-	.string "Now, go proudly into the final room!$"
-
-EverGrandeCity_ChampionsRoom_Text_229399: @ 8229399
-	.string "WALLACE: {PLAYER}{KUN}…\p"
-	.string "No, let me rephrase that properly.\p"
-	.string "The new CHAMPION!\p"
-	.string "Come with me.$"
-
-EverGrandeCity_ChampionsRoom_Text_2293EB: @ 82293EB
-	.string "WALLACE: I’m sorry, but…\p"
-	.string "From here on, only those TRAINERS who\n"
-	.string "have become CHAMPIONS may enter.\p"
-	.string "You’ll have to wait outside with\n"
-	.string "PROF. BIRCH.$"
-
-EverGrandeCity_ChampionsRoom_Text_229479: @ 8229479
-	.string "MAY: Groan…\p"
-	.string "… … … … … … … …\n"
-	.string "… … … … … … … …\p"
-	.string "I’m just joking! That’s okay!\n"
-	.string "That’s the rule!\p"
-	.string "{PLAYER}{KUN}!\n"
-	.string "Honestly, congratulations!$"
-
-EverGrandeCity_ChampionsRoom_Text_2294F5: @ 82294F5
-	.string "BRENDAN: Whaaaat?! … … … … …\n"
-	.string "… … … … … … … …\p"
-	.string "It can’t be helped if that’s the rule.\p"
-	.string "{PLAYER}, way to go!\n"
-	.string "Congratulations!$"
-
diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc
deleted file mode 100644
index 48703897e..000000000
--- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc
+++ /dev/null
@@ -1,268 +0,0 @@
-FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899
-	map_script 3, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9
-	map_script 2, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD
-	map_script 4, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0
-	.byte 0
-
-FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9
-	call FallarborTown_BattleTentBattleRoom_EventScript_2008AF
-	end
-
-FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008C7
-	compare VAR_RESULT, 1
-	goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008D2
-	return
-
-FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7
-	setvar VAR_OBJ_GFX_ID_1, 100
-	setvar VAR_OBJ_GFX_ID_0, 100
-	return
-
-FallarborTown_BattleTentBattleRoom_EventScript_2008D2:: @ 82008D2
-	setvar VAR_OBJ_GFX_ID_1, 105
-	setvar VAR_OBJ_GFX_ID_0, 105
-	return
-
-FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD
-	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentBattleRoom_EventScript_2008E7
-	.2byte 0
-
-FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7
-	lockall
-	showobjectat 1, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
-	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B8D
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, FallarborTown_BattleTentBattleRoom_EventScript_200B73
-
-FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
-	setvar VAR_0x8004, 3
-	special sub_8161F74
-	addobject 3
-	applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B96
-	waitmovement 0
-	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3
-	playse SE_W187
-	waitse
-	waitmovement 0
-	msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, 4
-	setvar VAR_0x8004, 4
-	special sub_81B99B4
-	msgbox 0x2021fc4, 4
-	waitmessage
-	call FallarborTown_BattleTentBattleRoom_EventScript_257B6C
-	switch VAR_RESULT
-	case 1, FallarborTown_BattleTentBattleRoom_EventScript_20099C
-	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3
-	playse SE_W173
-	waitse
-	waitmovement 0
-	setvar VAR_0x8004, 6
-	special sub_81B9B80
-	msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, 4
-
-FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special sub_81A1780
-	special LoadPlayerParty
-	warp FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
-	waitstate
-
-FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C
-	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3
-	playse SE_BAN
-	waitse
-	waitmovement 0
-	msgbox FallarborTown_BattleTentBattleRoom_Text_257CB3, 4
-	closemessage
-
-FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	switch VAR_RESULT
-	case 3, FallarborTown_BattleTentBattleRoom_EventScript_200AF3
-	applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B9E
-	waitmovement 0
-	removeobject 3
-	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA6
-	waitmovement 0
-	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94
-	waitmovement 0
-	msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, 4
-	special LoadPlayerParty
-	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-
-FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B43
-	compare VAR_RESULT, 2
-	call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B4A
-	multichoice 20, 6, 104, 1
-	switch VAR_RESULT
-	case 0, FallarborTown_BattleTentBattleRoom_EventScript_200AD8
-	case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A78
-	case 2, FallarborTown_BattleTentBattleRoom_EventScript_200AA6
-
-FallarborTown_BattleTentBattleRoom_EventScript_200A78:: @ 8200A78
-	msgbox FallarborTown_BattleTentBattleRoom_Text_257E6B, 5
-	switch VAR_RESULT
-	case 0, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
-	case 1, FallarborTown_BattleTentBattleRoom_EventScript_200B51
-	case 127, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
-
-FallarborTown_BattleTentBattleRoom_EventScript_200AA6:: @ 8200AA6
-	message FallarborTown_BattleTentBattleRoom_Text_257E9E
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
-	case 0, FallarborTown_BattleTentBattleRoom_EventScript_20097E
-	case 127, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
-
-FallarborTown_BattleTentBattleRoom_EventScript_200AD8:: @ 8200AD8
-	closemessage
-	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BAB
-	waitmovement 0
-	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B92
-	waitmovement 0
-	goto FallarborTown_BattleTentBattleRoom_EventScript_20090F
-	waitstate
-
-FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3
-	delay 60
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special sub_81A1780
-	special LoadPlayerParty
-	warp FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
-	waitstate
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_81A5238
-	compare VAR_RESULT, 9999
-	goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3
-	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A5238
-
-FallarborTown_BattleTentBattleRoom_EventScript_200B43:: @ 8200B43
-	message FallarborTown_BattleTentBattleRoom_Text_257D17
-	waitmessage
-	return
-
-FallarborTown_BattleTentBattleRoom_EventScript_200B4A:: @ 8200B4A
-	message FallarborTown_BattleTentBattleRoom_Text_257D50
-	waitmessage
-	return
-
-FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51
-	message FallarborTown_BattleTentBattleRoom_Text_257EDB
-	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 2
-	special sub_81B9B80
-	playse SE_SAVE
-	waitse
-	fadescreen 1
-	setvar VAR_0x8004, 4
-	special sub_81A1780
-	end
-
-FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73
-	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA6
-	waitmovement 0
-	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94
-	waitmovement 0
-	goto FallarborTown_BattleTentBattleRoom_EventScript_200A2A
-	end
-
-FallarborTown_BattleTentBattleRoom_Movement_200B8D: @ 8200B8D
-	walk_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_right
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200B92: @ 8200B92
-	walk_in_place_fastest_right
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200B94: @ 8200B94
-	walk_in_place_fastest_left
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200B96: @ 8200B96
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_in_place_fastest_left
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200B9C: @ 8200B9C
-	walk_left
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200B9E: @ 8200B9E
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200BA3: @ 8200BA3
-	disable_jump_landing_ground_effect
-	jump_in_place_down
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200BA6: @ 8200BA6
-	walk_down
-	walk_down
-	walk_down
-	walk_in_place_fastest_right
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200BAB: @ 8200BAB
-	walk_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_down
-	step_end
-
-FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0
-	map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentBattleRoom_EventScript_200BBA
-	.2byte 0
-
-FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA
-	hideobjectat 255, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
-	hideobjectat 1, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
-	removeobject 3
-	setvar VAR_TEMP_1, 1
-	end
-
diff --git a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc
deleted file mode 100644
index f1d3024c0..000000000
--- a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7
-	map_script 2, FallarborTown_BattleTentCorridor_MapScript2_2006AD
-	.byte 0
-
-FallarborTown_BattleTentCorridor_MapScript2_2006AD: @ 82006AD
-	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentCorridor_EventScript_2006B7
-	.2byte 0
-
-FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7
-	lockall
-	setvar VAR_TEMP_0, 1
-	applymovement 1, FallarborTown_BattleTentCorridor_Movement_2006FB
-	applymovement 255, FallarborTown_BattleTentCorridor_Movement_2006FB
-	waitmovement 0
-	opendoor 2, 1
-	waitdooranim
-	applymovement 1, FallarborTown_BattleTentCorridor_Movement_200701
-	applymovement 255, FallarborTown_BattleTentCorridor_Movement_200700
-	waitmovement 0
-	closedoor 2, 1
-	waitdooranim
-	setvar VAR_0x8006, 0
-	warp FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4
-	waitstate
-	releaseall
-	end
-
-FallarborTown_BattleTentCorridor_Movement_2006FB: @ 82006FB
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-FallarborTown_BattleTentCorridor_Movement_200700: @ 8200700
-	walk_up
-
-FallarborTown_BattleTentCorridor_Movement_200701: @ 8200701
-	walk_up
-	set_invisible
-	step_end
-
-FallarborTown_BattleTentCorridor_Text_200704: @ 8200704
-	.string "We do all right in the preliminary round,\n"
-	.string "but we can never win the appeals…\p"
-	.string "Maybe it means I have to watch what\n"
-	.string "other contestants are doing…$"
-
-FallarborTown_BattleTentCorridor_Text_200791: @ 8200791
-	.string "See!\n"
-	.string "My POKéMON won all these RIBBONS!\p"
-	.string "Have your POKéMON earned any RIBBONS?\n"
-	.string "You can check them on your POKéNAV.$"
-
-FallarborTown_BattleTentCorridor_Text_200802: @ 8200802
-	.string "I can’t beat GYM LEADERS…\p"
-	.string "I can’t win any CONTESTS…\p"
-	.string "I’ve been here, there, and everywhere,\n"
-	.string "and it’s all for naught…$"
-
-FallarborTown_BattleTentCorridor_Text_200876: @ 8200876
-	.string "POKéMON CONTESTS\n"
-	.string "SUPER RANK STAGE!$"
-
diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc
deleted file mode 100644
index 1bde88e7d..000000000
--- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc
+++ /dev/null
@@ -1,402 +0,0 @@
-FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66
-	map_script 2, FallarborTown_BattleTentLobby_MapScript2_1FFE85
-	map_script 4, FallarborTown_BattleTentLobby_MapScript2_1FFE71
-	.byte 0
-
-FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71
-	map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentLobby_EventScript_1FFE7B
-	.2byte 0
-
-FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85
-	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentLobby_EventScript_1FFEAF
-	map_script_2 VAR_TEMP_0, 1, FallarborTown_BattleTentLobby_EventScript_1FFEB8
-	map_script_2 VAR_TEMP_0, 2, FallarborTown_BattleTentLobby_EventScript_1FFFCD
-	map_script_2 VAR_TEMP_0, 3, FallarborTown_BattleTentLobby_EventScript_1FFEED
-	map_script_2 VAR_TEMP_0, 4, FallarborTown_BattleTentLobby_EventScript_1FFF93
-	.2byte 0
-
-FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF
-	setvar VAR_0x8004, 0
-	special sub_81A1780
-	end
-
-FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8
-	lockall
-	msgbox FallarborTown_BattleTentLobby_Text_2C4DED, 4
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	releaseall
-	end
-
-FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED
-	lockall
-	msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4
-	message FallarborTown_BattleTentLobby_Text_2C4EFF
-	waitmessage
-	setvar VAR_0x8004, 4
-	special sub_81B9B80
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_81B9B80
-	playse SE_SAVE
-	waitse
-
-FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27
-	msgbox FallarborTown_BattleTentLobby_Text_2C4F22, 4
-	setvar VAR_0x8004, 5
-	special sub_81B9B80
-	switch VAR_RESULT
-	case 0, FallarborTown_BattleTentLobby_EventScript_1FFF73
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	message FallarborTown_BattleTentLobby_Text_2C4F69
-	waitmessage
-	playfanfare MUS_FANFA4
-	waitfanfare
-	msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73
-	msgbox FallarborTown_BattleTentLobby_Text_2C4F83, 4
-	waitmessage
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-FallarborTown_BattleTentLobby_EventScript_1FFF84:: @ 81FFF84
-	lockall
-	msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4
-	goto FallarborTown_BattleTentLobby_EventScript_1FFF27
-	end
-
-FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93
-	lockall
-	message FallarborTown_BattleTentLobby_Text_2C4FD7
-	waitmessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_81B9B80
-	playse SE_SAVE
-	waitse
-	msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD
-	lockall
-	message FallarborTown_BattleTentLobby_Text_2C504C
-	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 1
-	special sub_81B9B80
-	playse SE_SAVE
-	waitse
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	goto FallarborTown_BattleTentLobby_EventScript_20013C
-
-FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001
-	lock
-	faceplayer
-	setvar VAR_0x8004, 1
-	special sub_81B9B80
-	compare VAR_RESULT, 0
-	goto_if 5, FallarborTown_BattleTentLobby_EventScript_1FFF84
-	special SavePlayerParty
-	msgbox FallarborTown_BattleTentLobby_Text_2C47EB, 4
-
-FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021
-	message FallarborTown_BattleTentLobby_Text_2C4843
-	waitmessage
-	multichoice 17, 6, 23, 0
-	switch VAR_RESULT
-	case 0, FallarborTown_BattleTentLobby_EventScript_20005D
-	case 1, FallarborTown_BattleTentLobby_EventScript_200169
-	case 2, FallarborTown_BattleTentLobby_EventScript_2001C5
-	case 127, FallarborTown_BattleTentLobby_EventScript_2001C5
-
-FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
-	setvar VAR_FRONTIER_FACILITY, 3
-	setvar VAR_0x40CE, 0
-	setvar VAR_RESULT, 2
-	setvar VAR_0x8004, 15
-	special sub_81A1780
-	compare VAR_0x8004, 1
-	goto_eq FallarborTown_BattleTentLobby_EventScript_200176
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 2
-	special sub_81A1780
-	msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, 4
-	fadescreen 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	special sub_80F9490
-	waitstate
-	compare VAR_RESULT, 0
-	goto_eq FallarborTown_BattleTentLobby_EventScript_2001C2
-	msgbox FallarborTown_BattleTentLobby_Text_2C4B35, 5
-	switch VAR_RESULT
-	case 0, FallarborTown_BattleTentLobby_EventScript_2001C2
-	case 1, FallarborTown_BattleTentLobby_EventScript_2000E2
-	case 127, FallarborTown_BattleTentLobby_EventScript_2001C2
-
-FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
-	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	special sub_81A1780
-	setvar VAR_0x8004, 0
-	special sub_81B9B80
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special LoadPlayerParty
-	closemessage
-	delay 2
-	call FallarborTown_BattleTentLobby_EventScript_27134F
-	setvar VAR_TEMP_0, 255
-	compare VAR_RESULT, 0
-	goto_eq FallarborTown_BattleTentLobby_EventScript_2001AB
-
-FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C
-	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4
-	closemessage
-	call FallarborTown_BattleTentLobby_EventScript_2001CF
-	warp FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7
-	setvar VAR_TEMP_0, 0
-	waitstate
-	end
-
-FallarborTown_BattleTentLobby_EventScript_200169:: @ 8200169
-	msgbox FallarborTown_BattleTentLobby_Text_2C48AC, 4
-	goto FallarborTown_BattleTentLobby_EventScript_200021
-
-FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176
-	switch VAR_RESULT
-	case 0, FallarborTown_BattleTentLobby_EventScript_200191
-	case 1, FallarborTown_BattleTentLobby_EventScript_20019E
-
-FallarborTown_BattleTentLobby_EventScript_200191:: @ 8200191
-	msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, 4
-	goto FallarborTown_BattleTentLobby_EventScript_2001CD
-
-FallarborTown_BattleTentLobby_EventScript_20019E:: @ 820019E
-	msgbox FallarborTown_BattleTentLobby_Text_2C4CC0, 4
-	goto FallarborTown_BattleTentLobby_EventScript_2001CD
-
-FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	goto FallarborTown_BattleTentLobby_EventScript_2001C5
-
-FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2
-	special LoadPlayerParty
-
-FallarborTown_BattleTentLobby_EventScript_2001C5:: @ 82001C5
-	msgbox FallarborTown_BattleTentLobby_Text_2C487F, 4
-
-FallarborTown_BattleTentLobby_EventScript_2001CD:: @ 82001CD
-	release
-	end
-
-FallarborTown_BattleTentLobby_EventScript_2001CF:: @ 82001CF
-	applymovement 1, FallarborTown_BattleTentLobby_Movement_2001FE
-	applymovement 255, FallarborTown_BattleTentLobby_Movement_200205
-	waitmovement 0
-	opendoor 6, 1
-	waitdooranim
-	applymovement 1, FallarborTown_BattleTentLobby_Movement_200202
-	applymovement 255, FallarborTown_BattleTentLobby_Movement_200209
-	waitmovement 0
-	closedoor 6, 1
-	waitdooranim
-	return
-
-FallarborTown_BattleTentLobby_Movement_2001FE: @ 82001FE
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-FallarborTown_BattleTentLobby_Movement_200202: @ 8200202
-	walk_up
-	set_invisible
-	step_end
-
-FallarborTown_BattleTentLobby_Movement_200205: @ 8200205
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-FallarborTown_BattleTentLobby_Movement_200209: @ 8200209
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-FallarborTown_BattleTentLobby_EventScript_20020D:: @ 820020D
-	msgbox FallarborTown_BattleTentLobby_Text_20045A, 2
-	end
-
-FallarborTown_BattleTentLobby_EventScript_200216:: @ 8200216
-	msgbox FallarborTown_BattleTentLobby_Text_200304, 2
-	end
-
-FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F
-	msgbox FallarborTown_BattleTentLobby_Text_200382, 2
-	end
-
-FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228
-	lock
-	faceplayer
-	checkflag FLAG_0x1CD
-	goto_eq FallarborTown_BattleTentLobby_EventScript_200245
-	msgbox FallarborTown_BattleTentLobby_Text_200501, 4
-	addvar VAR_0x40D1, 1
-	setflag FLAG_0x1CD
-	release
-	end
-
-FallarborTown_BattleTentLobby_EventScript_200245:: @ 8200245
-	msgbox FallarborTown_BattleTentLobby_Text_200653, 4
-	release
-	end
-
-FallarborTown_BattleTentLobby_EventScript_20024F:: @ 820024F
-	lockall
-	msgbox FallarborTown_BattleTentLobby_Text_256DB8, 4
-	goto FallarborTown_BattleTentLobby_EventScript_20025E
-	end
-
-FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E
-	message FallarborTown_BattleTentLobby_Text_256DDF
-	waitmessage
-	multichoice 17, 0, 112, 0
-	switch VAR_RESULT
-	case 0, FallarborTown_BattleTentLobby_EventScript_2002BC
-	case 1, FallarborTown_BattleTentLobby_EventScript_2002CA
-	case 2, FallarborTown_BattleTentLobby_EventScript_2002D8
-	case 3, FallarborTown_BattleTentLobby_EventScript_2002E6
-	case 4, FallarborTown_BattleTentLobby_EventScript_2002F4
-	case 5, FallarborTown_BattleTentLobby_EventScript_200302
-	case 127, FallarborTown_BattleTentLobby_EventScript_200302
-	end
-
-FallarborTown_BattleTentLobby_EventScript_2002BC:: @ 82002BC
-	msgbox FallarborTown_BattleTentLobby_Text_2C67CD, 4
-	goto FallarborTown_BattleTentLobby_EventScript_20025E
-	end
-
-FallarborTown_BattleTentLobby_EventScript_2002CA:: @ 82002CA
-	msgbox FallarborTown_BattleTentLobby_Text_256E02, 4
-	goto FallarborTown_BattleTentLobby_EventScript_20025E
-	end
-
-FallarborTown_BattleTentLobby_EventScript_2002D8:: @ 82002D8
-	msgbox FallarborTown_BattleTentLobby_Text_256F43, 4
-	goto FallarborTown_BattleTentLobby_EventScript_20025E
-	end
-
-FallarborTown_BattleTentLobby_EventScript_2002E6:: @ 82002E6
-	msgbox FallarborTown_BattleTentLobby_Text_256FF2, 4
-	goto FallarborTown_BattleTentLobby_EventScript_20025E
-	end
-
-FallarborTown_BattleTentLobby_EventScript_2002F4:: @ 82002F4
-	msgbox FallarborTown_BattleTentLobby_Text_257202, 4
-	goto FallarborTown_BattleTentLobby_EventScript_20025E
-	end
-
-FallarborTown_BattleTentLobby_EventScript_200302:: @ 8200302
-	releaseall
-	end
-
-FallarborTown_BattleTentLobby_Text_200304: @ 8200304
-	.string "Fufufufufu.\p"
-	.string "I’m going to make everyone think\n"
-	.string "I’m just a kid and let them play down.\p"
-	.string "Then, I’ll shock them and grab\n"
-	.string "the title!$"
-
-FallarborTown_BattleTentLobby_Text_200382: @ 8200382
-	.string "You know how BATTLE TENTS offer\n"
-	.string "different events in different towns?\p"
-	.string "My favorite is definitely the BATTLE\n"
-	.string "TENT in FALLARBOR TOWN.\p"
-	.string "I think it’s fantastic how TRAINERS\n"
-	.string "try to win with all their faith in\l"
-	.string "their POKéMON.$"
-
-FallarborTown_BattleTentLobby_Text_20045A: @ 820045A
-	.string "I heard something about some tent,\n"
-	.string "so I came to camp out.\p"
-	.string "I didn’t know that tents these days\n"
-	.string "are so luxurious!\p"
-	.string "Since I’m here, I may as well try\n"
-	.string "my hand at battling!$"
-
-FallarborTown_BattleTentLobby_Text_200501: @ 8200501
-	.string "SCOTT: Hi, {PLAYER}{KUN}!\n"
-	.string "So you came out to this BATTLE TENT!\p"
-	.string "The people in these parts tend to be\n"
-	.string "easygoing and laid-back.\p"
-	.string "But, you see, what I’m looking for are\n"
-	.string "people with…\p"
-	.string "How should I say this?\p"
-	.string "Someone bursting with the desire\n"
-	.string "and the drive to win.\p"
-	.string "If there were a TRAINER like that,\n"
-	.string "I’d immediately…\p"
-	.string "Whoops! Never mind!\n"
-	.string "Keep working at it!$"
-
-FallarborTown_BattleTentLobby_Text_200653: @ 8200653
-	.string "SCOTT: Instead of wasting your\n"
-	.string "time with the likes of me, why not\l"
-	.string "make a challenge?$"
-
diff --git a/data/scripts/maps/FarawayIsland_Entrance.inc b/data/scripts/maps/FarawayIsland_Entrance.inc
deleted file mode 100644
index ff8af2e9f..000000000
--- a/data/scripts/maps/FarawayIsland_Entrance.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-FarawayIsland_Entrance_MapScripts:: @ 8267C8E
-	map_script 3, FarawayIsland_Entrance_MapScript1_267C94
-	.byte 0
-
-FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94
-	setflag FLAG_0x8D8
-	end
-
-FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98
-	setweather 1
-	doweather
-	end
-
-FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D
-	setweather 0
-	doweather
-	end
-
-FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2
-	lock
-	faceplayer
-	msgbox FarawayIsland_Entrance_Text_2C6B42, 5
-	compare VAR_RESULT, 0
-	goto_eq FarawayIsland_Entrance_EventScript_267CE7
-	msgbox FarawayIsland_Entrance_Text_2A6A5D, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA
-	waitmovement 0
-	delay 30
-	hideobjectat 1, FARAWAY_ISLAND_ENTRANCE
-	setvar VAR_0x8004, 2
-	call FarawayIsland_Entrance_EventScript_272250
-	warp LILYCOVE_CITY_HARBOR, 255, 8, 11
-	waitstate
-	release
-	end
-
-FarawayIsland_Entrance_EventScript_267CE7:: @ 8267CE7
-	msgbox FarawayIsland_Entrance_Text_2A6A82, 4
-	release
-	end
-
-FarawayIsland_Entrance_EventScript_267CF1:: @ 8267CF1
-	msgbox FarawayIsland_Entrance_Text_2C6D5A, 3
-	end
-
diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc
deleted file mode 100644
index bf5c4297f..000000000
--- a/data/scripts/maps/GraniteCave_B1F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-GraniteCave_B1F_MapScripts:: @ 822DC5E
-	map_script 2, GraniteCave_B1F_MapScript2_2A8327
-	map_script 3, GraniteCave_B1F_MapScript1_2A8331
-	map_script 5, GraniteCave_B1F_MapScript1_22DC6E
-	.byte 0
-
-GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E
-	setstepcallback 7
-	setholewarp GRANITE_CAVE_B2F, 255, 0, 0
-	end
-
diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc
deleted file mode 100644
index 3c4b241ac..000000000
--- a/data/scripts/maps/InsideOfTruck.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-InsideOfTruck_MapScripts:: @ 823BEDA
-	map_script 1, InsideOfTruck_MapScript1_23BEE5
-	map_script 5, InsideOfTruck_MapScript1_23BF01
-	.byte 0
-
-InsideOfTruck_MapScript1_23BEE5: @ 823BEE5
-	setmetatile 4, 1, 520, 0
-	setmetatile 4, 2, 528, 0
-	setmetatile 4, 3, 536, 0
-	end
-
-InsideOfTruck_MapScript1_23BF01: @ 823BF01
-	setstepcallback 5
-	end
-
-InsideOfTruck_EventScript_23BF04:: @ 823BF04
-	lockall
-	setflag FLAG_SPECIAL_FLAG_0x4000
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq InsideOfTruck_EventScript_23BF20
-	compare VAR_RESULT, 1
-	goto_eq InsideOfTruck_EventScript_23BF46
-	end
-
-InsideOfTruck_EventScript_23BF20:: @ 823BF20
-	setrespawn 1
-	setvar VAR_0x4092, 1
-	setflag FLAG_0x2F7
-	setflag FLAG_0x2FA
-	setflag FLAG_0x310
-	setflag FLAG_0x2DF
-	setflag FLAG_0x331
-	setvar VAR_0x408C, 1
-	setdynamicwarp LITTLEROOT_TOWN, 255, 3, 10
-	releaseall
-	end
-
-InsideOfTruck_EventScript_23BF46:: @ 823BF46
-	setrespawn 2
-	setvar VAR_0x4092, 2
-	setflag FLAG_0x2F6
-	setflag FLAG_0x2F9
-	setflag FLAG_0x311
-	setflag FLAG_0x2E0
-	setflag FLAG_0x332
-	setvar VAR_0x4082, 1
-	setdynamicwarp LITTLEROOT_TOWN, 255, 12, 10
-	releaseall
-	end
-
-InsideOfTruck_EventScript_23BF6C:: @ 823BF6C
-	msgbox InsideOfTruck_Text_23BF75, 3
-	end
-
-InsideOfTruck_Text_23BF75: @ 823BF75
-	.string "The box is printed with a POKéMON logo.\p"
-	.string "It’s a POKéMON brand moving and\n"
-	.string "delivery service.$"
-
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
deleted file mode 100644
index 1f65b88fd..000000000
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ /dev/null
@@ -1,1121 +0,0 @@
-LilycoveCity_ContestLobby_MapScripts:: @ 821A211
-	map_script 3, LilycoveCity_ContestLobby_MapScript1_21A21C
-	map_script 2, LilycoveCity_ContestLobby_MapScript2_21A243
-	.byte 0
-
-LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C
-	call LilycoveCity_ContestLobby_EventScript_28CB2B
-	call LilycoveCity_ContestLobby_EventScript_21A227
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227
-	getpricereduction 4
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A23C
-	clearflag FLAG_0x369
-	setflag FLAG_0x340
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C
-	setflag FLAG_0x369
-	clearflag FLAG_0x340
-	return
-
-LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243
-	map_script_2 VAR_0x4099, 1, LilycoveCity_ContestLobby_EventScript_21A255
-	map_script_2 VAR_0x4099, 2, LilycoveCity_ContestLobby_EventScript_21A427
-	.2byte 0
-
-LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255
-	checkflag FLAG_0x307
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A264
-	setvar VAR_0x4099, 0
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264
-	lockall
-	addobject 4
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A407
-	waitmovement 4
-	applymovement 255, LilycoveCity_ContestLobby_Movement_21A418
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_21ADB9, 4
-	lockall
-	fadescreen 1
-	drawcontestwinner 0
-	lockall
-	msgbox LilycoveCity_ContestLobby_Text_21AE78, 5
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A2E4
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA
-	msgbox LilycoveCity_ContestLobby_Text_21AF63, 4
-	closemessage
-	special sub_80F88DC
-	setvar VAR_0x4099, 0
-	specialvar VAR_RESULT, sub_80F8C7C
-	compare VAR_RESULT, 1
-	call_if 1, LilycoveCity_ContestLobby_EventScript_21A314
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F
-	waitmovement 0
-	removeobject 4
-	call LilycoveCity_ContestLobby_EventScript_21A360
-	call LilycoveCity_ContestLobby_EventScript_21A3B6
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4
-	msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA
-	msgbox LilycoveCity_ContestLobby_Text_21B132, 4
-	closemessage
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F
-	waitmovement 0
-	setvar VAR_0x4099, 0
-	removeobject 4
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314
-	incrementgamestat 42
-	special sub_80F8390
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A
-	waitmovement 0
-	playse SE_PIN
-	applymovement 4, LilycoveCity_ContestLobby_Movement_272598
-	waitmovement 0
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_21B030, 4
-	playfanfare MUS_FANFA4
-	msgbox LilycoveCity_ContestLobby_Text_21B07E, 4
-	waitfanfare
-	msgbox LilycoveCity_ContestLobby_Text_21B094, 4
-	msgbox LilycoveCity_ContestLobby_Text_21B0AD, 4
-	closemessage
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A360:: @ 821A360
-	specialvar VAR_0x8004, sub_80F8940
-	switch VAR_0x8004
-	case 1, LilycoveCity_ContestLobby_EventScript_21A3A2
-	case 2, LilycoveCity_ContestLobby_EventScript_21A3A6
-	case 3, LilycoveCity_ContestLobby_EventScript_21A3AA
-	case 4, LilycoveCity_ContestLobby_EventScript_21A3AE
-	case 5, LilycoveCity_ContestLobby_EventScript_21A3B2
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A3A2:: @ 821A3A2
-	clearflag FLAG_0x308
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A3A6:: @ 821A3A6
-	clearflag FLAG_0x309
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A3AA:: @ 821A3AA
-	clearflag FLAG_0x30A
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A3AE:: @ 821A3AE
-	clearflag FLAG_0x30B
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A3B2:: @ 821A3B2
-	clearflag FLAG_0x30C
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A3B6:: @ 821A3B6
-	switch VAR_CONTEST_CATEGORY
-	case 0, LilycoveCity_ContestLobby_EventScript_21A3F3
-	case 1, LilycoveCity_ContestLobby_EventScript_21A3F7
-	case 2, LilycoveCity_ContestLobby_EventScript_21A3FB
-	case 3, LilycoveCity_ContestLobby_EventScript_21A3FF
-	case 4, LilycoveCity_ContestLobby_EventScript_21A403
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A3F3:: @ 821A3F3
-	setflag FLAG_0x0A0
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A3F7:: @ 821A3F7
-	setflag FLAG_0x0A1
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A3FB:: @ 821A3FB
-	setflag FLAG_0x0A2
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A3FF:: @ 821A3FF
-	setflag FLAG_0x0A3
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A403:: @ 821A403
-	setflag FLAG_0x0A4
-	return
-
-LilycoveCity_ContestLobby_Movement_21A407: @ 821A407
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A418: @ 821A418
-	walk_in_place_fastest_left
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A41A: @ 821A41A
-	walk_down
-	walk_down
-	walk_down
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_in_place_fastest_right
-	step_end
-
-LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427
-	checkflag FLAG_0x307
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A436
-	setvar VAR_0x4099, 0
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436
-	lockall
-	addobject 11
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A533
-	waitmovement 11
-	applymovement 255, LilycoveCity_ContestLobby_Movement_21A545
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_21ADB9, 4
-	lockall
-	fadescreen 1
-	drawcontestwinner 0
-	msgbox LilycoveCity_ContestLobby_Text_21AE78, 5
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A47A
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A4B4
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A
-	msgbox LilycoveCity_ContestLobby_Text_21AF63, 4
-	closemessage
-	special sub_80F88DC
-	setvar VAR_0x4099, 0
-	specialvar VAR_RESULT, sub_80F8C7C
-	compare VAR_RESULT, 1
-	call_if 1, LilycoveCity_ContestLobby_EventScript_21A4E4
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C
-	waitmovement 0
-	removeobject 11
-	call LilycoveCity_ContestLobby_EventScript_21A360
-	call LilycoveCity_ContestLobby_EventScript_21A3B6
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4
-	msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A47A
-	msgbox LilycoveCity_ContestLobby_Text_21B132, 4
-	closemessage
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C
-	waitmovement 0
-	setvar VAR_0x4099, 0
-	removeobject 11
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4
-	incrementgamestat 42
-	setflag FLAG_SYS_RIBBON_GET
-	special sub_80F8390
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A547
-	waitmovement 0
-	playse SE_PIN
-	applymovement 11, LilycoveCity_ContestLobby_Movement_272598
-	waitmovement 0
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_21B030, 4
-	playfanfare MUS_FANFA4
-	msgbox LilycoveCity_ContestLobby_Text_21B07E, 4
-	waitfanfare
-	msgbox LilycoveCity_ContestLobby_Text_21B094, 4
-	msgbox LilycoveCity_ContestLobby_Text_21B0AD, 4
-	closemessage
-	return
-
-LilycoveCity_ContestLobby_Movement_21A533: @ 821A533
-	walk_down
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A545: @ 821A545
-	walk_in_place_fastest_right
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A547: @ 821A547
-	walk_down
-	walk_down
-	walk_down
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_in_place_fastest_left
-	step_end
-
-LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554
-	special sub_80F9154
-	specialvar VAR_RESULT, sub_80F8D24
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A5CF
-	call LilycoveCity_ContestLobby_EventScript_279CC5
-	call LilycoveCity_ContestLobby_EventScript_21A670
-	special sub_80F87D8
-	call LilycoveCity_ContestLobby_EventScript_23BEB6
-	call LilycoveCity_ContestLobby_EventScript_21A585
-	call LilycoveCity_ContestLobby_EventScript_21A5EF
-	waitstate
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A585:: @ 821A585
-	switch VAR_CONTEST_RANK
-	case 0, LilycoveCity_ContestLobby_EventScript_21A5B7
-	case 1, LilycoveCity_ContestLobby_EventScript_21A5BD
-	case 2, LilycoveCity_ContestLobby_EventScript_21A5C3
-	case 3, LilycoveCity_ContestLobby_EventScript_21A5C9
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A5B7:: @ 821A5B7
-	setvar VAR_0x4088, 1
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A5BD:: @ 821A5BD
-	setvar VAR_0x4088, 2
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A5C3:: @ 821A5C3
-	setvar VAR_0x4088, 3
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9
-	setvar VAR_0x4088, 4
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF
-	setflag FLAG_0x307
-	copyvar VAR_0x4094, 0x1
-	giveitem ITEM_CONTEST_PASS, 1
-	setvar VAR_0x800B, 8
-	setvar VAR_CONTEST_RANK, 3
-	setvar VAR_0x4099, 1
-	setflag FLAG_SYS_RIBBON_GET
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A5EF:: @ 821A5EF
-	setflag FLAG_0x155
-	switch VAR_CONTEST_CATEGORY
-	case 0, LilycoveCity_ContestLobby_EventScript_21A62F
-	case 1, LilycoveCity_ContestLobby_EventScript_21A63C
-	case 2, LilycoveCity_ContestLobby_EventScript_21A649
-	case 3, LilycoveCity_ContestLobby_EventScript_21A656
-	case 4, LilycoveCity_ContestLobby_EventScript_21A663
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A62F:: @ 821A62F
-	setwarp LINK_CONTEST_ROOM_4, 255, 7, 5
-	special sub_80AFC60
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A63C:: @ 821A63C
-	setwarp LINK_CONTEST_ROOM_2, 255, 7, 5
-	special sub_80AFC60
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A649:: @ 821A649
-	setwarp LINK_CONTEST_ROOM_6, 255, 7, 5
-	special sub_80AFC60
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A656:: @ 821A656
-	setwarp LINK_CONTEST_ROOM_5, 255, 7, 5
-	special sub_80AFC60
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A663:: @ 821A663
-	setwarp LINK_CONTEST_ROOM_3, 255, 7, 5
-	special sub_80AFC60
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670
-	lockall
-	applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F5
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 12, 2, 545, 1
-	setmetatile 12, 3, 609, 1
-	special DrawWholeMapView
-	applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F9
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 12, 2, 721, 1
-	setmetatile 12, 3, 729, 1
-	special DrawWholeMapView
-	delay 20
-	applymovement 1, LilycoveCity_ContestLobby_Movement_21A706
-	waitmovement 0
-	applymovement 255, LilycoveCity_ContestLobby_Movement_21A6F2
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_27B653, 4
-	closemessage
-	applymovement 1, LilycoveCity_ContestLobby_Movement_21A6FD
-	applymovement 255, LilycoveCity_ContestLobby_Movement_21A6E8
-	waitmovement 0
-	releaseall
-	return
-
-LilycoveCity_ContestLobby_Movement_21A6E8: @ 821A6E8
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	delay_8
-	set_invisible
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A6F2: @ 821A6F2
-	walk_in_place_fastest_left
-	walk_left
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A6F5: @ 821A6F5
-	walk_left
-	walk_left
-	walk_in_place_fastest_down
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A6F9: @ 821A6F9
-	walk_down
-	walk_down
-	walk_in_place_fastest_up
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	delay_8
-	set_invisible
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A706: @ 821A706
-	walk_in_place_fastest_right
-	step_end
-
-LilycoveCity_ContestLobby_EventScript_21A708:: @ 821A708
-	msgbox LilycoveCity_ContestLobby_Text_21B1B1, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A711:: @ 821A711
-	msgbox LilycoveCity_ContestLobby_Text_21B24D, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A71A:: @ 821A71A
-	msgbox LilycoveCity_ContestLobby_Text_21B2BA, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A723:: @ 821A723
-	msgbox LilycoveCity_ContestLobby_Text_21B334, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A72C:: @ 821A72C
-	msgbox LilycoveCity_ContestLobby_Text_21B392, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A735:: @ 821A735
-	msgbox LilycoveCity_ContestLobby_Text_21B3FC, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A73E:: @ 821A73E
-	lockall
-	fadescreen 1
-	drawcontestwinner 1
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A745:: @ 821A745
-	lockall
-	fadescreen 1
-	drawcontestwinner 2
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A74C:: @ 821A74C
-	lockall
-	fadescreen 1
-	drawcontestwinner 3
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A753:: @ 821A753
-	lockall
-	fadescreen 1
-	drawcontestwinner 4
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A75A:: @ 821A75A
-	lockall
-	fadescreen 1
-	drawcontestwinner 5
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A761:: @ 821A761
-	lockall
-	fadescreen 1
-	drawcontestwinner 6
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A768:: @ 821A768
-	msgbox LilycoveCity_ContestLobby_Text_2931AA, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A771:: @ 821A771
-	msgbox LilycoveCity_ContestLobby_Text_2931C6, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A
-	lockall
-	special ShowBerryBlenderRecordWindow
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784
-	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 7
-	special sub_81A1780
-	waitbuttonpress
-	special RemoveRecordsWindow
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A798:: @ 821A798
-	lock
-	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C427C, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A7F9
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A7A8:: @ 821A7A8
-	lock
-	msgbox LilycoveCity_ContestLobby_Text_2C464B, 4
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A7B3:: @ 821A7B3
-	lock
-	msgbox LilycoveCity_ContestLobby_Text_2C465A, 4
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A7BE:: @ 821A7BE
-	lock
-	msgbox LilycoveCity_ContestLobby_Text_2C4669, 4
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A7C9:: @ 821A7C9
-	lock
-	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C4679, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A7F9
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A7D9:: @ 821A7D9
-	lock
-	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C46B1, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A7F9
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9
-	lock
-	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C4763, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A7F9
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9
-	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_ContestLobby_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A806:: @ 821A806
-	special sub_80F9154
-	lock
-	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_27C063, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A819
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819
-	message LilycoveCity_ContestLobby_Text_27C0F6
-	waitmessage
-	multichoice 0, 0, 2, 0
-	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_21A856
-	case 1, LilycoveCity_ContestLobby_EventScript_21A90D
-	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
-	case 127, LilycoveCity_ContestLobby_EventScript_21A97F
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856
-	msgbox LilycoveCity_ContestLobby_Text_27BD17, 5
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A97F
-	call LilycoveCity_ContestLobby_EventScript_27134F
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A97F
-	message LilycoveCity_ContestLobby_Text_27C8FD
-	waitmessage
-	specialvar VAR_TEMP_D, sub_80093CC
-	multichoice 0, 0, 85, 0
-	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_21A8BB
-	case 1, LilycoveCity_ContestLobby_EventScript_21A8C6
-	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
-	case 127, LilycoveCity_ContestLobby_EventScript_21A97F
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A8BB:: @ 821A8BB
-	setvar VAR_TEMP_C, 0
-	goto LilycoveCity_ContestLobby_EventScript_21A8DC
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A8C6:: @ 821A8C6
-	setvar VAR_TEMP_C, 1
-	compare VAR_TEMP_D, 1
-	goto_eq LilycoveCity_ContestLobby_EventScript_21AAFC
-	goto LilycoveCity_ContestLobby_EventScript_21A8DC
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A8DC:: @ 821A8DC
-	message LilycoveCity_ContestLobby_Text_27C119
-	waitmessage
-	multichoice 0, 0, 4, 0
-	switch VAR_RESULT
-	case 5, LilycoveCity_ContestLobby_EventScript_21A97F
-	case 127, LilycoveCity_ContestLobby_EventScript_21A97F
-	copyvar VAR_CONTEST_CATEGORY, VAR_RESULT
-	goto LilycoveCity_ContestLobby_EventScript_21A98C
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A90D:: @ 821A90D
-	message LilycoveCity_ContestLobby_Text_27C0DA
-	waitmessage
-	multichoice 0, 0, 84, 0
-	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_21A955
-	case 1, LilycoveCity_ContestLobby_EventScript_21A963
-	case 2, LilycoveCity_ContestLobby_EventScript_21A971
-	case 3, LilycoveCity_ContestLobby_EventScript_21A819
-	case 127, LilycoveCity_ContestLobby_EventScript_21A819
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A955:: @ 821A955
-	msgbox LilycoveCity_ContestLobby_Text_27C340, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A90D
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A963:: @ 821A963
-	msgbox LilycoveCity_ContestLobby_Text_27C5B1, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A90D
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A971:: @ 821A971
-	msgbox LilycoveCity_ContestLobby_Text_27C742, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A90D
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A97F:: @ 821A97F
-	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_27BD4F, 4
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C
-	msgbox LilycoveCity_ContestLobby_Text_27C1C3, 4
-	setvar VAR_CONTEST_RANK, 0
-	choosecontestmon
-	compare VAR_0x8004, 255
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A97F
-	special sub_80F7F30
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A9E0
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A
-	compare VAR_RESULT, 2
-	goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A
-	compare VAR_RESULT, 3
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A9EE
-	compare VAR_RESULT, 4
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A9FC
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A9E0:: @ 821A9E0
-	msgbox LilycoveCity_ContestLobby_Text_27B471, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A98C
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A9EE:: @ 821A9EE
-	msgbox LilycoveCity_ContestLobby_Text_27C186, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A98C
-	end
-
-LilycoveCity_ContestLobby_EventScript_21A9FC:: @ 821A9FC
-	msgbox LilycoveCity_ContestLobby_Text_27C140, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A98C
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AA0A:: @ 821AA0A
-	copyvar VAR_0x8008, VAR_0x8004
-	goto LilycoveCity_ContestLobby_EventScript_21AA15
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15
-	compare VAR_TEMP_D, 1
-	goto_eq LilycoveCity_ContestLobby_EventScript_21AB4B
-	compare VAR_TEMP_D, 2
-	goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F
-	message LilycoveCity_ContestLobby_Text_27BF85
-	waitmessage
-	copyvar VAR_0x8004, VAR_RESULT
-	compare VAR_TEMP_C, 0
-	call_if 1, LilycoveCity_ContestLobby_EventScript_21AABB
-	compare VAR_TEMP_C, 1
-	call_if 1, LilycoveCity_ContestLobby_EventScript_21AAC0
-	compare VAR_TEMP_C, 2
-	goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F
-	compare VAR_RESULT, 4
-	goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3
-	compare VAR_RESULT, 3
-	goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3
-	compare VAR_RESULT, 5
-	goto_eq LilycoveCity_ContestLobby_EventScript_21A97F
-	compare VAR_RESULT, 6
-	goto_eq LilycoveCity_ContestLobby_EventScript_21AAEF
-	compare VAR_RESULT, 10
-	goto_eq LilycoveCity_ContestLobby_EventScript_21AAE1
-	message3 LilycoveCity_ContestLobby_Text_27BEEC
-	contestlinktransfer
-	switch VAR_0x8004
-	case 0, LilycoveCity_ContestLobby_EventScript_21AB17
-	case 1, LilycoveCity_ContestLobby_EventScript_21AAC5
-	case 2, LilycoveCity_ContestLobby_EventScript_21AB09
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AABB:: @ 821AABB
-	special sub_80B3028
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_21AAC0:: @ 821AAC0
-	special sub_80B3000
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_21AAC5:: @ 821AAC5
-	msgbox LilycoveCity_ContestLobby_Text_27BF0E, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A97F
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AAD3:: @ 821AAD3
-	msgbox LilycoveCity_ContestLobby_Text_27BF4B, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A97F
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1
-	msgbox LilycoveCity_ContestLobby_Text_27C254, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A97F
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF
-	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_27821C, 4
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AAFC:: @ 821AAFC
-	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_27C879, 4
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AB09:: @ 821AB09
-	msgbox LilycoveCity_ContestLobby_Text_27BEFA, 4
-	goto LilycoveCity_ContestLobby_EventScript_21A97F
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17
-	special sub_80F84B0
-	addvar VAR_0x8004, 1
-	buffernumberstring 1, VAR_0x8004
-	messageautoscroll LilycoveCity_ContestLobby_Text_27BFF8
-	waitmessage
-	subvar VAR_0x8004, 1
-	call LilycoveCity_ContestLobby_EventScript_21AC49
-	setvar VAR_0x4086, 1
-	special sub_80F8AFC
-	setvar VAR_0x4088, 5
-	setvar VAR_CONTEST_RANK, 3
-	call LilycoveCity_ContestLobby_EventScript_21A5EF
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AB4B:: @ 821AB4B
-	compare VAR_CONTEST_CATEGORY, 0
-	call_if 1, LilycoveCity_ContestLobby_EventScript_21AB88
-	compare VAR_CONTEST_CATEGORY, 1
-	call_if 1, LilycoveCity_ContestLobby_EventScript_21AB8E
-	compare VAR_CONTEST_CATEGORY, 2
-	call_if 1, LilycoveCity_ContestLobby_EventScript_21AB94
-	compare VAR_CONTEST_CATEGORY, 3
-	call_if 1, LilycoveCity_ContestLobby_EventScript_21AB9A
-	compare VAR_CONTEST_CATEGORY, 4
-	call_if 1, LilycoveCity_ContestLobby_EventScript_21ABA0
-	goto LilycoveCity_ContestLobby_EventScript_21ABA6
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AB88:: @ 821AB88
-	setvar VAR_0x8004, 15
-	return
-
-LilycoveCity_ContestLobby_EventScript_21AB8E:: @ 821AB8E
-	setvar VAR_0x8004, 16
-	return
-
-LilycoveCity_ContestLobby_EventScript_21AB94:: @ 821AB94
-	setvar VAR_0x8004, 17
-	return
-
-LilycoveCity_ContestLobby_EventScript_21AB9A:: @ 821AB9A
-	setvar VAR_0x8004, 18
-	return
-
-LilycoveCity_ContestLobby_EventScript_21ABA0:: @ 821ABA0
-	setvar VAR_0x8004, 19
-	return
-
-LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6
-	message LilycoveCity_ContestLobby_Text_27C1EA
-	waitmessage
-	multichoice 16, 6, 81, 0
-	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_21AC0B
-	case 1, LilycoveCity_ContestLobby_EventScript_21ABE3
-	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
-	case 127, LilycoveCity_ContestLobby_EventScript_21A97F
-	end
-
-LilycoveCity_ContestLobby_EventScript_21ABE3:: @ 821ABE3
-	call LilycoveCity_ContestLobby_EventScript_21AC33
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D
-	compare VAR_RESULT, 5
-	goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6
-	compare VAR_RESULT, 8
-	goto_eq LilycoveCity_ContestLobby_EventScript_21ABE3
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B
-	call LilycoveCity_ContestLobby_EventScript_21AC38
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D
-	compare VAR_RESULT, 5
-	goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6
-	compare VAR_RESULT, 8
-	goto_eq LilycoveCity_ContestLobby_EventScript_21AC0B
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AC33:: @ 821AC33
-	special BerryBlenderLinkBecomeLeader
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_21AC38:: @ 821AC38
-	special BerryBlenderLinkJoinGroup
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_21AC3D:: @ 821AC3D
-	message3 LilycoveCity_ContestLobby_Text_27BEEC
-	contestlinktransfer
-	goto LilycoveCity_ContestLobby_EventScript_21AB17
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49
-	messageautoscroll LilycoveCity_ContestLobby_Text_27C043
-	waitmessage
-	delay 20
-	closemessage
-	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACDD
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 17, 2, 545, 1
-	setmetatile 17, 3, 609, 1
-	special DrawWholeMapView
-	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE1
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 17, 2, 721, 1
-	setmetatile 17, 3, 729, 1
-	special DrawWholeMapView
-	delay 20
-	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACEF
-	waitmovement 0
-	applymovement 255, LilycoveCity_ContestLobby_Movement_21ACDB
-	waitmovement 0
-	messageautoscroll LilycoveCity_ContestLobby_Text_27B653
-	waitmessage
-	delay 20
-	closemessage
-	call LilycoveCity_ContestLobby_EventScript_27AD92
-	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE5
-	applymovement 255, LilycoveCity_ContestLobby_Movement_21ACD0
-	waitmovement 0
-	release
-	return
-
-LilycoveCity_ContestLobby_Movement_21ACD0: @ 821ACD0
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	delay_8
-	set_invisible
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21ACDB: @ 821ACDB
-	walk_right
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21ACDD: @ 821ACDD
-	walk_right
-	walk_right
-	walk_in_place_fastest_down
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21ACE1: @ 821ACE1
-	walk_down
-	walk_down
-	walk_in_place_fastest_up
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	delay_8
-	set_invisible
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF
-	walk_in_place_fastest_left
-	step_end
-
-LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1
-	lock
-	faceplayer
-	checkflag FLAG_0x05F
-	goto_eq LilycoveCity_ContestLobby_EventScript_21AD06
-	msgbox LilycoveCity_ContestLobby_Text_21AD10, 4
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AD06:: @ 821AD06
-	msgbox LilycoveCity_ContestLobby_Text_21AD55, 4
-	release
-	end
-
-LilycoveCity_ContestLobby_Text_21AD10: @ 821AD10
-	.string "Yippee!\p"
-	.string "The lady at the reception counter\n"
-	.string "gave me a case for {POKEBLOCK}S!$"
-
-LilycoveCity_ContestLobby_Text_21AD55: @ 821AD55
-	.string "Make {POKEBLOCK}S and put them in there.\p"
-	.string "When you make a {POKEBLOCK}, everyone\n"
-	.string "has to put in a different BERRY.$"
-
-LilycoveCity_ContestLobby_Text_21ADB9: @ 821ADB9
-	.string "Congratulations!\p"
-	.string "I did a painting of your POKéMON to\n"
-	.string "commemorate its victory…\p"
-	.string "Well, your POKéMON’s appeals were\n"
-	.string "so fantastic, it spurred me into\l"
-	.string "painting better than I usually do.\l"
-	.string "Look, see?$"
-
-LilycoveCity_ContestLobby_Text_21AE78: @ 821AE78
-	.string "What do you think? I’m confident in\n"
-	.string "what I’ve done, but do you like it?\p"
-	.string "A work of this caliber, it wouldn’t look\n"
-	.string "out of place in an art museum.\p"
-	.string "Huh? An art museum really is looking\n"
-	.string "for paintings?\p"
-	.string "Do you think I should take this there?$"
-
-LilycoveCity_ContestLobby_Text_21AF63: @ 821AF63
-	.string "What, really? Then, sure, I will take\n"
-	.string "this painting there right now.\p"
-	.string "I’ll give it a proper title, too.\p"
-	.string "I hope they’ll like it and consider\n"
-	.string "exhibiting this.\p"
-	.string "Please check if they did accept this.\n"
-	.string "Thank you!$"
-
-LilycoveCity_ContestLobby_Text_21B030: @ 821B030
-	.string "Oh, that’s right!\p"
-	.string "As a memento of me painting your\n"
-	.string "POKéMON, please take this.$"
-
-LilycoveCity_ContestLobby_Text_21B07E: @ 821B07E
-	.string "{PLAYER} received a RIBBON.$"
-
-LilycoveCity_ContestLobby_Text_21B094: @ 821B094
-	.string "{PLAYER} put the RIBBON on\n"
-	.string "{STR_VAR_1}.$"
-
-LilycoveCity_ContestLobby_Text_21B0AD: @ 821B0AD
-	.string "Okay, see you!$"
-
-LilycoveCity_ContestLobby_Text_21B0BC: @ 821B0BC
-	.string "Oh… Then, I guess I’ll just take\n"
-	.string "this home with me…\p"
-	.string "But, you know, I would like to take\n"
-	.string "this to the art museum… Okay?$"
-
-LilycoveCity_ContestLobby_Text_21B132: @ 821B132
-	.string "Oh, fine, that’s the way it is.\n"
-	.string "I will hang this in my own house.\p"
-	.string "I’ll just have to try harder next time.\n"
-	.string "Well, be seeing you.$"
-
-LilycoveCity_ContestLobby_Text_21B1B1: @ 821B1B1
-	.string "Hoo, boy… Master Rank CONTESTS,\n"
-	.string "here I come.\p"
-	.string "The world will know that my dearest\n"
-	.string "POKéMON is the cutest being in all\l"
-	.string "existence. The time has come!\l"
-	.string "Uheheheh.$"
-
-LilycoveCity_ContestLobby_Text_21B24D: @ 821B24D
-	.string "You can see a whole variety of\n"
-	.string "POKéMON here.\p"
-	.string "That’s why I make this place a regular\n"
-	.string "part of my daily stroll.$"
-
-LilycoveCity_ContestLobby_Text_21B2BA: @ 821B2BA
-	.string "Wow, coming out to a CONTEST is\n"
-	.string "a feast for these eyes!\p"
-	.string "Would you look at all the POKéMON\n"
-	.string "that just scream to be painted?$"
-
-LilycoveCity_ContestLobby_Text_21B334: @ 821B334
-	.string "The TOUGHNESS CONTEST is like\n"
-	.string "extreme, man!\p"
-	.string "Those muscular appeals…\n"
-	.string "Cascading sweat… I swoon!$"
-
-LilycoveCity_ContestLobby_Text_21B392: @ 821B392
-	.string "Day in and day out, I lavished my care\n"
-	.string "on this POKéMON.\p"
-	.string "Its condition is peaking.\n"
-	.string "Today, victory is mine!$"
-
-LilycoveCity_ContestLobby_Text_21B3FC: @ 821B3FC
-	.string "I made {POKEBLOCK}S with Mom, Dad, and\n"
-	.string "Big Sister. They turned out great!\p"
-	.string "I bet you can make smoother, better\n"
-	.string "{POKEBLOCK}S if you have more people.$"
-
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
deleted file mode 100644
index b7ba17125..000000000
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
+++ /dev/null
@@ -1,129 +0,0 @@
-LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 8220623
-	.byte 0
-
-LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624
-	lock
-	faceplayer
-	setvar VAR_0x8004, 0
-	checkflag FLAG_0x002
-	call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC
-	copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR
-	special sub_8139B60
-	message gUnknown_08272C1D
-	waitmessage
-	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, sub_81399F4
-	switch VAR_RESULT
-	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_220689
-	case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220695
-	case 2, LilycoveCity_DepartmentStoreElevator_EventScript_2206A1
-	case 3, LilycoveCity_DepartmentStoreElevator_EventScript_2206AD
-	case 4, LilycoveCity_DepartmentStoreElevator_EventScript_2206B9
-	end
-
-LilycoveCity_DepartmentStoreElevator_EventScript_220689:: @ 8220689
-	multichoicedefault 0, 0, 57, 0, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
-	end
-
-LilycoveCity_DepartmentStoreElevator_EventScript_220695:: @ 8220695
-	multichoicedefault 0, 0, 57, 1, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
-	end
-
-LilycoveCity_DepartmentStoreElevator_EventScript_2206A1:: @ 82206A1
-	multichoicedefault 0, 0, 57, 2, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
-	end
-
-LilycoveCity_DepartmentStoreElevator_EventScript_2206AD:: @ 82206AD
-	multichoicedefault 0, 0, 57, 3, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
-	end
-
-LilycoveCity_DepartmentStoreElevator_EventScript_2206B9:: @ 82206B9
-	multichoicedefault 0, 0, 57, 4, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
-	end
-
-LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5
-	switch VAR_RESULT
-	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207B8
-	case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220790
-	case 2, LilycoveCity_DepartmentStoreElevator_EventScript_220768
-	case 3, LilycoveCity_DepartmentStoreElevator_EventScript_220740
-	case 4, LilycoveCity_DepartmentStoreElevator_EventScript_220718
-	case 5, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	case 127, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	end
-
-LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718
-	setvar VAR_0x8006, 4
-	setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1
-	compare VAR_DEPT_STORE_FLOOR, 4
-	goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
-	setvar VAR_DEPT_STORE_FLOOR, 4
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	end
-
-LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740
-	setvar VAR_0x8006, 5
-	setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1
-	compare VAR_DEPT_STORE_FLOOR, 5
-	goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
-	setvar VAR_DEPT_STORE_FLOOR, 5
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	end
-
-LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768
-	setvar VAR_0x8006, 6
-	setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1
-	compare VAR_DEPT_STORE_FLOOR, 6
-	goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
-	setvar VAR_DEPT_STORE_FLOOR, 6
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	end
-
-LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790
-	setvar VAR_0x8006, 7
-	setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1
-	compare VAR_DEPT_STORE_FLOOR, 7
-	goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
-	setvar VAR_DEPT_STORE_FLOOR, 7
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	end
-
-LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8
-	setvar VAR_0x8006, 8
-	setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1
-	compare VAR_DEPT_STORE_FLOOR, 8
-	goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
-	setvar VAR_DEPT_STORE_FLOOR, 8
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	end
-
-LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0
-	special sub_8139C10
-	release
-	end
-
-LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
-	special sub_8139C10
-	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA
-	waitmovement 0
-	waitse
-	special sub_8139A78
-	waitstate
-	setflag FLAG_0x002
-	return
-
-LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC
-	special sub_8139994
-	return
-
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc
deleted file mode 100644
index 6357326c1..000000000
--- a/data/scripts/maps/LilycoveCity_Harbor.inc
+++ /dev/null
@@ -1,630 +0,0 @@
-LilycoveCity_Harbor_MapScripts:: @ 821E000
-	map_script 3, LilycoveCity_Harbor_MapScript1_21E006
-	.byte 0
-
-LilycoveCity_Harbor_MapScript1_21E006: @ 821E006
-	setescapewarp LILYCOVE_CITY, 255, 12, 33
-	end
-
-LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F
-	lock
-	faceplayer
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, LilycoveCity_Harbor_EventScript_21E54D
-	call LilycoveCity_Harbor_EventScript_21E194
-	call LilycoveCity_Harbor_EventScript_21E1C6
-	call LilycoveCity_Harbor_EventScript_21E1F8
-	call LilycoveCity_Harbor_EventScript_21E22A
-	call LilycoveCity_Harbor_EventScript_21E25C
-	call LilycoveCity_Harbor_EventScript_21E2A6
-	compare VAR_TEMP_C, 2
-	goto_eq LilycoveCity_Harbor_EventScript_21E350
-	compare VAR_TEMP_B, 1
-	goto_eq LilycoveCity_Harbor_EventScript_21E2F0
-	compare VAR_TEMP_B, 2
-	goto_eq LilycoveCity_Harbor_EventScript_21E320
-	compare VAR_TEMP_B, 4
-	goto_eq LilycoveCity_Harbor_EventScript_21E350
-	compare VAR_TEMP_B, 8
-	goto_eq LilycoveCity_Harbor_EventScript_21E41D
-	compare VAR_TEMP_B, 0
-	goto_if 5, LilycoveCity_Harbor_EventScript_21E44D
-	goto LilycoveCity_Harbor_EventScript_21E080
-	end
-
-LilycoveCity_Harbor_EventScript_21E080:: @ 821E080
-	compare VAR_TEMP_A, 0
-	goto_eq LilycoveCity_Harbor_EventScript_21E557
-	msgbox LilycoveCity_Harbor_Text_21E758, 4
-	message LilycoveCity_Harbor_Text_21E7ED
-	waitmessage
-	goto LilycoveCity_Harbor_EventScript_21E09F
-	end
-
-LilycoveCity_Harbor_EventScript_21E09F:: @ 821E09F
-	setvar VAR_0x8004, 0
-	special sub_80E2548
-	waitstate
-	special sub_80E2878
-	switch VAR_RESULT
-	case 0, LilycoveCity_Harbor_EventScript_21E149
-	case 1, LilycoveCity_Harbor_EventScript_21E171
-	case 2, LilycoveCity_Harbor_EventScript_21E109
-	case 3, LilycoveCity_Harbor_EventScript_21E119
-	case 4, LilycoveCity_Harbor_EventScript_21E129
-	case 5, LilycoveCity_Harbor_EventScript_21E139
-	case 6, LilycoveCity_Harbor_EventScript_21E626
-	case 127, LilycoveCity_Harbor_EventScript_21E626
-	end
-
-LilycoveCity_Harbor_EventScript_21E109:: @ 821E109
-	call LilycoveCity_Harbor_EventScript_21E5CC
-	warp SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E119:: @ 821E119
-	call LilycoveCity_Harbor_EventScript_21E5CC
-	warp NAVEL_ROCK_HARBOR, 255, 8, 4
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E129:: @ 821E129
-	call LilycoveCity_Harbor_EventScript_21E5CC
-	warp BIRTH_ISLAND_HARBOR, 255, 8, 4
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E139:: @ 821E139
-	call LilycoveCity_Harbor_EventScript_21E5CC
-	warp FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E149:: @ 821E149
-	msgbox LilycoveCity_Harbor_Text_21E864, 5
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_Harbor_EventScript_21E5C0
-	setvar VAR_PORTHOLE, 5
-	call LilycoveCity_Harbor_EventScript_21E5CC
-	warp SS_TIDAL_CORRIDOR, 255, 1, 10
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E171:: @ 821E171
-	msgbox LilycoveCity_Harbor_Text_21E880, 5
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_Harbor_EventScript_21E5C0
-	call LilycoveCity_Harbor_EventScript_21E5CC
-	warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E194:: @ 821E194
-	setvar VAR_TEMP_E, 0
-	checkflag FLAG_SYS_HAS_EON_TICKET
-	goto_if 0, LilycoveCity_Harbor_EventScript_27374E
-	checkitem ITEM_EON_TICKET, 1
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_Harbor_EventScript_27374E
-	setvar VAR_TEMP_E, 1
-	checkflag FLAG_0x1AE
-	goto_eq LilycoveCity_Harbor_EventScript_27374E
-	setvar VAR_TEMP_E, 2
-	return
-
-LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6
-	setvar VAR_TEMP_D, 0
-	checkflag FLAG_0x8D5
-	goto_if 0, LilycoveCity_Harbor_EventScript_27374E
-	checkitem ITEM_AURORA_TICKET, 1
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_Harbor_EventScript_27374E
-	setvar VAR_TEMP_D, 1
-	checkflag FLAG_0x1AF
-	goto_eq LilycoveCity_Harbor_EventScript_27374E
-	setvar VAR_TEMP_D, 2
-	return
-
-LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8
-	setvar VAR_TEMP_C, 0
-	checkflag FLAG_0x8D6
-	goto_if 0, LilycoveCity_Harbor_EventScript_27374E
-	checkitem ITEM_OLD_SEA_MAP, 1
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_Harbor_EventScript_27374E
-	setvar VAR_TEMP_C, 1
-	checkflag FLAG_0x1B0
-	goto_eq LilycoveCity_Harbor_EventScript_27374E
-	setvar VAR_TEMP_C, 2
-	return
-
-LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A
-	setvar VAR_TEMP_9, 0
-	checkflag FLAG_0x8E0
-	goto_if 0, LilycoveCity_Harbor_EventScript_27374E
-	checkitem ITEM_MYSTIC_TICKET, 1
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_Harbor_EventScript_27374E
-	setvar VAR_TEMP_9, 1
-	checkflag FLAG_0x1DB
-	goto_eq LilycoveCity_Harbor_EventScript_27374E
-	setvar VAR_TEMP_9, 2
-	return
-
-LilycoveCity_Harbor_EventScript_21E25C:: @ 821E25C
-	setvar VAR_TEMP_B, 0
-	compare VAR_TEMP_E, 2
-	call_if 1, LilycoveCity_Harbor_EventScript_21E28E
-	compare VAR_TEMP_D, 2
-	call_if 1, LilycoveCity_Harbor_EventScript_21E294
-	compare VAR_TEMP_C, 2
-	call_if 1, LilycoveCity_Harbor_EventScript_21E29A
-	compare VAR_TEMP_9, 2
-	call_if 1, LilycoveCity_Harbor_EventScript_21E2A0
-	return
-
-LilycoveCity_Harbor_EventScript_21E28E:: @ 821E28E
-	addvar VAR_TEMP_B, 1
-	return
-
-LilycoveCity_Harbor_EventScript_21E294:: @ 821E294
-	addvar VAR_TEMP_B, 2
-	return
-
-LilycoveCity_Harbor_EventScript_21E29A:: @ 821E29A
-	addvar VAR_TEMP_B, 4
-	return
-
-LilycoveCity_Harbor_EventScript_21E2A0:: @ 821E2A0
-	addvar VAR_TEMP_B, 8
-	return
-
-LilycoveCity_Harbor_EventScript_21E2A6:: @ 821E2A6
-	setvar VAR_TEMP_A, 0
-	compare VAR_TEMP_E, 1
-	call_if 1, LilycoveCity_Harbor_EventScript_21E2D8
-	compare VAR_TEMP_D, 1
-	call_if 1, LilycoveCity_Harbor_EventScript_21E2DE
-	compare VAR_TEMP_C, 1
-	call_if 1, LilycoveCity_Harbor_EventScript_21E2E4
-	compare VAR_TEMP_9, 1
-	call_if 1, LilycoveCity_Harbor_EventScript_21E2EA
-	return
-
-LilycoveCity_Harbor_EventScript_21E2D8:: @ 821E2D8
-	addvar VAR_TEMP_A, 1
-	return
-
-LilycoveCity_Harbor_EventScript_21E2DE:: @ 821E2DE
-	addvar VAR_TEMP_A, 2
-	return
-
-LilycoveCity_Harbor_EventScript_21E2E4:: @ 821E2E4
-	addvar VAR_TEMP_A, 4
-	return
-
-LilycoveCity_Harbor_EventScript_21E2EA:: @ 821E2EA
-	addvar VAR_TEMP_A, 8
-	return
-
-LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0
-	setflag FLAG_0x1AE
-	msgbox LilycoveCity_Harbor_Text_2A68D2, 4
-	closemessage
-	call LilycoveCity_Harbor_EventScript_21E4EE
-	msgbox LilycoveCity_Harbor_Text_2A68FC, 4
-	goto LilycoveCity_Harbor_EventScript_21E30F
-	end
-
-LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F
-	closemessage
-	call LilycoveCity_Harbor_EventScript_21E514
-	warp SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E320:: @ 821E320
-	setflag FLAG_0x1AF
-	msgbox LilycoveCity_Harbor_Text_2A68D2, 4
-	closemessage
-	call LilycoveCity_Harbor_EventScript_21E4EE
-	msgbox LilycoveCity_Harbor_Text_2C6A71, 4
-	goto LilycoveCity_Harbor_EventScript_21E33F
-	end
-
-LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F
-	closemessage
-	call LilycoveCity_Harbor_EventScript_21E514
-	warp BIRTH_ISLAND_HARBOR, 255, 8, 4
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E350:: @ 821E350
-	setflag FLAG_0x1B0
-	msgbox LilycoveCity_Harbor_Text_2A6848, 4
-	closemessage
-	call LilycoveCity_Harbor_EventScript_21E4EE
-	msgbox LilycoveCity_Harbor_Text_2C68A5, 4
-	closemessage
-	applymovement 4, LilycoveCity_Harbor_Movement_2725A6
-	waitmovement 0
-	playse SE_PIN
-	applymovement 4, LilycoveCity_Harbor_Movement_272598
-	waitmovement 0
-	applymovement 4, LilycoveCity_Harbor_Movement_27259A
-	waitmovement 0
-	compare VAR_FACING, 2
-	call_if 1, LilycoveCity_Harbor_EventScript_21E656
-	compare VAR_FACING, 4
-	call_if 1, LilycoveCity_Harbor_EventScript_21E661
-	addobject 5
-	compare VAR_FACING, 2
-	call_if 1, LilycoveCity_Harbor_EventScript_21E675
-	compare VAR_FACING, 4
-	call_if 1, LilycoveCity_Harbor_EventScript_21E680
-	msgbox LilycoveCity_Harbor_Text_2C6951, 4
-	compare VAR_FACING, 2
-	call_if 1, LilycoveCity_Harbor_EventScript_21E68B
-	compare VAR_FACING, 4
-	call_if 1, LilycoveCity_Harbor_EventScript_21E696
-	msgbox LilycoveCity_Harbor_Text_2C69AA, 4
-	closemessage
-	compare VAR_FACING, 2
-	call_if 1, LilycoveCity_Harbor_EventScript_21E6A1
-	compare VAR_FACING, 4
-	call_if 1, LilycoveCity_Harbor_EventScript_21E6BA
-	setvar VAR_0x8004, 2
-	call LilycoveCity_Harbor_EventScript_2721E2
-	warp FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C
-	closemessage
-	call LilycoveCity_Harbor_EventScript_21E514
-	warp FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D
-	setflag FLAG_0x1DB
-	msgbox LilycoveCity_Harbor_Text_2A68D2, 4
-	closemessage
-	call LilycoveCity_Harbor_EventScript_21E4EE
-	msgbox LilycoveCity_Harbor_Text_2C6A71, 4
-	goto LilycoveCity_Harbor_EventScript_21E43C
-	end
-
-LilycoveCity_Harbor_EventScript_21E43C:: @ 821E43C
-	closemessage
-	call LilycoveCity_Harbor_EventScript_21E514
-	warp NAVEL_ROCK_HARBOR, 255, 8, 4
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D
-	msgbox LilycoveCity_Harbor_Text_2A68D2, 4
-	closemessage
-	call LilycoveCity_Harbor_EventScript_21E4EE
-	message LilycoveCity_Harbor_Text_2C6BD4
-	waitmessage
-	setvar VAR_0x8004, 1
-	special sub_80E2548
-	waitstate
-	special sub_80E2878
-	switch VAR_RESULT
-	case 2, LilycoveCity_Harbor_EventScript_21E30F
-	case 3, LilycoveCity_Harbor_EventScript_21E43C
-	case 4, LilycoveCity_Harbor_EventScript_21E33F
-	case 5, LilycoveCity_Harbor_EventScript_21E40C
-	case 6, LilycoveCity_Harbor_EventScript_21E4B6
-	case 127, LilycoveCity_Harbor_EventScript_21E4B6
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6
-	msgbox LilycoveCity_Harbor_Text_2A6A82, 4
-	closemessage
-	applymovement 4, LilycoveCity_Harbor_Movement_2725A6
-	waitmovement 0
-	delay 30
-	removeobject 4
-	delay 30
-	applymovement 1, LilycoveCity_Harbor_Movement_2725AA
-	waitmovement 0
-	showobjectat 1, LILYCOVE_CITY_HARBOR
-	delay 30
-	msgbox LilycoveCity_Harbor_Text_21E842, 4
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE
-	applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6
-	waitmovement 0
-	delay 30
-	hideobjectat VAR_LAST_TALKED, LILYCOVE_CITY_HARBOR
-	delay 60
-	addobject 4
-	delay 30
-	applymovement 4, LilycoveCity_Harbor_Movement_27259E
-	waitmovement 0
-	return
-
-LilycoveCity_Harbor_EventScript_21E514:: @ 821E514
-	applymovement 4, LilycoveCity_Harbor_Movement_2725A6
-	waitmovement 0
-	delay 30
-	removeobject 4
-	compare VAR_FACING, 2
-	call_if 1, LilycoveCity_Harbor_EventScript_21E61B
-	compare VAR_FACING, 4
-	call_if 1, LilycoveCity_Harbor_EventScript_21E610
-	delay 30
-	hideobjectat 255, PETALBURG_CITY
-	setvar VAR_0x8004, 2
-	call LilycoveCity_Harbor_EventScript_2721E2
-	return
-
-LilycoveCity_Harbor_EventScript_21E54D:: @ 821E54D
-	msgbox LilycoveCity_Harbor_Text_21E6F1, 4
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E557:: @ 821E557
-	msgbox LilycoveCity_Harbor_Text_21E758, 4
-	message LilycoveCity_Harbor_Text_21E7ED
-	waitmessage
-	goto LilycoveCity_Harbor_EventScript_21E09F
-	end
-
-LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B
-	msgbox LilycoveCity_Harbor_Text_21E792, 4
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E575:: @ 821E575
-	msgbox LilycoveCity_Harbor_Text_21E864, 5
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_Harbor_EventScript_21E5C0
-	setvar VAR_PORTHOLE, 5
-	call LilycoveCity_Harbor_EventScript_21E5CC
-	warp SS_TIDAL_CORRIDOR, 255, 1, 10
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D
-	msgbox LilycoveCity_Harbor_Text_21E880, 5
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_Harbor_EventScript_21E5C0
-	call LilycoveCity_Harbor_EventScript_21E5CC
-	warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0
-	message LilycoveCity_Harbor_Text_21E8CC
-	waitmessage
-	goto LilycoveCity_Harbor_EventScript_21E09F
-	end
-
-LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC
-	msgbox LilycoveCity_Harbor_Text_21E89D, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6
-	waitmovement 0
-	delay 30
-	hideobjectat VAR_LAST_TALKED, LILYCOVE_CITY_HARBOR
-	compare VAR_FACING, 2
-	call_if 1, LilycoveCity_Harbor_EventScript_21E61B
-	compare VAR_FACING, 4
-	call_if 1, LilycoveCity_Harbor_EventScript_21E610
-	delay 30
-	hideobjectat 255, PETALBURG_CITY
-	setvar VAR_0x8004, 2
-	call LilycoveCity_Harbor_EventScript_2721E2
-	return
-
-LilycoveCity_Harbor_EventScript_21E610:: @ 821E610
-	applymovement 255, LilycoveCity_Harbor_Movement_21E630
-	waitmovement 0
-	return
-
-LilycoveCity_Harbor_EventScript_21E61B:: @ 821E61B
-	applymovement 255, LilycoveCity_Harbor_Movement_21E633
-	waitmovement 0
-	return
-
-LilycoveCity_Harbor_EventScript_21E626:: @ 821E626
-	msgbox LilycoveCity_Harbor_Text_21E842, 4
-	release
-	end
-
-LilycoveCity_Harbor_Movement_21E630: @ 821E630
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-LilycoveCity_Harbor_Movement_21E633: @ 821E633
-	walk_up
-	step_end
-
-LilycoveCity_Harbor_Movement_21E635: @ 821E635
-	walk_up
-	step_end
-
-LilycoveCity_Harbor_EventScript_21E637:: @ 821E637
-	lock
-	faceplayer
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq LilycoveCity_Harbor_EventScript_21E64C
-	msgbox LilycoveCity_Harbor_Text_21E8EE, 4
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E64C:: @ 821E64C
-	msgbox LilycoveCity_Harbor_Text_21E976, 4
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_21E656:: @ 821E656
-	applymovement 4, LilycoveCity_Harbor_Movement_21E66C
-	waitmovement 0
-	return
-
-LilycoveCity_Harbor_EventScript_21E661:: @ 821E661
-	applymovement 4, LilycoveCity_Harbor_Movement_21E671
-	waitmovement 0
-	return
-
-LilycoveCity_Harbor_Movement_21E66C: @ 821E66C
-	walk_in_place_fastest_right
-	lock_facing_direction
-	walk_left
-	unlock_facing_direction
-	step_end
-
-LilycoveCity_Harbor_Movement_21E671: @ 821E671
-	lock_facing_direction
-	walk_down
-	unlock_facing_direction
-	step_end
-
-LilycoveCity_Harbor_EventScript_21E675:: @ 821E675
-	applymovement 5, LilycoveCity_Harbor_Movement_2725A4
-	waitmovement 0
-	return
-
-LilycoveCity_Harbor_EventScript_21E680:: @ 821E680
-	applymovement 5, LilycoveCity_Harbor_Movement_2725AA
-	waitmovement 0
-	return
-
-LilycoveCity_Harbor_EventScript_21E68B:: @ 821E68B
-	applymovement 5, LilycoveCity_Harbor_Movement_2725AA
-	waitmovement 0
-	return
-
-LilycoveCity_Harbor_EventScript_21E696:: @ 821E696
-	applymovement 5, LilycoveCity_Harbor_Movement_2725A4
-	waitmovement 0
-	return
-
-LilycoveCity_Harbor_EventScript_21E6A1:: @ 821E6A1
-	applymovement 5, LilycoveCity_Harbor_Movement_21E6D3
-	applymovement 255, LilycoveCity_Harbor_Movement_21E6D7
-	applymovement 4, LilycoveCity_Harbor_Movement_21E6DC
-	waitmovement 0
-	return
-
-LilycoveCity_Harbor_EventScript_21E6BA:: @ 821E6BA
-	applymovement 5, LilycoveCity_Harbor_Movement_21E6D3
-	applymovement 255, LilycoveCity_Harbor_Movement_21E6E4
-	applymovement 4, LilycoveCity_Harbor_Movement_21E6EA
-	waitmovement 0
-	return
-
-LilycoveCity_Harbor_Movement_21E6D3: @ 821E6D3
-	walk_in_place_fastest_up
-	delay_8
-	set_invisible
-	step_end
-
-LilycoveCity_Harbor_Movement_21E6D7: @ 821E6D7
-	delay_16
-	walk_up
-	delay_16
-	set_invisible
-	step_end
-
-LilycoveCity_Harbor_Movement_21E6DC: @ 821E6DC
-	delay_16
-	delay_16
-	delay_16
-	walk_right
-	walk_in_place_fastest_up
-	delay_16
-	set_invisible
-	step_end
-
-LilycoveCity_Harbor_Movement_21E6E4: @ 821E6E4
-	delay_16
-	walk_right
-	walk_in_place_fastest_up
-	delay_16
-	set_invisible
-	step_end
-
-LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA
-	delay_16
-	delay_16
-	delay_16
-	walk_up
-	delay_16
-	set_invisible
-	step_end
-
-LilycoveCity_Harbor_Text_21E6F1: @ 821E6F1
-	.string "I beg your pardon?\n"
-	.string "You’re looking for a ship?\p"
-	.string "I’m sorry, the ferry service isn’t\n"
-	.string "available at present…$"
-
-LilycoveCity_Harbor_Text_21E758: @ 821E758
-	.string "Hello, are you here for the ferry?\n"
-	.string "May I see your TICKET?$"
-
-
-LilycoveCity_Harbor_Text_21E792: @ 821E792
-	.string "{PLAYER} doesn’t have the TICKET…\p"
-	.string "I’m terribly sorry.\p"
-	.string "You must have a TICKET to board\n"
-	.string "the ferry.$"
-
-LilycoveCity_Harbor_Text_21E7ED: @ 821E7ED
-	.string "{PLAYER} flashed the TICKET.\p"
-	.string "Perfect! That’s all you need!\p"
-	.string "And where would you like to go?$"
-
-LilycoveCity_Harbor_Text_21E842: @ 821E842
-	.string "Please sail with us another time!$"
-
-LilycoveCity_Harbor_Text_21E864: @ 821E864
-	.string "SLATEPORT CITY it is, then!$"
-
-LilycoveCity_Harbor_Text_21E880: @ 821E880
-	.string "BATTLE FRONTIER it is, then!$"
-
-LilycoveCity_Harbor_Text_21E89D: @ 821E89D
-	.string "Please board the ferry and wait for\n"
-	.string "departure.$"
-
-LilycoveCity_Harbor_Text_21E8CC: @ 821E8CC
-	.string "Then, where would you like to go?$"
-
-LilycoveCity_Harbor_Text_21E8EE: @ 821E8EE
-	.string "Until they finish making the ferry,\n"
-	.string "we sailors have nothing to do…\p"
-	.string "I wish they’d get a move on, the folks\n"
-	.string "at the SHIPYARD in SLATEPORT.$"
-
-LilycoveCity_Harbor_Text_21E976: @ 821E976
-	.string "The ferry S.S. TIDAL is finally in\n"
-	.string "operation.\p"
-	.string "The folks at the SHIPYARD in SLATEPORT\n"
-	.string "must’ve worked extra hard.\p"
-	.string "Well, it’s my turn to get busy now!$"
-
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
deleted file mode 100644
index 507997416..000000000
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
+++ /dev/null
@@ -1,296 +0,0 @@
-LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 8218CB8
-	.byte 0
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218E4B, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2
-	lockall
-	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_27259E
-	message LilycoveCity_LilycoveMuseum_1F_Text_218EBC
-	waitmessage
-	multichoice 20, 8, 16, 1
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F5C, 2
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, 5
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D14:: @ 8218D14
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218FF8, 3
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219035, 3
-	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_218D99
-	waitmovement 0
-	removeobject 2
-	switch VAR_FACING
-	case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A
-	case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F
-	case 4, LilycoveCity_LilycoveMuseum_1F_EventScript_218D84
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A
-	lockall
-	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218DA1
-	waitmovement 0
-	warp LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
-	waitstate
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F:: @ 8218D6F
-	lockall
-	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9B
-	waitmovement 0
-	warp LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
-	waitstate
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84
-	lockall
-	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9E
-	waitmovement 0
-	warp LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
-	waitstate
-	end
-
-LilycoveCity_LilycoveMuseum_1F_Movement_218D99: @ 8218D99
-	walk_up
-	step_end
-
-LilycoveCity_LilycoveMuseum_1F_Movement_218D9B: @ 8218D9B
-	walk_left
-	walk_up
-	step_end
-
-LilycoveCity_LilycoveMuseum_1F_Movement_218D9E: @ 8218D9E
-	walk_right
-	walk_up
-	step_end
-
-LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1
-	walk_up
-	walk_up
-	step_end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4:: @ 8218DA4
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219080, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD:: @ 8218DAD
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190BF, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6:: @ 8218DB6
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190F9, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF:: @ 8218DBF
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219142, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8:: @ 8218DC8
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2191A2, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1:: @ 8218DD1
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21920D, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA:: @ 8218DDA
-LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA:: @ 8218DDA
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219260, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3:: @ 8218DE3
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2192AA, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC:: @ 8218DEC
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219311, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5:: @ 8218DF5
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2193B4, 2
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE:: @ 8218DFE
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21941A, 2
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E07:: @ 8218E07
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194BA, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E10:: @ 8218E10
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194E1, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E19:: @ 8218E19
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219515, 2
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E22:: @ 8218E22
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21959B, 2
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B
-	lock
-	faceplayer
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, 4
-	closemessage
-	applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E42:: @ 8218E42
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21967A, 2
-	end
-
-LilycoveCity_LilycoveMuseum_1F_Text_218E4B: @ 8218E4B
-	.string "Welcome to LILYCOVE MUSEUM.\p"
-	.string "Please take the time to enjoy our\n"
-	.string "collection of fantastic artwork\l"
-	.string "featuring POKéMON.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_218EBC: @ 8218EBC
-	.string "I’m the CURATOR of this MUSEUM of\n"
-	.string "fine arts.\p"
-	.string "It’s heartening to see someone so\n"
-	.string "young as you in our MUSEUM.\p"
-	.string "Have you viewed our collection of\n"
-	.string "paintings already?$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_218F5C: @ 8218F5C
-	.string "Ah, then let me not disturb you.\n"
-	.string "Please, do take your time.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_218F98: @ 8218F98
-	.string "Oh? I do believe that you seem to\n"
-	.string "be a POKéMON TRAINER.\p"
-	.string "Have you an interest in paintings,\n"
-	.string "too?$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_218FF8: @ 8218FF8
-	.string "I see…\p"
-	.string "I’m honored that you would visit\n"
-	.string "us in spite of that.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_219035: @ 8219035
-	.string "Ah, excellent!\n"
-	.string "You do like paintings!\p"
-	.string "Then, may I ask you to come with me?$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_219080: @ 8219080
-	.string "It’s a very old painting.\n"
-	.string "The paint is peeling here and there.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_2190BF: @ 82190BF
-	.string "It’s an odd landscape with bizarre\n"
-	.string "and fantastic scenery.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_2190F9: @ 82190F9
-	.string "It’s a painting of a beautiful, smiling\n"
-	.string "woman with a POKéMON on her lap.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_219142: @ 8219142
-	.string "It’s a painting of a legendary POKéMON\n"
-	.string "from long ago.\p"
-	.string "The artist painted this from\n"
-	.string "imagination.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_2191A2: @ 82191A2
-	.string "It’s a painting of GRASS POKéMON\n"
-	.string "swaying in a breeze.\p"
-	.string "They appear to be enjoying the wind’s\n"
-	.string "gentle caress.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_21920D: @ 821920D
-	.string "It’s a delicious-looking painting\n"
-	.string "of BERRIES.\p"
-	.string "This painting could make you hungry!$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_219260: @ 8219260
-	.string "It’s a replica of a famous sculpture.\p"
-	.string "It depicts an ancient BIRD POKéMON.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_2192AA: @ 82192AA
-	.string "It’s a big POKé BALL carved from\n"
-	.string "a black stone.\p"
-	.string "It was apparently used in festivals\n"
-	.string "in the olden days.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_219311: @ 8219311
-	.string "It’s a huge stone tablet inscribed\n"
-	.string "with POKéMON and dense text in the\l"
-	.string "small characters of an ancient,\l"
-	.string "unreadable language.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_21938C: @ 821938C
-	.string "Hmmm…\n"
-	.string "What works of great magnificence…$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_2193B4: @ 82193B4
-	.string "Battling with POKéMON is fun,\n"
-	.string "I’ll grant you that.\p"
-	.string "But one mustn’t forget our love for\n"
-	.string "the fine arts.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_21941A: @ 821941A
-	.string "This ART MUSEUM… Well, you could\n"
-	.string "see many fantastic paintings.\p"
-	.string "And the CURATOR is a wonderful person.\p"
-	.string "Among artists like myself, this MUSEUM\n"
-	.string "is an inspiration.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_2194BA: @ 82194BA
-	.string "This lady is pretty!\n"
-	.string "She’s like Mommy!$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_2194E1: @ 82194E1
-	.string "This POKéMON is adorable!\n"
-	.string "Just like our little boy!$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_219515: @ 8219515
-	.string "I’d heard that this ART MUSEUM got\n"
-	.string "in some new paintings.\p"
-	.string "So, naturally I hurried over.\p"
-	.string "Are the new paintings up on\n"
-	.string "the second floor?$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_21959B: @ 821959B
-	.string "Lately, the CURATOR has been\n"
-	.string "unusually cheerful.\p"
-	.string "I bet something good happened for him.\n"
-	.string "Definitely.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_2195FF: @ 82195FF
-	.string "I aim to see many great paintings\n"
-	.string "here and learn from them.\p"
-	.string "I have this dream of one day having\n"
-	.string "my artwork exhibited here.$"
-
-LilycoveCity_LilycoveMuseum_1F_Text_21967A: @ 821967A
-	.string "The ART MUSEUM has become a favorite\n"
-	.string "tourist destination.\p"
-	.string "It’s great for LILYCOVE…\n"
-	.string "No, great for the HOENN region!\p"
-	.string "This is what I’ve heard--a lone TRAINER\n"
-	.string "procured all the paintings upstairs.$"
-
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
deleted file mode 100644
index 67b1f9381..000000000
--- a/data/scripts/maps/LittlerootTown.inc
+++ /dev/null
@@ -1,1040 +0,0 @@
-LittlerootTown_MapScripts:: @ 81E7DCB
-	map_script 3, LittlerootTown_MapScript1_1E7DDB
-	map_script 2, LittlerootTown_MapScript2_1E7EC1
-	map_script 4, LittlerootTown_MapScript2_1E7FE2
-	.byte 0
-
-LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB
-	setflag FLAG_VISITED_LITTLEROOT_TOWN
-	call LittlerootTown_EventScript_271ED7
-	compare VAR_0x4092, 2
-	call_if 1, LittlerootTown_EventScript_1E7E67
-	checkflag FLAG_0x052
-	call_if 0, LittlerootTown_EventScript_1E7E6F
-	compare VAR_0x4050, 3
-	call_if 1, LittlerootTown_EventScript_1E7E92
-	compare VAR_0x4082, 4
-	call_if 1, LittlerootTown_EventScript_1E7E5C
-	compare VAR_0x408C, 4
-	call_if 1, LittlerootTown_EventScript_1E7E5C
-	compare VAR_0x40C7, 1
-	call_if 1, LittlerootTown_EventScript_1E7E53
-	compare VAR_0x408D, 3
-	call_if 1, LittlerootTown_EventScript_1E7E4F
-	compare VAR_0x40D3, 1
-	call_if 1, LittlerootTown_EventScript_1E7E4B
-	compare VAR_0x40D3, 2
-	call_if 1, LittlerootTown_EventScript_1E7E45
-	end
-
-LittlerootTown_EventScript_1E7E45:: @ 81E7E45
-	setvar VAR_0x40D3, 3
-	return
-
-LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B
-	setflag FLAG_SPECIAL_FLAG_0x4000
-	return
-
-LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
-	setflag FLAG_0x12D
-	return
-
-LittlerootTown_EventScript_1E7E53:: @ 81E7E53
-	setvar VAR_0x40C7, 2
-	setflag FLAG_0x3D3
-	return
-
-LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C
-	setvar VAR_0x4082, 5
-	setvar VAR_0x408C, 5
-	return
-
-LittlerootTown_EventScript_1E7E67:: @ 81E7E67
-	setobjectxyperm 4, 14, 8
-	return
-
-LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F
-	compare VAR_0x4050, 0
-	goto_eq LittlerootTown_EventScript_1E7E86
-	setobjectxyperm 1, 10, 1
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_EventScript_1E7E86:: @ 81E7E86
-	setobjectxyperm 1, 7, 2
-	setobjectmovementtype 1, 8
-	return
-
-LittlerootTown_EventScript_1E7E92:: @ 81E7E92
-	clearflag FLAG_0x2F0
-	setobjectmovementtype 4, 8
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_EventScript_1E7EB1
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_EventScript_1E7EB9
-	return
-
-LittlerootTown_EventScript_1E7EB1:: @ 81E7EB1
-	setobjectxyperm 4, 5, 9
-	return
-
-LittlerootTown_EventScript_1E7EB9:: @ 81E7EB9
-	setobjectxyperm 4, 14, 9
-	return
-
-LittlerootTown_MapScript2_1E7EC1: @ 81E7EC1
-	map_script_2 VAR_0x4092, 1, LittlerootTown_EventScript_1E7EDB
-	map_script_2 VAR_0x4092, 2, LittlerootTown_EventScript_1E7EF9
-	map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FB1
-	.2byte 0
-
-LittlerootTown_EventScript_1E7EDB:: @ 81E7EDB
-	lockall
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 8
-	call LittlerootTown_EventScript_1E7F17
-	setflag FLAG_0x2F9
-	warpsilent LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8
-	waitstate
-	releaseall
-	end
-
-LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9
-	lockall
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 8
-	call LittlerootTown_EventScript_1E7F17
-	setflag FLAG_0x2FA
-	warpsilent LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8
-	waitstate
-	releaseall
-	end
-
-LittlerootTown_EventScript_1E7F17:: @ 81E7F17
-	delay 15
-	playse SE_DANSA
-	applymovement 255, LittlerootTown_Movement_1E7FAC
-	waitmovement 0
-	opendoor VAR_0x8004, VAR_0x8005
-	waitdooranim
-	addobject 4
-	applymovement 4, LittlerootTown_Movement_1E7F98
-	waitmovement 0
-	closedoor VAR_0x8004, VAR_0x8005
-	waitdooranim
-	delay 10
-	applymovement 4, LittlerootTown_Movement_1E7F9A
-	waitmovement 0
-	msgbox LittlerootTown_Text_1E86BC, 4
-	closemessage
-	applymovement 4, LittlerootTown_Movement_1E7F9D
-	applymovement 255, LittlerootTown_Movement_1E7FA4
-	waitmovement 0
-	opendoor VAR_0x8004, VAR_0x8005
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E7FA1
-	applymovement 255, LittlerootTown_Movement_1E7FA9
-	waitmovement 0
-	setflag FLAG_0x2F0
-	setvar VAR_0x4092, 3
-	hideobjectat 255, PETALBURG_CITY
-	closedoor VAR_0x8004, VAR_0x8005
-	waitdooranim
-	clearflag FLAG_0x364
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	return
-
-LittlerootTown_Movement_1E7F98: @ 81E7F98
-	walk_down
-	step_end
-
-LittlerootTown_Movement_1E7F9A: @ 81E7F9A
-	walk_down
-	walk_in_place_fastest_left
-	step_end
-
-LittlerootTown_Movement_1E7F9D: @ 81E7F9D
-	delay_16
-	delay_8
-	walk_up
-	step_end
-
-LittlerootTown_Movement_1E7FA1: @ 81E7FA1
-	walk_up
-	set_invisible
-	step_end
-
-LittlerootTown_Movement_1E7FA4: @ 81E7FA4
-	delay_16
-	delay_8
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-LittlerootTown_Movement_1E7FA9: @ 81E7FA9
-	walk_up
-	walk_up
-	step_end
-
-LittlerootTown_Movement_1E7FAC: @ 81E7FAC
-	jump_right
-	delay_16
-	delay_16
-	delay_16
-	step_end
-
-LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
-	lockall
-	playse SE_PIN
-	applymovement 8, LittlerootTown_Movement_272598
-	waitmovement 0
-	delay 80
-	msgbox LittlerootTown_Text_1E8DA2, 4
-	closemessage
-	clearflag FLAG_0x31A
-	clearflag FLAG_0x31B
-	delay 20
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	warp LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
-	waitstate
-	releaseall
-	end
-
-LittlerootTown_MapScript2_1E7FE2: @ 81E7FE2
-	map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FEC
-	.2byte 0
-
-LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC
-	addobject 8
-	addobject 7
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_EventScript_1E8004
-	goto LittlerootTown_EventScript_1E8013
-	end
-
-LittlerootTown_EventScript_1E8004:: @ 81E8004
-	setobjectxy 7, 6, 10
-	setobjectxy 8, 5, 10
-	end
-
-LittlerootTown_EventScript_1E8013:: @ 81E8013
-	setobjectxy 7, 13, 10
-	setobjectxy 8, 14, 10
-	end
-
-LittlerootTown_EventScript_1E8022:: @ 81E8022
-	msgbox LittlerootTown_Text_1E8ACF, 2
-	end
-
-LittlerootTown_EventScript_1E802B:: @ 81E802B
-	msgbox LittlerootTown_Text_1E8B25, 2
-	end
-
-LittlerootTown_EventScript_1E8034:: @ 81E8034
-	lock
-	faceplayer
-	checkflag FLAG_0x074
-	goto_eq LittlerootTown_EventScript_1E8087
-	checkflag FLAG_0x052
-	goto_eq LittlerootTown_EventScript_1E807A
-	compare VAR_0x4050, 0
-	goto_if 5, LittlerootTown_EventScript_1E805D
-	msgbox LittlerootTown_Text_1E8BB8, 4
-	release
-	end
-
-LittlerootTown_EventScript_1E805D:: @ 81E805D
-	special GetPlayerBigGuyGirlString
-	msgbox LittlerootTown_Text_1E8C3A, 4
-	closemessage
-	applymovement 1, LittlerootTown_Movement_2725A2
-	waitmovement 0
-	setvar VAR_0x4050, 2
-	release
-	end
-
-LittlerootTown_EventScript_1E807A:: @ 81E807A
-	special GetPlayerBigGuyGirlString
-	msgbox LittlerootTown_Text_1E8CE3, 4
-	release
-	end
-
-LittlerootTown_EventScript_1E8087:: @ 81E8087
-	msgbox LittlerootTown_Text_1E8D07, 4
-	release
-	end
-
-LittlerootTown_EventScript_1E8091:: @ 81E8091
-	lockall
-	applymovement 1, LittlerootTown_Movement_1E80D1
-	waitmovement 0
-	call LittlerootTown_EventScript_1E80AD
-	applymovement 1, LittlerootTown_Movement_1E80E1
-	waitmovement 0
-	releaseall
-	end
-
-LittlerootTown_EventScript_1E80AD:: @ 81E80AD
-	msgbox LittlerootTown_Text_1E8BB8, 4
-	closemessage
-	applymovement 1, LittlerootTown_Movement_1E80DF
-	applymovement 255, LittlerootTown_Movement_1E80EB
-	waitmovement 0
-	msgbox LittlerootTown_Text_1E8C07, 4
-	closemessage
-	return
-
-LittlerootTown_Movement_1E80D1: @ 81E80D1
-	face_right
-	delay_8
-	disable_jump_landing_ground_effect
-	jump_in_place_right
-	delay_8
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	walk_fast_up
-	walk_fast_left
-	face_down
-	step_end
-
-LittlerootTown_Movement_1E80DF: @ 81E80DF
-	walk_down
-	step_end
-
-LittlerootTown_Movement_1E80E1: @ 81E80E1
-	walk_right
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_in_place_fastest_down
-	step_end
-
-LittlerootTown_Movement_1E80EB: @ 81E80EB
-	lock_facing_direction
-	walk_down
-	unlock_facing_direction
-	step_end
-
-LittlerootTown_EventScript_1E80EF:: @ 81E80EF
-	lockall
-	applymovement 1, LittlerootTown_Movement_1E810B
-	waitmovement 0
-	call LittlerootTown_EventScript_1E80AD
-	applymovement 1, LittlerootTown_Movement_1E8118
-	waitmovement 0
-	releaseall
-	end
-
-LittlerootTown_Movement_1E810B: @ 81E810B
-	face_right
-	delay_8
-	disable_jump_landing_ground_effect
-	jump_in_place_right
-	delay_8
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	face_down
-	step_end
-
-LittlerootTown_Movement_1E8118: @ 81E8118
-	walk_left
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_in_place_fastest_down
-	step_end
-
-LittlerootTown_EventScript_1E811F:: @ 81E811F
-	lockall
-	applymovement 1, LittlerootTown_Movement_2725A8
-	waitmovement 0
-	applymovement 255, LittlerootTown_Movement_2725A4
-	waitmovement 0
-	special GetPlayerBigGuyGirlString
-	msgbox LittlerootTown_Text_1E8C3A, 4
-	closemessage
-	applymovement 1, LittlerootTown_Movement_2725A2
-	waitmovement 0
-	setvar VAR_0x4050, 2
-	releaseall
-	end
-
-LittlerootTown_EventScript_1E8151:: @ 81E8151
-	msgbox LittlerootTown_Text_1E8D32, 3
-	end
-
-LittlerootTown_EventScript_1E815A:: @ 81E815A
-	msgbox LittlerootTown_Text_1E8D69, 3
-	end
-
-LittlerootTown_EventScript_1E8163:: @ 81E8163
-	lockall
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_EventScript_1E817D
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_EventScript_1E8186
-	releaseall
-	end
-
-LittlerootTown_EventScript_1E817D:: @ 81E817D
-	msgbox LittlerootTown_Text_1E8D83, 4
-	return
-
-LittlerootTown_EventScript_1E8186:: @ 81E8186
-	msgbox LittlerootTown_Text_1E8D8E, 4
-	return
-
-LittlerootTown_EventScript_1E818F:: @ 81E818F
-	lockall
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_EventScript_1E81A9
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_EventScript_1E81B2
-	releaseall
-	end
-
-LittlerootTown_EventScript_1E81A9:: @ 81E81A9
-	msgbox LittlerootTown_Text_1E8D8E, 4
-	return
-
-LittlerootTown_EventScript_1E81B2:: @ 81E81B2
-	msgbox LittlerootTown_Text_1E8D83, 4
-	return
-
-LittlerootTown_EventScript_1E81BB:: @ 81E81BB
-	lockall
-	setvar VAR_0x8008, 0
-	setobjectxy 4, 10, 9
-	goto LittlerootTown_EventScript_1E8211
-	end
-
-LittlerootTown_EventScript_1E81CE:: @ 81E81CE
-	lockall
-	setvar VAR_0x8008, 1
-	setobjectxy 4, 11, 9
-	goto LittlerootTown_EventScript_1E8211
-	end
-
-LittlerootTown_EventScript_1E81E1:: @ 81E81E1
-	lockall
-	setvar VAR_0x8008, 2
-	goto LittlerootTown_EventScript_1E8211
-	end
-
-LittlerootTown_EventScript_1E81ED:: @ 81E81ED
-	lockall
-	setvar VAR_0x8008, 3
-	goto LittlerootTown_EventScript_1E8211
-	end
-
-LittlerootTown_EventScript_1E81F9:: @ 81E81F9
-	lockall
-	setvar VAR_0x8008, 4
-	goto LittlerootTown_EventScript_1E8211
-	end
-
-LittlerootTown_EventScript_1E8205:: @ 81E8205
-	lockall
-	setvar VAR_0x8008, 5
-	goto LittlerootTown_EventScript_1E8211
-	end
-
-LittlerootTown_EventScript_1E8211:: @ 81E8211
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_EventScript_1E8297
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_EventScript_1E82A2
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_EventScript_1E8281
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_EventScript_1E828C
-	msgbox LittlerootTown_Text_1E87E1, 4
-	closemessage
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_EventScript_1E82AD
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_EventScript_1E82F0
-	call LittlerootTown_EventScript_1E8693
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_EventScript_1E8405
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_EventScript_1E8448
-	goto LittlerootTown_EventScript_1E8686
-	end
-
-LittlerootTown_EventScript_1E8281:: @ 81E8281
-	setvar VAR_0x8009, 5
-	setvar VAR_0x800A, 8
-	return
-
-LittlerootTown_EventScript_1E828C:: @ 81E828C
-	setvar VAR_0x8009, 14
-	setvar VAR_0x800A, 8
-	return
-
-LittlerootTown_EventScript_1E8297:: @ 81E8297
-	applymovement 4, LittlerootTown_Movement_2725A8
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_1E82A2:: @ 81E82A2
-	applymovement 4, LittlerootTown_Movement_2725A4
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_1E82AD:: @ 81E82AD
-	compare VAR_0x8008, 0
-	call_if 1, LittlerootTown_EventScript_1E8333
-	compare VAR_0x8008, 1
-	call_if 1, LittlerootTown_EventScript_1E8348
-	compare VAR_0x8008, 2
-	call_if 1, LittlerootTown_EventScript_1E835D
-	compare VAR_0x8008, 3
-	call_if 1, LittlerootTown_EventScript_1E8372
-	compare VAR_0x8008, 4
-	call_if 1, LittlerootTown_EventScript_1E8387
-	compare VAR_0x8008, 5
-	call_if 1, LittlerootTown_EventScript_1E839C
-	return
-
-LittlerootTown_EventScript_1E82F0:: @ 81E82F0
-	compare VAR_0x8008, 0
-	call_if 1, LittlerootTown_EventScript_1E8333
-	compare VAR_0x8008, 1
-	call_if 1, LittlerootTown_EventScript_1E8348
-	compare VAR_0x8008, 2
-	call_if 1, LittlerootTown_EventScript_1E83B1
-	compare VAR_0x8008, 3
-	call_if 1, LittlerootTown_EventScript_1E83C6
-	compare VAR_0x8008, 4
-	call_if 1, LittlerootTown_EventScript_1E83DB
-	compare VAR_0x8008, 5
-	call_if 1, LittlerootTown_EventScript_1E83F0
-	return
-
-LittlerootTown_EventScript_1E8333:: @ 81E8333
-	applymovement 255, LittlerootTown_Movement_2725AA
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85D1
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_1E8348:: @ 81E8348
-	applymovement 255, LittlerootTown_Movement_2725AA
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85D8
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_1E835D:: @ 81E835D
-	applymovement 255, LittlerootTown_Movement_2725A4
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85DF
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_1E8372:: @ 81E8372
-	applymovement 255, LittlerootTown_Movement_2725A4
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85E4
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_1E8387:: @ 81E8387
-	applymovement 255, LittlerootTown_Movement_2725A4
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85EA
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_1E839C:: @ 81E839C
-	applymovement 255, LittlerootTown_Movement_2725A4
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85ED
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_1E83B1:: @ 81E83B1
-	applymovement 255, LittlerootTown_Movement_2725A8
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85F1
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_1E83C6:: @ 81E83C6
-	applymovement 255, LittlerootTown_Movement_2725A8
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85F5
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_1E83DB:: @ 81E83DB
-	applymovement 255, LittlerootTown_Movement_2725A8
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85F8
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_1E83F0:: @ 81E83F0
-	applymovement 255, LittlerootTown_Movement_2725A8
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_1E85FE
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_1E8405:: @ 81E8405
-	compare VAR_0x8008, 0
-	call_if 1, LittlerootTown_EventScript_1E848B
-	compare VAR_0x8008, 1
-	call_if 1, LittlerootTown_EventScript_1E8496
-	compare VAR_0x8008, 2
-	call_if 1, LittlerootTown_EventScript_1E84A1
-	compare VAR_0x8008, 3
-	call_if 1, LittlerootTown_EventScript_1E84C7
-	compare VAR_0x8008, 4
-	call_if 1, LittlerootTown_EventScript_1E84ED
-	compare VAR_0x8008, 5
-	call_if 1, LittlerootTown_EventScript_1E8513
-	return
-
-LittlerootTown_EventScript_1E8448:: @ 81E8448
-	compare VAR_0x8008, 0
-	call_if 1, LittlerootTown_EventScript_1E848B
-	compare VAR_0x8008, 1
-	call_if 1, LittlerootTown_EventScript_1E8496
-	compare VAR_0x8008, 2
-	call_if 1, LittlerootTown_EventScript_1E8539
-	compare VAR_0x8008, 3
-	call_if 1, LittlerootTown_EventScript_1E855F
-	compare VAR_0x8008, 4
-	call_if 1, LittlerootTown_EventScript_1E8585
-	compare VAR_0x8008, 5
-	call_if 1, LittlerootTown_EventScript_1E85AB
-	return
-
-LittlerootTown_EventScript_1E848B:: @ 81E848B
-	applymovement 4, LittlerootTown_Movement_1E8603
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_1E8496:: @ 81E8496
-	applymovement 4, LittlerootTown_Movement_1E8609
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_1E84A1:: @ 81E84A1
-	applymovement 4, LittlerootTown_Movement_1E860F
-	waitmovement 0
-	opendoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
-	waitmovement 0
-	hideobjectat 4, LITTLEROOT_TOWN
-	closedoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_1E84C7:: @ 81E84C7
-	applymovement 4, LittlerootTown_Movement_1E8615
-	waitmovement 0
-	opendoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
-	waitmovement 0
-	hideobjectat 4, LITTLEROOT_TOWN
-	closedoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_1E84ED:: @ 81E84ED
-	applymovement 4, LittlerootTown_Movement_1E861C
-	waitmovement 0
-	opendoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
-	waitmovement 0
-	hideobjectat 4, LITTLEROOT_TOWN
-	closedoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_1E8513:: @ 81E8513
-	applymovement 4, LittlerootTown_Movement_1E8620
-	waitmovement 0
-	opendoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
-	waitmovement 0
-	hideobjectat 4, LITTLEROOT_TOWN
-	closedoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_1E8539:: @ 81E8539
-	applymovement 4, LittlerootTown_Movement_1E8625
-	waitmovement 0
-	opendoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
-	waitmovement 0
-	hideobjectat 4, LITTLEROOT_TOWN
-	closedoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_1E855F:: @ 81E855F
-	applymovement 4, LittlerootTown_Movement_1E862A
-	waitmovement 0
-	opendoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
-	waitmovement 0
-	hideobjectat 4, LITTLEROOT_TOWN
-	closedoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_1E8585:: @ 81E8585
-	applymovement 4, LittlerootTown_Movement_1E862E
-	waitmovement 0
-	opendoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
-	waitmovement 0
-	hideobjectat 4, LITTLEROOT_TOWN
-	closedoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_1E85AB:: @ 81E85AB
-	applymovement 4, LittlerootTown_Movement_1E8635
-	waitmovement 0
-	opendoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
-	waitmovement 0
-	hideobjectat 4, LITTLEROOT_TOWN
-	closedoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	return
-
-LittlerootTown_Movement_1E85D1: @ 81E85D1
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-LittlerootTown_Movement_1E85D8: @ 81E85D8
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-LittlerootTown_Movement_1E85DF: @ 81E85DF
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-LittlerootTown_Movement_1E85E4: @ 81E85E4
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-LittlerootTown_Movement_1E85EA: @ 81E85EA
-	walk_right
-	walk_right
-	step_end
-
-LittlerootTown_Movement_1E85ED: @ 81E85ED
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-LittlerootTown_Movement_1E85F1: @ 81E85F1
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-LittlerootTown_Movement_1E85F5: @ 81E85F5
-	walk_left
-	walk_left
-	step_end
-
-LittlerootTown_Movement_1E85F8: @ 81E85F8
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-LittlerootTown_Movement_1E85FE: @ 81E85FE
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-LittlerootTown_Movement_1E8603: @ 81E8603
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	step_end
-
-LittlerootTown_Movement_1E8609: @ 81E8609
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	step_end
-
-LittlerootTown_Movement_1E860F: @ 81E860F
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_in_place_fastest_up
-	step_end
-
-LittlerootTown_Movement_1E8615: @ 81E8615
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_in_place_fastest_up
-	step_end
-
-LittlerootTown_Movement_1E861C: @ 81E861C
-	walk_left
-	walk_left
-	walk_in_place_fastest_up
-	step_end
-
-LittlerootTown_Movement_1E8620: @ 81E8620
-	walk_left
-	walk_left
-	walk_left
-	walk_in_place_fastest_up
-	step_end
-
-LittlerootTown_Movement_1E8625: @ 81E8625
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-LittlerootTown_Movement_1E862A: @ 81E862A
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-LittlerootTown_Movement_1E862E: @ 81E862E
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-LittlerootTown_Movement_1E8635: @ 81E8635
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-LittlerootTown_Movement_1E863B: @ 81E863B
-	walk_up
-	step_end
-
-LittlerootTown_EventScript_1E863D:: @ 81E863D
-	lock
-	faceplayer
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_EventScript_1E8281
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_EventScript_1E828C
-	call LittlerootTown_EventScript_1E8693
-	applymovement 4, LittlerootTown_Movement_2725A6
-	waitmovement 0
-	opendoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_1E863B
-	waitmovement 0
-	hideobjectat 4, LITTLEROOT_TOWN
-	closedoor VAR_0x8009, VAR_0x800A
-	waitdooranim
-	goto LittlerootTown_EventScript_1E8686
-	end
-
-LittlerootTown_EventScript_1E8686:: @ 81E8686
-	removeobject 4
-	setflag FLAG_SYS_B_DASH
-	setvar VAR_0x4050, 4
-	release
-	end
-
-LittlerootTown_EventScript_1E8693:: @ 81E8693
-	msgbox LittlerootTown_Text_1E87F0, 4
-	playfanfare MUS_FANFA4
-	message LittlerootTown_Text_1E8925
-	waitfanfare
-	setflag FLAG_0x112
-	msgbox LittlerootTown_Text_1E894F, 4
-	msgbox LittlerootTown_Text_1E8A03, 4
-	closemessage
-	delay 30
-	return
-
-LittlerootTown_Text_1E86BC: @ 81E86BC
-	.string "MOM: {PLAYER}, we’re here, honey!\p"
-	.string "It must be tiring riding with our things\n"
-	.string "in the moving truck.\p"
-	.string "Well, this is LITTLEROOT TOWN.\p"
-	.string "How do you like it?\n"
-	.string "This is our new home!\p"
-	.string "It has a quaint feel, but it seems to be\n"
-	.string "an easy place to live, don’t you think?\p"
-	.string "And, you get your own room, {PLAYER}!\n"
-	.string "Let’s go inside.$"
-
-LittlerootTown_Text_1E87E1: @ 81E87E1
-	.string "MOM: Wait, {PLAYER}!$"
-
-LittlerootTown_Text_1E87F0: @ 81E87F0
-	.string "MOM: {PLAYER}! {PLAYER}! Did you\n"
-	.string "introduce yourself to PROF. BIRCH?\p"
-	.string "Oh! What an adorable POKéMON!\n"
-	.string "You got it from PROF. BIRCH. How nice!\p"
-	.string "You’re your father’s child, all right.\n"
-	.string "You look good together with POKéMON!\p"
-	.string "Here, honey! If you’re going out on an\n"
-	.string "adventure, wear these RUNNING SHOES.\p"
-	.string "They’ll put a zip in your step!$"
-
-LittlerootTown_Text_1E8925: @ 81E8925
-	.string "{PLAYER} switched shoes with the\n"
-	.string "RUNNING SHOES.$"
-
-LittlerootTown_Text_1E894F: @ 81E894F
-	.string "MOM: {PLAYER}, those shoes came with\n"
-	.string "instructions.\p"
-	.string "“Press the B Button while wearing these\n"
-	.string "RUNNING SHOES to run extra-fast!\p"
-	.string "“Slip on these RUNNING SHOES and race\n"
-	.string "in the great outdoors!”$"
-
-LittlerootTown_Text_1E8A03: @ 81E8A03
-	.string "… … … … … … … …\n"
-	.string "… … … … … … … …\p"
-	.string "To think that you have your very own\n"
-	.string "POKéMON now…\l"
-	.string "Your father will be overjoyed.\p"
-	.string "…But please be careful.\n"
-	.string "If anything happens, you can come home.\p"
-	.string "Go on, go get them, honey!$"
-
-LittlerootTown_Text_1E8ACF: @ 81E8ACF
-	.string "If you use a PC, you can store items\n"
-	.string "and POKéMON.\p"
-	.string "The power of science is staggering!$"
-
-LittlerootTown_Text_1E8B25: @ 81E8B25
-	.string "PROF. BIRCH spends days in his LAB\n"
-	.string "studying, then he’ll suddenly go out in\l"
-	.string "the wild to do more research…\p"
-	.string "When does PROF. BIRCH spend time\n"
-	.string "at home?$"
-
-LittlerootTown_Text_1E8BB8: @ 81E8BB8
-	.string "Um, um, um!\p"
-	.string "If you go outside and go in the grass,\n"
-	.string "wild POKéMON will jump out!$"
-
-LittlerootTown_Text_1E8C07: @ 81E8C07
-	.string "It’s dangerous if you don’t have\n"
-	.string "your own POKéMON.$"
-
-LittlerootTown_Text_1E8C3A: @ 81E8C3A
-	.string "Um, hi!\p"
-	.string "There are scary POKéMON outside!\n"
-	.string "I can hear their cries!\p"
-	.string "I want to go see what’s going on,\n"
-	.string "but I don’t have any POKéMON…\p"
-	.string "Can you go see what’s happening\n"
-	.string "for me?$"
-
-LittlerootTown_Text_1E8CE3: @ 81E8CE3
-	.string "You saved PROF. BIRCH!\n"
-	.string "I’m so glad!$"
-
-LittlerootTown_Text_1E8D07: @ 81E8D07
-	.string "Are you going to catch POKéMON?\n"
-	.string "Good luck!$"
-
-LittlerootTown_Text_1E8D32: @ 81E8D32
-	.string "LITTLEROOT TOWN\n"
-	.string "“A town that can’t be shaded any hue.”$"
-
-LittlerootTown_Text_1E8D69: @ 81E8D69
-	.string "PROF. BIRCH’S POKéMON LAB$"
-
-LittlerootTown_Text_1E8D83: @ 81E8D83
-	.string "{PLAYER}’s HOUSE$"
-
-LittlerootTown_Text_1E8D8E: @ 81E8D8E
-	.string "PROF. BIRCH’S HOUSE$"
-
-LittlerootTown_Text_1E8DA2: @ 81E8DA2
-	.string "PROF. BIRCH: Well, well, {PLAYER}{KUN}!\n"
-	.string "That was good work out there!\p"
-	.string "I knew there was something special\n"
-	.string "about you when I first saw you,\l"
-	.string "but I never expected this.\p"
-	.string "Oh, yes. Do you still have the POKéDEX\n"
-	.string "I gave you?\p"
-	.string "I have something to show you.\n"
-	.string "Let’s go to my LAB.$"
-
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
deleted file mode 100644
index 53825a84c..000000000
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
+++ /dev/null
@@ -1,451 +0,0 @@
-LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755
-	map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765
-	map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4
-	map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA
-	.byte 0
-
-LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765
-	compare VAR_0x4092, 6
-	call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_1F777A
-	checkflag FLAG_0x112
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F778D
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A
-	setmetatile 5, 4, 624, 1
-	setmetatile 5, 2, 616, 1
-	return
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A
-	return
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A
-	setmetatile 3, 7, 659, 1
-	return
-
-LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4
-	compare VAR_0x4092, 3
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77DE
-	compare VAR_0x4092, 5
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77C6
-	compare VAR_0x4092, 6
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77D2
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6
-	setobjectxyperm 1, 8, 4
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F77D2:: @ 81F77D2
-	setobjectxyperm 1, 4, 5
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE
-	setobjectxyperm 1, 9, 8
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA
-	map_script_2 VAR_0x4092, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C
-	map_script_2 VAR_0x4092, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814
-	map_script_2 VAR_0x4092, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D
-	map_script_2 VAR_0x4082, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E
-	map_script_2 VAR_0x4082, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2
-	.2byte 0
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814
-	lockall
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, 4
-	closemessage
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F783A
-	applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A
-	waitmovement 0
-	warp LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1
-	waitstate
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F783A: @ 81F783A
-	walk_up
-	step_end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F783C:: @ 81F783C
-	lockall
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 0
-	goto LittlerootTown_BrendansHouse_1F_EventScript_292704
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F784D:: @ 81F784D
-	lockall
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 1
-	goto LittlerootTown_BrendansHouse_1F_EventScript_29286D
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
-	lockall
-	playse SE_PIN
-	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_272598
-	waitmovement 0
-	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_27259A
-	waitmovement 0
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4
-	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C
-	waitmovement 0
-	special GetRivalSonDaughterString
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, 4
-	setflag FLAG_0x057
-	setvar VAR_0x4082, 2
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F789C: @ 81F789C
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3
-	lockall
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 0
-	applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A4
-	waitmovement 0
-	goto LittlerootTown_BrendansHouse_1F_EventScript_292765
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F78BE:: @ 81F78BE
-	lockall
-	setvar VAR_0x8008, 0
-	goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F78CA:: @ 81F78CA
-	lockall
-	setvar VAR_0x8008, 1
-	goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F78D6:: @ 81F78D6
-	lockall
-	setvar VAR_0x8008, 2
-	goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
-	playse SE_KAIDAN
-	delay 10
-	addobject 7
-	delay 30
-	playse SE_PIN
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_272598
-	waitmovement 0
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A
-	waitmovement 0
-	compare VAR_0x8008, 1
-	call_if 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7981
-	playbgm MUS_BOY_SUP, 1
-	compare VAR_0x8008, 0
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F798C
-	compare VAR_0x8008, 1
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F7997
-	compare VAR_0x8008, 2
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79A2
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, 4
-	closemessage
-	compare VAR_0x8008, 0
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79C1
-	compare VAR_0x8008, 1
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79D3
-	compare VAR_0x8008, 2
-	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79E5
-	playse SE_KAIDAN
-	removeobject 7
-	setflag FLAG_0x2E9
-	setflag FLAG_0x331
-	clearflag FLAG_0x2F8
-	delay 30
-	setvar VAR_0x408D, 3
-	setvar VAR_0x4050, 1
-	savebgm MUS_DUMMY
-	fadedefaultbgm
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725AA
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F798C:: @ 81F798C
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79AD
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F7997:: @ 81F7997
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79B5
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F79A2:: @ 81F79A2
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79B9
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_1F_Movement_1F79AD: @ 81F79AD
-	walk_in_place_fastest_left
-	walk_left
-	walk_in_place_fastest_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F79B5: @ 81F79B5
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9
-	walk_in_place_fastest_right
-	walk_right
-	walk_in_place_fastest_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F79C1:: @ 81F79C1
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F79F7
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A06
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F79D3:: @ 81F79D3
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F79FB
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A0C
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F79E5:: @ 81F79E5
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F7A02
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A16
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_1F_Movement_1F79F7: @ 81F79F7
-	delay_16
-	delay_8
-	walk_in_place_fastest_right
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB
-	delay_16
-	delay_8
-	walk_in_place_fastest_right
-	delay_16
-	delay_16
-	walk_in_place_fastest_up
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F7A02: @ 81F7A02
-	delay_16
-	delay_8
-	walk_in_place_fastest_left
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06
-	walk_in_place_fastest_right
-	walk_right
-	walk_in_place_fastest_up
-	walk_up
-	walk_up
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C
-	walk_in_place_fastest_right
-	walk_right
-	walk_in_place_fastest_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_left
-	walk_left
-	walk_in_place_fastest_up
-	walk_up
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16
-	walk_in_place_fastest_left
-	walk_left
-	walk_in_place_fastest_up
-	walk_up
-	walk_up
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Text_1F7A1C: @ 81F7A1C
-	.string "MOM: See, {PLAYER}?\n"
-	.string "Isn’t it nice in here, too?$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7A46: @ 81F7A46
-	.string "The mover’s POKéMON do all the work\n"
-	.string "of moving us in and cleaning up after.\l"
-	.string "This is so convenient!\p"
-	.string "{PLAYER}, your room is upstairs.\n"
-	.string "Go check it out, dear!\p"
-	.string "DAD bought you a new clock to mark\n"
-	.string "our move here.\l"
-	.string "Don’t forget to set it!$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7B24: @ 81F7B24
-	.string "MOM: Well, {PLAYER}?\p"
-	.string "Aren’t you interested in seeing your\n"
-	.string "very own room?$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7B67: @ 81F7B67
-LittlerootTown_MaysHouse_1F_Text_1F7B67: @ 81F7B67
-	.string "MOM: {PLAYER}.\p"
-	.string "Go set the clock in your room, honey.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7B96: @ 81F7B96
-	.string "MOM: Oh! {PLAYER}, {PLAYER}!\n"
-	.string "Quick! Come quickly!$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7BBC: @ 81F7BBC
-LittlerootTown_MaysHouse_1F_Text_1F7BBC: @ 81F7BBC
-	.string "MOM: Look! It’s PETALBURG GYM!\n"
-	.string "Maybe DAD will be on!$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7BF1: @ 81F7BF1
-LittlerootTown_MaysHouse_1F_Text_1F7BF1: @ 81F7BF1
-	.string "MOM: Oh… It’s over.\p"
-	.string "I think DAD was on, but we missed him.\n"
-	.string "Too bad.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7C35: @ 81F7C35
-LittlerootTown_MaysHouse_1F_Text_1F7C35: @ 81F7C35
-	.string "Oh, yes.\n"
-	.string "One of DAD’s friends lives in town.\p"
-	.string "PROF. BIRCH is his name.\p"
-	.string "He lives right next door, so you should\n"
-	.string "go over and introduce yourself.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7CC3: @ 81F7CC3
-	.string "MOM: See you, honey!$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7CD8: @ 81F7CD8
-	.string "MOM: Did you introduce yourself to\n"
-	.string "PROF. BIRCH?$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7D08: @ 81F7D08
-	.string "MOM: How are you doing, {PLAYER}?\n"
-	.string "You look a little tired.\p"
-	.string "I think you should rest a bit.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7D5C: @ 81F7D5C
-	.string "MOM: Take care, honey!$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7D73: @ 81F7D73
-	.string "MOM: Oh? Did DAD give you that BADGE?\p"
-	.string "Then here’s something from your MOM!$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7DBE: @ 81F7DBE
-	.string "Don’t push yourself too hard, dear.\n"
-	.string "You can always come home.\p"
-	.string "Go for it, honey!$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7E0E: @ 81F7E0E
-	.string "MOM: What is that, honey? A POKéNAV?\n"
-	.string "Someone from DEVON gave it to you?\p"
-	.string "Well, honey, how about registering\n"
-	.string "your mom?\p"
-	.string "… … …$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7E89: @ 81F7E89
-	.string "Registered MOM\n"
-	.string "in the POKéNAV.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7EA8: @ 81F7EA8
-	.string "Fugiiiiih!$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7EB3: @ 81F7EB3
-	.string "Huggoh, uggo uggo…$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7EC6: @ 81F7EC6
-	.string "INTERVIEWER: …We brought you this\n"
-	.string "report from in front of PETALBURG GYM.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7F0F: @ 81F7F0F
-	.string "There is a movie on TV.\p"
-	.string "Two men are dancing on a big piano\n"
-	.string "keyboard.\p"
-	.string "Better get going!$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66
-	.string "It’s the instruction booklet for the\n"
-	.string "RUNNING SHOES.\p"
-	.string "“Press the B Button to run while\n"
-	.string "wearing your RUNNING SHOES.\p"
-	.string "“Lace up your RUNNING SHOES and hit\n"
-	.string "the road running!”$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F800E: @ 81F800E
-	.string "DAD: Hm?\p"
-	.string "Hey, it’s {PLAYER}!\p"
-	.string "It’s been a while since I saw you,\n"
-	.string "but you look…stronger, somehow.\p"
-	.string "That’s the impression I get.\n"
-	.string "But your old man hasn’t given up yet!\p"
-	.string "Oh, yes, I have something for you.\n"
-	.string "This came to you from someone named\l"
-	.string "MR. BRINEY.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F80FE: @ 81F80FE
-	.string "DAD: Hm, a TICKET for a ferry?\p"
-	.string "If I recall, there are ferry ports in\n"
-	.string "SLATEPORT and LILYCOVE.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F815B: @ 81F815B
-	.string "I’d better get back to PETALBURG GYM.\p"
-	.string "MOM, thanks for looking after the house\n"
-	.string "while I’m away.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F81B9: @ 81F81B9
-	.string "MOM: That DAD of yours…\p"
-	.string "He comes home for the first time in a\n"
-	.string "while, but all he talks about is POKéMON.\p"
-	.string "He should relax and stay a little longer.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F824B: @ 81F824B
-	.string "MOM: Is that a breaking news story?$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F826F: @ 81F826F
-	.string "We bring you this emergency\n"
-	.string "news flash!\p"
-	.string "In various HOENN locales, there have\n"
-	.string "been reports of a BZZT…colored\l"
-	.string "POKéMON in flight.\p"
-	.string "The identity of this POKéMON is\n"
-	.string "currently unknown.\p"
-	.string "We now return you to the regular\n"
-	.string "movie program.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F8351: @ 81F8351
-	.string "MOM: {PLAYER}, did you catch that?\p"
-	.string "What color did the announcer say\n"
-	.string "that POKéMON was?$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F83A1: @ 81F83A1
-	.string "MOM: Well, isn’t that something!\n"
-	.string "There are still unknown POKéMON.$"
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
deleted file mode 100644
index 9fc2fe53e..000000000
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+++ /dev/null
@@ -1,423 +0,0 @@
-LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5
-	map_script 1, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5
-	map_script 3, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4
-	map_script 2, LittlerootTown_MaysHouse_1F_MapScript2_1F893A
-	.byte 0
-
-LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5
-	compare VAR_0x4092, 6
-	call_if 0, LittlerootTown_MaysHouse_1F_EventScript_1F88CA
-	checkflag FLAG_0x112
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F88DD
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA
-	setmetatile 5, 4, 624, 1
-	setmetatile 5, 2, 616, 1
-	return
-
-LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD
-	checkplayergender
-	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA
-	return
-
-LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA
-	setmetatile 6, 7, 659, 1
-	return
-
-LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4
-	compare VAR_0x4092, 3
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F892E
-	compare VAR_0x4092, 5
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8916
-	compare VAR_0x4092, 6
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8922
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916
-	setobjectxyperm 1, 2, 4
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8922:: @ 81F8922
-	setobjectxyperm 1, 6, 5
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E
-	setobjectxyperm 1, 1, 8
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A
-	map_script_2 VAR_0x4092, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C
-	map_script_2 VAR_0x4092, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964
-	map_script_2 VAR_0x4092, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D
-	map_script_2 VAR_0x408C, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE
-	map_script_2 VAR_0x4082, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2
-	.2byte 0
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964
-	lockall
-	msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, 4
-	closemessage
-	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F898A
-	applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A
-	waitmovement 0
-	warp LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1
-	waitstate
-	releaseall
-	end
-
-LittlerootTown_MaysHouse_1F_Movement_1F898A: @ 81F898A
-	walk_up
-	step_end
-
-LittlerootTown_MaysHouse_1F_EventScript_1F898C:: @ 81F898C
-	lockall
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	goto LittlerootTown_MaysHouse_1F_EventScript_292704
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_1F899D:: @ 81F899D
-	lockall
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	goto LittlerootTown_MaysHouse_1F_EventScript_2928DC
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE
-	lockall
-	playse SE_PIN
-	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_272598
-	waitmovement 0
-	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_27259A
-	waitmovement 0
-	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8
-	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC
-	waitmovement 0
-	special GetRivalSonDaughterString
-	msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, 4
-	setflag FLAG_0x057
-	setvar VAR_0x408C, 2
-	releaseall
-	end
-
-LittlerootTown_MaysHouse_1F_Movement_1F89EC: @ 81F89EC
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3
-LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3
-	lock
-	faceplayer
-	checkflag FLAG_0x082
-	goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A33
-	checkflag FLAG_SYS_POKEMON_GET
-	goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A29
-	compare VAR_0x408D, 3
-	goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F
-	special GetRivalSonDaughterString
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, 4
-	release
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F:: @ 81F8A1F
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D37, 4
-	release
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F8A29:: @ 81F8A29
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D93, 4
-	release
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F8A33:: @ 81F8A33
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8E01, 4
-	release
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D:: @ 81F8A3D
-LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D
-	lock
-	faceplayer
-	special GetPlayerBigGuyGirlString
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, 4
-	release
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C
-	lockall
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	applymovement VAR_0x8004, LittlerootTown_MaysHouse_1F_Movement_2725A8
-	waitmovement 0
-	goto LittlerootTown_MaysHouse_1F_EventScript_292765
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8A67:: @ 81F8A67
-	lockall
-	setvar VAR_0x8008, 0
-	goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8A73:: @ 81F8A73
-	lockall
-	setvar VAR_0x8008, 1
-	goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8A7F:: @ 81F8A7F
-	lockall
-	setvar VAR_0x8008, 2
-	goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
-	playse SE_KAIDAN
-	delay 10
-	addobject 7
-	delay 30
-	playse SE_PIN
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_272598
-	waitmovement 0
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A
-	waitmovement 0
-	compare VAR_0x8008, 1
-	call_if 5, LittlerootTown_MaysHouse_1F_EventScript_1F8B2A
-	playbgm MUS_GIRL_SUP, 1
-	compare VAR_0x8008, 0
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B35
-	compare VAR_0x8008, 1
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B40
-	compare VAR_0x8008, 2
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B4B
-	msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, 4
-	closemessage
-	compare VAR_0x8008, 0
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B6A
-	compare VAR_0x8008, 1
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B7C
-	compare VAR_0x8008, 2
-	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B8E
-	playse SE_KAIDAN
-	removeobject 7
-	setflag FLAG_0x2EA
-	setflag FLAG_0x332
-	clearflag FLAG_0x2D2
-	delay 30
-	setvar VAR_0x408D, 3
-	setvar VAR_0x4050, 1
-	savebgm MUS_DUMMY
-	fadedefaultbgm
-	releaseall
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A
-	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725AA
-	waitmovement 0
-	return
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8B35:: @ 81F8B35
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B56
-	waitmovement 0
-	return
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8B40:: @ 81F8B40
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B5E
-	waitmovement 0
-	return
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8B4B:: @ 81F8B4B
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B62
-	waitmovement 0
-	return
-
-LittlerootTown_MaysHouse_1F_Movement_1F8B56: @ 81F8B56
-	walk_in_place_fastest_left
-	walk_left
-	walk_in_place_fastest_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-LittlerootTown_MaysHouse_1F_Movement_1F8B5E: @ 81F8B5E
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62
-	walk_in_place_fastest_right
-	walk_right
-	walk_in_place_fastest_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8B6A:: @ 81F8B6A
-	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BA0
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BAF
-	waitmovement 0
-	return
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8B7C:: @ 81F8B7C
-	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BA4
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BB5
-	waitmovement 0
-	return
-
-LittlerootTown_MaysHouse_1F_EventScript_1F8B8E:: @ 81F8B8E
-	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BAB
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BBF
-	waitmovement 0
-	return
-
-LittlerootTown_MaysHouse_1F_Movement_1F8BA0: @ 81F8BA0
-	delay_16
-	delay_8
-	walk_in_place_fastest_right
-	step_end
-
-LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4
-	delay_16
-	delay_8
-	walk_in_place_fastest_right
-	delay_16
-	delay_16
-	walk_in_place_fastest_up
-	step_end
-
-LittlerootTown_MaysHouse_1F_Movement_1F8BAB: @ 81F8BAB
-	delay_16
-	delay_8
-	walk_in_place_fastest_left
-	step_end
-
-LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF
-	walk_in_place_fastest_right
-	walk_right
-	walk_in_place_fastest_up
-	walk_up
-	walk_up
-	step_end
-
-LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5
-	walk_in_place_fastest_right
-	walk_right
-	walk_in_place_fastest_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_left
-	walk_left
-	walk_in_place_fastest_up
-	walk_up
-	step_end
-
-LittlerootTown_MaysHouse_1F_Movement_1F8BBF: @ 81F8BBF
-	walk_in_place_fastest_left
-	walk_left
-	walk_in_place_fastest_up
-	walk_up
-	walk_up
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Text_1F8BC5: @ 81F8BC5
-LittlerootTown_MaysHouse_1F_Text_1F8BC5: @ 81F8BC5
-	.string "Oh, hello. And you are?\p"
-	.string "… … … … … … … … …\n"
-	.string "… … … … … … … … …\p"
-	.string "Oh, you’re {PLAYER}{KUN}, our new next-door\n"
-	.string "neighbor! Hi!\p"
-	.string "We have a {STR_VAR_1} about the same\n"
-	.string "age as you.\p"
-	.string "Our {STR_VAR_1} was excited about making\n"
-	.string "a new friend.\p"
-	.string "Our {STR_VAR_1} is upstairs, I think.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F8CA5: @ 81F8CA5
-	.string "Like child, like father.\p"
-	.string "My husband is as wild about POKéMON\n"
-	.string "as our child.\p"
-	.string "If he’s not at his LAB, he’s likely\n"
-	.string "scrabbling about in grassy places.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F8D37: @ 81F8D37
-	.string "That {RIVAL}!\p"
-	.string "I guess our child is too busy with\n"
-	.string "POKéMON to notice that you came\l"
-	.string "to visit, {PLAYER}{KUN}.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F8D93: @ 81F8D93
-	.string "Oh, {RIVAL} went out to ROUTE 103\n"
-	.string "just a little while ago.\p"
-	.string "Like father, like child.\n"
-	.string "{RIVAL} can’t stay quietly at home.$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F8E01: @ 81F8E01
-	.string "I think it’s wonderful for people to\n"
-	.string "travel with POKéMON.\p"
-	.string "But you should go home every so often\n"
-	.string "to let your mother know you’re okay.\p"
-	.string "She might not say it, but I’m sure she\n"
-	.string "worries about you, {PLAYER}{KUN}.$"
-
-LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6
-	.string "Huh?\n"
-	.string "Who… Who are you?\p"
-	.string "… … … … … … … …\n"
-	.string "… … … … … … … …\p"
-	.string "Oh, you’re {PLAYER}{KUN}.\n"
-	.string "So your move was today.\p"
-	.string "Um… I’m MAY.\n"
-	.string "Glad to meet you!\p"
-	.string "I…\n"
-	.string "I have this dream of becoming friends\l"
-	.string "with POKéMON all over the world.\p"
-	.string "I… I heard about you, {PLAYER}{KUN}, from\n"
-	.string "my dad, PROF. BIRCH.\p"
-	.string "I was hoping that you would be nice,\n"
-	.string "{PLAYER}{KUN}, and that we could be friends.\p"
-	.string "Oh, this is silly, isn’t it?\n"
-	.string "I… I’ve just met you, {PLAYER}{KUN}.\p"
-	.string "Eheheh…\p"
-	.string "Oh, no! I forgot!\p"
-	.string "I was supposed to go help Dad catch\n"
-	.string "some wild POKéMON!\p"
-	.string "{PLAYER}{KUN}, I’ll catch you later!$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F90B4: @ 81F90B4
-	.string "Hey!\n"
-	.string "You…\p"
-	.string "Who are you?\p"
-	.string "Oh, you’re {PLAYER}, aren’t you?\n"
-	.string "Moved in next door, right?\p"
-	.string "I didn’t know that you’re a girl.\p"
-	.string "Dad, PROF. BIRCH, said that our new\n"
-	.string "next-door neighbor is a GYM LEADER’s\l"
-	.string "kid, so I assumed you’d be a guy.\p"
-	.string "My name’s BRENDAN.\n"
-	.string "So, hi, neighbor!\p"
-	.string "Huh? Hey, {PLAYER}, don’t you have\n"
-	.string "a POKéMON?\p"
-	.string "Do you want me to go catch you one?\p"
-	.string "Aw, darn, I forgot…\p"
-	.string "I’m supposed to go help my dad catch\n"
-	.string "some wild POKéMON.\p"
-	.string "Some other time, okay?$"
-
-LittlerootTown_BrendansHouse_1F_Text_1F9262: @ 81F9262
-	.string "Hi, neighbor!\p"
-	.string "Do you already have your\n"
-	.string "own POKéMON?$"
diff --git a/data/scripts/maps/MarineCave_Entrance.inc b/data/scripts/maps/MarineCave_Entrance.inc
deleted file mode 100644
index a1f5489fe..000000000
--- a/data/scripts/maps/MarineCave_Entrance.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-MarineCave_Entrance_MapScripts:: @ 823AFD0
-	map_script 5, MarineCave_Entrance_MapScript1_23AFD6
-	.byte 0
-
-MarineCave_Entrance_MapScript1_23AFD6: @ 823AFD6
-	setdivewarp UNDERWATER_MARINE_CAVE, 255, 9, 6
-	end
-
diff --git a/data/scripts/maps/MirageTower_2F.inc b/data/scripts/maps/MirageTower_2F.inc
deleted file mode 100644
index c1a1d18d0..000000000
--- a/data/scripts/maps/MirageTower_2F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MirageTower_2F_MapScripts:: @ 823AD11
-	map_script 2, MirageTower_2F_MapScript2_2A8327
-	map_script 3, MirageTower_2F_MapScript1_2A8331
-	map_script 5, MirageTower_2F_MapScript1_23AD21
-	.byte 0
-
-MirageTower_2F_MapScript1_23AD21: @ 823AD21
-	setstepcallback 7
-	setholewarp MIRAGE_TOWER_1F, 255, 0, 0
-	end
-
diff --git a/data/scripts/maps/MirageTower_3F.inc b/data/scripts/maps/MirageTower_3F.inc
deleted file mode 100644
index bcf847344..000000000
--- a/data/scripts/maps/MirageTower_3F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MirageTower_3F_MapScripts:: @ 823AD2C
-	map_script 2, MirageTower_3F_MapScript2_2A8327
-	map_script 3, MirageTower_3F_MapScript1_2A8331
-	map_script 5, MirageTower_3F_MapScript1_23AD3C
-	.byte 0
-
-MirageTower_3F_MapScript1_23AD3C: @ 823AD3C
-	setstepcallback 7
-	setholewarp MIRAGE_TOWER_2F, 255, 0, 0
-	end
-
diff --git a/data/scripts/maps/MirageTower_4F.inc b/data/scripts/maps/MirageTower_4F.inc
deleted file mode 100644
index 10d465b74..000000000
--- a/data/scripts/maps/MirageTower_4F.inc
+++ /dev/null
@@ -1,79 +0,0 @@
-MirageTower_4F_MapScripts:: @ 823AD47
-	.byte 0
-
-MirageTower_4F_EventScript_23AD48:: @ 823AD48
-	lock
-	faceplayer
-	msgbox MirageTower_4F_Text_23ADF9, 5
-	compare VAR_RESULT, 0
-	goto_eq MirageTower_4F_EventScript_23AD7F
-	giveitem_std ITEM_ROOT_FOSSIL
-	closemessage
-	setflag FLAG_0x3C3
-	setflag FLAG_0x3C4
-	removeobject 1
-	delay 30
-	setflag FLAG_0x14F
-	goto MirageTower_4F_EventScript_23ADCA
-	end
-
-MirageTower_4F_EventScript_23AD7F:: @ 823AD7F
-	msgbox MirageTower_4F_Text_23AE79, 4
-	release
-	end
-
-MirageTower_4F_EventScript_23AD89:: @ 823AD89
-	lock
-	faceplayer
-	msgbox MirageTower_4F_Text_23AE98, 5
-	compare VAR_RESULT, 0
-	goto_eq MirageTower_4F_EventScript_23ADC0
-	giveitem_std ITEM_CLAW_FOSSIL
-	closemessage
-	setflag FLAG_0x3C4
-	setflag FLAG_0x3C3
-	removeobject 2
-	delay 30
-	setflag FLAG_0x150
-	goto MirageTower_4F_EventScript_23ADCA
-	end
-
-MirageTower_4F_EventScript_23ADC0:: @ 823ADC0
-	msgbox MirageTower_4F_Text_23AF18, 4
-	release
-	end
-
-MirageTower_4F_EventScript_23ADCA:: @ 823ADCA
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 32
-	setvar VAR_0x8007, 2
-	special sub_8139560
-	waitstate
-	special sub_81BE994
-	waitstate
-	setvar VAR_0x40CB, 1
-	clearflag FLAG_LANDMARK_MIRAGE_TOWER
-	warp ROUTE_111, 255, 19, 59
-	waitstate
-	release
-	end
-
-MirageTower_4F_Text_23ADF9: @ 823ADF9
-	.string "You found the ROOT FOSSIL.\p"
-	.string "If this FOSSIL is taken, the ground\n"
-	.string "around it will likely crumble away…\p"
-	.string "Take the ROOT FOSSIL anyway?$"
-
-MirageTower_4F_Text_23AE79: @ 823AE79
-	.string "{PLAYER} left the ROOT FOSSIL alone.$"
-
-MirageTower_4F_Text_23AE98: @ 823AE98
-	.string "You found the CLAW FOSSIL.\p"
-	.string "If this FOSSIL is taken, the ground\n"
-	.string "around it will likely crumble away…\p"
-	.string "Take the CLAW FOSSIL anyway?$"
-
-MirageTower_4F_Text_23AF18: @ 823AF18
-	.string "{PLAYER} left the CLAW FOSSIL alone.$"
-
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc
deleted file mode 100644
index bb6bfd9de..000000000
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ /dev/null
@@ -1,658 +0,0 @@
-MossdeepCity_Gym_MapScripts:: @ 8220800
-	map_script 1, MossdeepCity_Gym_MapScript1_220806
-	.byte 0
-
-MossdeepCity_Gym_MapScript1_220806: @ 8220806
-	checkflag FLAG_0x064
-	goto_eq MossdeepCity_Gym_EventScript_22083D
-	goto MossdeepCity_Gym_EventScript_220815
-	end
-
-MossdeepCity_Gym_EventScript_220815:: @ 8220815
-	checkflag FLAG_0x065
-	goto_eq MossdeepCity_Gym_EventScript_220855
-	goto MossdeepCity_Gym_EventScript_220824
-	end
-
-MossdeepCity_Gym_EventScript_220824:: @ 8220824
-	checkflag FLAG_0x066
-	goto_eq MossdeepCity_Gym_EventScript_22086D
-	goto MossdeepCity_Gym_EventScript_220833
-	end
-
-MossdeepCity_Gym_EventScript_220833:: @ 8220833
-	checkflag FLAG_0x067
-	goto_eq MossdeepCity_Gym_EventScript_220885
-	end
-
-MossdeepCity_Gym_EventScript_22083D:: @ 822083D
-	setmetatile 5, 5, 516, 0
-	setmetatile 2, 7, 569, 1
-	goto MossdeepCity_Gym_EventScript_220815
-	end
-
-MossdeepCity_Gym_EventScript_220855:: @ 8220855
-	setmetatile 8, 14, 516, 0
-	setmetatile 8, 10, 569, 1
-	goto MossdeepCity_Gym_EventScript_220824
-	end
-
-MossdeepCity_Gym_EventScript_22086D:: @ 822086D
-	setmetatile 15, 17, 524, 0
-	setmetatile 17, 15, 569, 1
-	goto MossdeepCity_Gym_EventScript_220833
-	end
-
-MossdeepCity_Gym_EventScript_220885:: @ 8220885
-	setmetatile 1, 23, 525, 0
-	setmetatile 5, 24, 569, 1
-	end
-
-MossdeepCity_Gym_EventScript_220898:: @ 8220898
-	trainerbattle 8, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq MossdeepCity_Gym_EventScript_22097E
-	checkflag FLAG_0x0AB
-	goto_if 0, MossdeepCity_Gym_EventScript_220937
-	msgbox MossdeepCity_Gym_Text_221B1D, 4
-	release
-	end
-
-MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
-	message MossdeepCity_Gym_Text_22196A
-	waitmessage
-	call MossdeepCity_Gym_EventScript_27207E
-	msgbox MossdeepCity_Gym_Text_221999, 4
-	setflag FLAG_0x4F6
-	setflag FLAG_BADGE07_GET
-	setflag FLAG_0x39C
-	clearflag FLAG_0x365
-	clearflag FLAG_0x393
-	setvar VAR_0x8008, 7
-	call MossdeepCity_Gym_EventScript_271F43
-	clearflag FLAG_0x389
-	clearflag FLAG_0x337
-	clearflag FLAG_0x2F4
-	clearflag FLAG_0x35E
-	clearflag FLAG_0x35F
-	setvar VAR_0x405D, 1
-	setflag FLAG_0x2F1
-	setvar VAR_0x409F, 1
-	call MossdeepCity_Gym_EventScript_22095B
-	closemessage
-	delay 30
-	playfanfare MUS_ME_TORE_EYE
-	msgbox MossdeepCity_Gym_Text_221AEA, 4
-	waitfanfare
-	closemessage
-	delay 30
-	setflag FLAG_0x1D8
-	release
-	end
-
-MossdeepCity_Gym_EventScript_220937:: @ 8220937
-	giveitem_std ITEM_TM04
-	compare VAR_RESULT, 0
-	goto_eq MossdeepCity_Gym_EventScript_272054
-	msgbox MossdeepCity_Gym_Text_221A40, 4
-	setflag FLAG_0x0AB
-	release
-	end
-
-MossdeepCity_Gym_EventScript_22095B:: @ 822095B
-	giveitem_std ITEM_TM04
-	compare VAR_RESULT, 0
-	goto_eq MossdeepCity_Gym_EventScript_27205E
-	msgbox MossdeepCity_Gym_Text_221A40, 4
-	setflag FLAG_0x0AB
-	return
-
-MossdeepCity_Gym_EventScript_22097E:: @ 822097E
-	trainerbattle 7, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8
-	msgbox MossdeepCity_Gym_Text_221E45, 6
-	end
-
-MossdeepCity_Gym_EventScript_220999:: @ 8220999
-	lockall
-	checkflag FLAG_0x064
-	goto_eq MossdeepCity_Gym_EventScript_2209D0
-	setflag FLAG_0x064
-	applymovement 255, MossdeepCity_Gym_Movement_220C30
-	waitmovement 0
-	setmetatile 5, 5, 516, 0
-	setmetatile 2, 7, 569, 1
-	goto MossdeepCity_Gym_EventScript_2209C8
-	end
-
-MossdeepCity_Gym_EventScript_2209C8:: @ 82209C8
-	special DrawWholeMapView
-	playse SE_TK_KASYA
-	releaseall
-	end
-
-MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0
-	clearflag FLAG_0x064
-	applymovement 255, MossdeepCity_Gym_Movement_220C30
-	waitmovement 0
-	setmetatile 5, 5, 524, 0
-	setmetatile 2, 7, 568, 1
-	goto MossdeepCity_Gym_EventScript_2209C8
-	end
-
-MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5
-	lockall
-	checkflag FLAG_0x065
-	goto_eq MossdeepCity_Gym_EventScript_220A24
-	setflag FLAG_0x065
-	applymovement 255, MossdeepCity_Gym_Movement_220C30
-	waitmovement 0
-	setmetatile 8, 14, 516, 0
-	setmetatile 8, 10, 569, 1
-	goto MossdeepCity_Gym_EventScript_2209C8
-	end
-
-MossdeepCity_Gym_EventScript_220A24:: @ 8220A24
-	clearflag FLAG_0x065
-	applymovement 255, MossdeepCity_Gym_Movement_220C30
-	waitmovement 0
-	setmetatile 8, 14, 517, 0
-	setmetatile 8, 10, 568, 1
-	goto MossdeepCity_Gym_EventScript_2209C8
-	end
-
-MossdeepCity_Gym_EventScript_220A49:: @ 8220A49
-	lockall
-	checkflag FLAG_0x066
-	goto_eq MossdeepCity_Gym_EventScript_220A78
-	setflag FLAG_0x066
-	applymovement 255, MossdeepCity_Gym_Movement_220C30
-	waitmovement 0
-	setmetatile 15, 17, 524, 0
-	setmetatile 17, 15, 569, 1
-	goto MossdeepCity_Gym_EventScript_2209C8
-	end
-
-MossdeepCity_Gym_EventScript_220A78:: @ 8220A78
-	clearflag FLAG_0x066
-	applymovement 255, MossdeepCity_Gym_Movement_220C30
-	waitmovement 0
-	setmetatile 15, 17, 516, 0
-	setmetatile 17, 15, 568, 1
-	goto MossdeepCity_Gym_EventScript_2209C8
-	end
-
-MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D
-	lockall
-	checkflag FLAG_0x067
-	goto_eq MossdeepCity_Gym_EventScript_220ACC
-	setflag FLAG_0x067
-	applymovement 255, MossdeepCity_Gym_Movement_220C30
-	waitmovement 0
-	setmetatile 1, 23, 525, 0
-	setmetatile 5, 24, 569, 1
-	goto MossdeepCity_Gym_EventScript_2209C8
-	end
-
-MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC
-	clearflag FLAG_0x067
-	applymovement 255, MossdeepCity_Gym_Movement_220C30
-	waitmovement 0
-	setmetatile 1, 23, 516, 0
-	setmetatile 5, 24, 568, 1
-	goto MossdeepCity_Gym_EventScript_2209C8
-	end
-
-MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1
-	lockall
-	warp7 MOSSDEEP_CITY_GYM, 255, 7, 30
-	waitstate
-	releaseall
-	end
-
-MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD
-	trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC
-	msgbox MossdeepCity_Gym_Text_220ED3, 6
-	end
-
-MossdeepCity_Gym_EventScript_220B14:: @ 8220B14
-	trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A
-	msgbox MossdeepCity_Gym_Text_220F3A, 6
-	end
-
-MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B
-	trainerbattle 0, TRAINER_BLAKE, 0, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024
-	msgbox MossdeepCity_Gym_Text_221055, 6
-	end
-
-MossdeepCity_Gym_EventScript_220B42:: @ 8220B42
-	trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152
-	msgbox MossdeepCity_Gym_Text_22116A, 6
-	end
-
-MossdeepCity_Gym_EventScript_220B59:: @ 8220B59
-	trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230
-	msgbox MossdeepCity_Gym_Text_22123D, 6
-	end
-
-MossdeepCity_Gym_EventScript_220B70:: @ 8220B70
-	trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309
-	msgbox MossdeepCity_Gym_Text_22132E, 6
-	end
-
-MossdeepCity_Gym_EventScript_220B87:: @ 8220B87
-	trainerbattle 0, TRAINER_SYLVIA, 0, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4
-	msgbox MossdeepCity_Gym_Text_221412, 6
-	end
-
-MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E
-	trainerbattle 0, TRAINER_NATE, 0, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7
-	msgbox MossdeepCity_Gym_Text_2214D3, 6
-	end
-
-MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5
-	trainerbattle 0, TRAINER_MACEY, 0, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658
-	msgbox MossdeepCity_Gym_Text_221680, 6
-	end
-
-MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC
-	trainerbattle 0, TRAINER_CLIFFORD, 0, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8
-	msgbox MossdeepCity_Gym_Text_2215E2, 6
-	end
-
-MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3
-	trainerbattle 0, TRAINER_NICHOLAS, 0, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D
-	msgbox MossdeepCity_Gym_Text_22173A, 6
-	end
-
-MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA
-	trainerbattle 0, TRAINER_KATHLEEN, 0, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B
-	msgbox MossdeepCity_Gym_Text_221545, 6
-	end
-
-MossdeepCity_Gym_EventScript_220C11:: @ 8220C11
-	lock
-	faceplayer
-	checkflag FLAG_0x4F6
-	goto_eq MossdeepCity_Gym_EventScript_220C26
-	msgbox MossdeepCity_Gym_Text_220CD5, 4
-	release
-	end
-
-MossdeepCity_Gym_EventScript_220C26:: @ 8220C26
-	msgbox MossdeepCity_Gym_Text_220E2A, 4
-	release
-	end
-
-MossdeepCity_Gym_Movement_220C30: @ 8220C30
-	delay_16
-	delay_16
-	step_end
-
-MossdeepCity_Gym_EventScript_220C33:: @ 8220C33
-	lockall
-	checkflag FLAG_BADGE07_GET
-	goto_eq MossdeepCity_Gym_EventScript_220C53
-	goto MossdeepCity_Gym_EventScript_220C5D
-	end
-
-MossdeepCity_Gym_EventScript_220C43:: @ 8220C43
-	lockall
-	checkflag FLAG_BADGE07_GET
-	goto_eq MossdeepCity_Gym_EventScript_220C53
-	goto MossdeepCity_Gym_EventScript_220C5D
-	end
-
-MossdeepCity_Gym_EventScript_220C53:: @ 8220C53
-	msgbox MossdeepCity_Gym_Text_221CCA, 4
-	releaseall
-	end
-
-MossdeepCity_Gym_EventScript_220C5D:: @ 8220C5D
-	msgbox MossdeepCity_Gym_Text_221CB0, 4
-	releaseall
-	end
-
-MossdeepCity_Gym_EventScript_220C67:: @ 8220C67
-	playse SE_MU_PACHI
-	waitse
-	playse SE_TU_SAA
-	mossdeepgym3 0
-	mossdeepgym1 0
-	waitmovement 0
-	mossdeepgym2
-	waitmovement 0
-	mossdeepgym4
-	end
-
-MossdeepCity_Gym_EventScript_220C7D:: @ 8220C7D
-	playse SE_MU_PACHI
-	waitse
-	playse SE_TU_SAA
-	mossdeepgym3 0
-	mossdeepgym1 1
-	waitmovement 0
-	mossdeepgym2
-	waitmovement 0
-	mossdeepgym4
-	end
-
-MossdeepCity_Gym_EventScript_220C93:: @ 8220C93
-	playse SE_MU_PACHI
-	waitse
-	playse SE_TU_SAA
-	mossdeepgym3 0
-	mossdeepgym1 2
-	waitmovement 0
-	mossdeepgym2
-	waitmovement 0
-	mossdeepgym4
-	end
-
-MossdeepCity_Gym_EventScript_220CA9:: @ 8220CA9
-	playse SE_MU_PACHI
-	waitse
-	playse SE_TU_SAA
-	mossdeepgym3 0
-	mossdeepgym1 3
-	waitmovement 0
-	mossdeepgym2
-	waitmovement 0
-	mossdeepgym4
-	end
-
-MossdeepCity_Gym_EventScript_220CBF:: @ 8220CBF
-	playse SE_MU_PACHI
-	waitse
-	playse SE_TU_SAA
-	mossdeepgym3 0
-	mossdeepgym1 4
-	waitmovement 0
-	mossdeepgym2
-	waitmovement 0
-	mossdeepgym4
-	end
-
-MossdeepCity_Gym_Text_220CD5: @ 8220CD5
-	.string "Yo, how’s it going, CHAMPION-bound\n"
-	.string "{PLAYER}?\p"
-	.string "The GYM LEADERS here use\n"
-	.string "PSYCHIC-type POKéMON.\p"
-	.string "If you go up against them with\n"
-	.string "FIGHTING- or POISON-type POKéMON,\l"
-	.string "they’ll inflict horrible damage!\p"
-	.string "Plus, they’ll come at you with\n"
-	.string "outstanding combination attacks.\p"
-	.string "If you want to win, you’ll need to show\n"
-	.string "them how tight you are with your\l"
-	.string "POKéMON. Go for it!$"
-
-MossdeepCity_Gym_Text_220E2A: @ 8220E2A
-	.string "Wow, you’re astounding!\n"
-	.string "You’re one great TRAINER!$"
-
-MossdeepCity_Gym_Text_220E5C: @ 8220E5C
-	.string "Battles hinge on the strength of your\n"
-	.string "spirit! The weak-spirited will never win!$"
-
-MossdeepCity_Gym_Text_220EAC: @ 8220EAC
-	.string "I lost!\n"
-	.string "I must temper my spirit again!$"
-
-MossdeepCity_Gym_Text_220ED3: @ 8220ED3
-	.string "The indecisive lose.\n"
-	.string "That’s my warning to you.$"
-
-MossdeepCity_Gym_Text_220F02: @ 8220F02
-	.string "Let me see your talent!$"
-
-MossdeepCity_Gym_Text_220F1A: @ 8220F1A
-	.string "You possess spectacular talent!$"
-
-MossdeepCity_Gym_Text_220F3A: @ 8220F3A
-	.string "If there are prodigies in the world,\n"
-	.string "then our GYM LEADERS are them!\p"
-	.string "However, you may be even more talented\n"
-	.string "than them…$"
-
-MossdeepCity_Gym_Text_220FB0: @ 8220FB0
-	.string "Fufufufu… Watch me levitate a POKé\n"
-	.string "BALL telekinetically!\p"
-	.string "Wrooooooooaaaar!\n"
-	.string "… … … … … … …\p"
-	.string "Sometimes, I’m out of sync…$"
-
-MossdeepCity_Gym_Text_221024: @ 8221024
-	.string "My POKéMON battling skills are out\n"
-	.string "of sync, too!$"
-
-MossdeepCity_Gym_Text_221055: @ 8221055
-	.string "A POKé BALL was too heavy to lift\n"
-	.string "psychically. But this dust bunny…\p"
-	.string "Whoooooooooooooooh!\n"
-	.string "… … … … … …\p"
-	.string "No, I’m not cheating!\n"
-	.string "I didn’t blow on it! Honestly!$"
-
-MossdeepCity_Gym_Text_2210EE: @ 82210EE
-	.string "When you lose to me, don’t be too hard\n"
-	.string "on yourself.\p"
-	.string "It’s not that you’re weak--I’m just\n"
-	.string "too strong!$"
-
-MossdeepCity_Gym_Text_221152: @ 8221152
-	.string "You’re just too strong!$"
-
-MossdeepCity_Gym_Text_22116A: @ 822116A
-	.string "I’m not going to get down on myself for\n"
-	.string "losing. I just need to train harder.\p"
-	.string "Positive thinking--that’s my strong\n"
-	.string "point!$"
-
-MossdeepCity_Gym_Text_2211E2: @ 82211E2
-	.string "I see it…\n"
-	.string "I see your future…\p"
-	.string "If you can beat me, I will tell you\n"
-	.string "your future!$"
-
-MossdeepCity_Gym_Text_221230: @ 8221230
-	.string "I surrender!$"
-
-MossdeepCity_Gym_Text_22123D: @ 822123D
-	.string "You will wage a terrifically intense\n"
-	.string "battle with our GYM LEADERS…\p"
-	.string "The result…\n"
-	.string "You won’t hear it from me!$"
-
-MossdeepCity_Gym_Text_2212A6: @ 82212A6
-	.string "The roads you have traveled…\n"
-	.string "What you have experienced…\p"
-	.string "Come at me with everything you’ve\n"
-	.string "learned!$"
-
-MossdeepCity_Gym_Text_221309: @ 8221309
-	.string "You’ve traveled a path of greatness!$"
-
-MossdeepCity_Gym_Text_22132E: @ 822132E
-	.string "A bright future awaits those who have\n"
-	.string "worked diligently.\p"
-	.string "For those who lazed idly, there is\n"
-	.string "only despair at the end.\p"
-	.string "What goes around comes around…$"
-
-MossdeepCity_Gym_Text_2213C2: @ 82213C2
-	.string "Even at the risk of life, I will win\n"
-	.string "this battle!$"
-
-MossdeepCity_Gym_Text_2213F4: @ 82213F4
-	.string "What you do…\n"
-	.string "It horrifies me…$"
-
-MossdeepCity_Gym_Text_221412: @ 8221412
-	.string "How dare you beat me…\p"
-	.string "It won’t be my fault if something\n"
-	.string "horrible befalls you…$"
-
-MossdeepCity_Gym_Text_221460: @ 8221460
-	.string "Hohoho.\p"
-	.string "You need me to show you how tenacious\n"
-	.string "the PSYCHIC type can be.$"
-
-MossdeepCity_Gym_Text_2214A7: @ 82214A7
-	.string "Oh! My, my!\n"
-	.string "Your battle style is fantastic!$"
-
-MossdeepCity_Gym_Text_2214D3: @ 82214D3
-	.string "I… I don’t let defeat rattle m-me,\n"
-	.string "however b-badly.$"
-
-MossdeepCity_Gym_Text_221507: @ 8221507
-	.string "Let me show you a perfectly awful,\n"
-	.string "horrifying time!$"
-
-MossdeepCity_Gym_Text_22153B: @ 822153B
-	.string "N-nooooo!$"
-
-MossdeepCity_Gym_Text_221545: @ 8221545
-	.string "Your vitality is contagious!\n"
-	.string "Get away from me quickly!$"
-
-MossdeepCity_Gym_Text_22157C: @ 822157C
-	.string "I may be past my prime, but I suggest\n"
-	.string "you not patronize me.$"
-
-MossdeepCity_Gym_Text_2215B8: @ 82215B8
-	.string "Ah, you overflow with the power\n"
-	.string "of youth!$"
-
-MossdeepCity_Gym_Text_2215E2: @ 82215E2
-	.string "It seems that I could not overcome\n"
-	.string "your youthful energy.$"
-
-MossdeepCity_Gym_Text_22161B: @ 822161B
-	.string "You’re not getting through to the end!\n"
-	.string "Not if I can help it!$"
-
-MossdeepCity_Gym_Text_221658: @ 8221658
-	.string "How could you be so ludicrously\n"
-	.string "strong?$"
-
-MossdeepCity_Gym_Text_221680: @ 8221680
-	.string "Humph! You may be strong, but you’re\n"
-	.string "not suitable for the PSYCHIC type!\p"
-	.string "The way you battle is somehow brutal!$"
-
-MossdeepCity_Gym_Text_2216EE: @ 82216EE
-	.string "Wroooar! Have a taste of my super\n"
-	.string "POKéMON hard-battling power!$"
-
-MossdeepCity_Gym_Text_22172D: @ 822172D
-	.string "Oh!\n"
-	.string "Done in!$"
-
-MossdeepCity_Gym_Text_22173A: @ 822173A
-	.string "All right! I think I’ll develop a special\n"
-	.string "invincible POKéMON power next.$"
-
-MossdeepCity_Gym_Text_221783: @ 8221783
-	.string "TATE: Hehehe… Were you surprised?\p"
-	.string "LIZA: Fufufu… Were you surprised?\p"
-	.string "TATE: That there are two GYM LEADERS?\n"
-	.string "LIZA: That there are two GYM LEADERS?\p"
-	.string "TATE: We’re twins!\n"
-	.string "LIZA: We’re twins!\p"
-	.string "TATE: We don’t need to talk because…\n"
-	.string "LIZA: We can each determine what…\p"
-	.string "TATE: The other is thinking…\n"
-	.string "LIZA: All in our minds!\p"
-	.string "TATE: This combination of ours…\n"
-	.string "LIZA: Can you beat it?$"
-
-MossdeepCity_Gym_Text_2218EC: @ 82218EC
-	.string "TATE: What?! Our combination…\n"
-	.string "LIZA: Was shattered!\p"
-	.string "TATE: It can’t be helped. You’ve won…\n"
-	.string "LIZA: So, in recognition, take this.$"
-
-MossdeepCity_Gym_Text_22196A: @ 822196A
-	.string "{PLAYER} received the MIND BADGE\n"
-	.string "from TATE and LIZA.$"
-
-MossdeepCity_Gym_Text_221999: @ 8221999
-	.string "TATE: The MIND BADGE enhances the\n"
-	.string "SP. ATK and SP. DEF of POKéMON.\p"
-	.string "LIZA: It also lets you use the HM move\n"
-	.string "DIVE outside of battle.\p"
-	.string "TATE: You should also take this, too.$"
-
-MossdeepCity_Gym_Text_221A40: @ 8221A40
-	.string "TATE: That TM04 contains…\n"
-	.string "LIZA: CALM MIND!\p"
-	.string "TATE: It raises SP. ATK and…\n"
-	.string "LIZA: It raises SP. DEF!\p"
-	.string "TATE: It’s a move that’s perfect…\n"
-	.string "LIZA: For PSYCHIC POKéMON!\p"
-	.string "… … … … … …$"
-
-MossdeepCity_Gym_Text_221AEA: @ 8221AEA
-	.string "Registered GYM LEADERS TATE & LIZA\n"
-	.string "in the POKéNAV.$"
-
-MossdeepCity_Gym_Text_221B1D: @ 8221B1D
-	.string "TATE: Looks like the bond between you\n"
-	.string "and your POKéMON is far stronger than\l"
-	.string "the bond that we share as twins.\p"
-	.string "LIZA: You will become even stronger!\n"
-	.string "We’ve battled you, so we know.$"
-
-MossdeepCity_Gym_Text_221BCE: @ 8221BCE
-	.string "TATE: Hehehe… Were you surprised?\p"
-	.string "LIZA: That there are two GYM LEADERS?\p"
-	.string "TATE: Oops, you have only one…\n"
-	.string "LIZA: POKéMON that can battle.\p"
-	.string "TATE: We can’t battle that way!\p"
-	.string "LIZA: If you want to challenge us,\n"
-	.string "bring some more POKéMON.$"
-
-MossdeepCity_Gym_Text_221CB0: @ 8221CB0
-	.string "MOSSDEEP CITY POKéMON GYM$"
-
-MossdeepCity_Gym_Text_221CCA: @ 8221CCA
-	.string "MOSSDEEP CITY POKéMON GYM\p"
-	.string "LIZA AND TATE’S CERTIFIED TRAINERS:\n"
-	.string "{PLAYER}$"
-
-MossdeepCity_Gym_Text_221D0B: @ 8221D0B
-	.string "TATE: POKéMON…\n"
-	.string "LIZA: POKéMON…\p"
-	.string "TATE: By changing the party’s mix…\n"
-	.string "LIZA: The battle style changes.\p"
-	.string "TATE: But me…\n"
-	.string "LIZA: But me…\p"
-	.string "TATE: I’ll always be with LIZA!\n"
-	.string "LIZA: I’ll always be with TATE!\p"
-	.string "TATE: Our combination…\n"
-	.string "LIZA: We’ll show you again and again!$"
-
-MossdeepCity_Gym_Text_221E05: @ 8221E05
-	.string "TATE: You and your POKéMON…\n"
-	.string "LIZA: It’s as if you were siblings!$"
-
-MossdeepCity_Gym_Text_221E45: @ 8221E45
-	.string "TATE: You can knock us down,\n"
-	.string "but we’ll never stay down!\p"
-	.string "LIZA: Because the two of us,\n"
-	.string "we always support each other!$"
-
-MossdeepCity_Gym_Text_221EB8: @ 8221EB8
-	.string "TATE: You’re back again…\n"
-	.string "LIZA: You’re back again…\p"
-	.string "TATE: To give us a rematch.\n"
-	.string "LIZA: To give us a rematch.\p"
-	.string "TATE: But…\n"
-	.string "LIZA: For our match…\p"
-	.string "TATE: You brought just one POKéMON!\n"
-	.string "LIZA: You brought just one POKéMON!\p"
-	.string "TATE: We need you to bring at least…\n"
-	.string "LIZA: Two POKéMON when you come back.$"
-
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc
deleted file mode 100644
index 52d01db6c..000000000
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc
+++ /dev/null
@@ -1,524 +0,0 @@
-MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58
-	map_script 3, MossdeepCity_SpaceCenter_2F_MapScript1_223D63
-	map_script 2, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5
-	.byte 0
-
-MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63
-	compare VAR_0x405D, 2
-	call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D7A
-	compare VAR_0x409F, 2
-	call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D9F
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A
-	clearflag FLAG_0x0CD
-	setobjectxyperm 3, 5, 3
-	setobjectmovementtype 3, 10
-	setobjectxyperm 1, 3, 2
-	setobjectmovementtype 1, 10
-	setobjectxyperm 2, 1, 3
-	setobjectmovementtype 2, 10
-	return
-
-MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F
-	setobjectxyperm 5, 11, 2
-	setobjectxyperm 7, 15, 2
-	setobjectxyperm 6, 13, 4
-	return
-
-MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5
-	map_script_2 VAR_0x409F, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF
-	.2byte 0
-
-MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF
-	playse SE_PIN
-	applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_272598
-	waitmovement 0
-	applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_27259A
-	waitmovement 0
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, 5
-	compare VAR_RESULT, 1
-	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, 4
-	closemessage
-	applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_223E07
-	waitmovement 0
-	warp MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1
-	waitstate
-	releaseall
-	end
-
-MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07
-	walk_up
-	step_end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09
-	msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, 4
-	trainerbattle 3, TRAINER_GRUNT_34, 0, MossdeepCity_SpaceCenter_2F_Text_224461
-	applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85
-	waitmovement 0
-	applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A4
-	waitmovement 0
-	msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, 4
-	trainerbattle 3, TRAINER_GRUNT_35, 0, MossdeepCity_SpaceCenter_2F_Text_224499
-	applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81
-	waitmovement 0
-	applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A8
-	waitmovement 0
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, 4
-	trainerbattle 3, TRAINER_GRUNT_36, 0, MossdeepCity_SpaceCenter_2F_Text_2244F1
-	applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89
-	waitmovement 0
-	setvar VAR_0x409F, 2
-	moveobjectoffscreen 5
-	moveobjectoffscreen 7
-	moveobjectoffscreen 6
-	releaseall
-	end
-
-MossdeepCity_SpaceCenter_2F_Movement_223E81: @ 8223E81
-	lock_facing_direction
-	walk_left
-	unlock_facing_direction
-	step_end
-
-MossdeepCity_SpaceCenter_2F_Movement_223E85: @ 8223E85
-	lock_facing_direction
-	walk_down
-	unlock_facing_direction
-	step_end
-
-MossdeepCity_SpaceCenter_2F_Movement_223E89: @ 8223E89
-	lock_facing_direction
-	walk_right
-	unlock_facing_direction
-	step_end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D
-	lock
-	faceplayer
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EB4
-	compare VAR_0x405D, 2
-	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE
-	compare VAR_0x405D, 2
-	goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EB4
-	goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223EB4:: @ 8223EB4
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2241A1, 4
-	release
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223EBE:: @ 8223EBE
-	msgbox MossdeepCity_SpaceCenter_2F_Text_22420C, 4
-	release
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8
-	lock
-	faceplayer
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EEF
-	compare VAR_0x405D, 2
-	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9
-	compare VAR_0x405D, 2
-	goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EEF
-	goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223EEF:: @ 8223EEF
-	msgbox MossdeepCity_SpaceCenter_2F_Text_224253, 4
-	release
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223EF9:: @ 8223EF9
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2242C5, 4
-	release
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03
-	lock
-	faceplayer
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F2A
-	compare VAR_0x405D, 2
-	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34
-	compare VAR_0x405D, 2
-	goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223F2A
-	goto MossdeepCity_SpaceCenter_2F_EventScript_223F34
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223F2A:: @ 8223F2A
-	msgbox MossdeepCity_SpaceCenter_2F_Text_224342, 4
-	release
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223F34:: @ 8223F34
-	msgbox MossdeepCity_SpaceCenter_2F_Text_224376, 4
-	release
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223F3E:: @ 8223F3E
-	msgbox MossdeepCity_SpaceCenter_2F_Text_22452C, 2
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223F47:: @ 8223F47
-	msgbox MossdeepCity_SpaceCenter_2F_Text_224570, 2
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223F50:: @ 8223F50
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2245AF, 2
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59
-	lock
-	faceplayer
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, 4
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223F6F:: @ 8223F6F
-	lockall
-	msgbox MossdeepCity_SpaceCenter_2F_Text_22467B, 4
-	releaseall
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A
-	lockall
-	checkflag FLAG_0x0CD
-	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223FDA
-	setflag FLAG_0x0CD
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, 4
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, 4
-	closemessage
-	delay 30
-	playse SE_KOUKA_L
-	switch VAR_FACING
-	case 1, MossdeepCity_SpaceCenter_2F_EventScript_223FBA
-	applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FC6
-	waitmovement 0
-	releaseall
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223FBA:: @ 8223FBA
-	applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FCF
-	waitmovement 0
-	releaseall
-	end
-
-MossdeepCity_SpaceCenter_2F_Movement_223FC6: @ 8223FC6
-	lock_facing_direction
-	walk_fast_up
-	walk_fast_up
-	unlock_facing_direction
-	delay_16
-	delay_16
-	walk_slow_down
-	walk_slow_down
-	step_end
-
-MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF
-	face_left
-	lock_facing_direction
-	walk_fast_right
-	walk_fast_right
-	unlock_facing_direction
-	delay_16
-	delay_16
-	walk_slow_left
-	walk_slow_left
-	face_down
-	step_end
-
-MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E
-	waitmovement 0
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, 5
-	compare VAR_RESULT, 1
-	goto_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C
-	msgbox MossdeepCity_SpaceCenter_2F_Text_224854, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA
-	waitmovement 0
-	releaseall
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA
-	waitmovement 0
-	special SavePlayerParty
-	fadescreen 1
-	special sub_80F9438
-	waitstate
-	compare VAR_RESULT, 0
-	goto_if 5, MossdeepCity_SpaceCenter_2F_EventScript_224032
-	special LoadPlayerParty
-	goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA
-
-MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
-	special sub_80F94E8
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	special sub_81A1780
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 0
-	special sub_8163AC4
-	waitstate
-	setvar VAR_0x8004, 6
-	special sub_81A1780
-	special LoadPlayerParty
-	switch VAR_RESULT
-	case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071
-	fadescreen 1
-	special sp0C8_whiteout_maybe
-	waitstate
-
-MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, 4
-	closemessage
-	delay 20
-	applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4
-	applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725AA
-	waitmovement 0
-	delay 60
-	applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A6
-	applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8
-	waitmovement 0
-	delay 20
-	msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, 4
-	closemessage
-	setvar VAR_0x405D, 3
-	fadedefaultbgm
-	fadescreen 1
-	setvar VAR_0x409F, 3
-	setflag FLAG_0x2F4
-	setflag FLAG_0x35E
-	setflag FLAG_0x337
-	removeobject 5
-	removeobject 7
-	removeobject 6
-	removeobject 8
-	removeobject 9
-	setobjectxy 3, 5, 6
-	turnobject 3, 1
-	setobjectxy 2, 11, 8
-	turnobject 2, 2
-	setobjectxy 1, 6, 2
-	turnobject 1, 2
-	call MossdeepCity_SpaceCenter_2F_EventScript_224131
-	fadescreen 0
-	msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, 4
-	closemessage
-	fadescreen 1
-	setflag FLAG_0x075
-	setflag FLAG_0x3C7
-	removeobject 4
-	setflag FLAG_0x2E1
-	clearflag FLAG_0x3C7
-	setvar VAR_0x40C6, 1
-	setflag FLAG_0x314
-	removeobject 3
-	setobjectxyperm 3, 5, 6
-	setobjectmovementtype 3, 2
-	addobject 3
-	fadescreen 0
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_224131:: @ 8224131
-	switch VAR_FACING
-	case 1, MossdeepCity_SpaceCenter_2F_EventScript_22414D
-	case 3, MossdeepCity_SpaceCenter_2F_EventScript_224152
-	return
-
-MossdeepCity_SpaceCenter_2F_EventScript_22414D:: @ 822414D
-	turnobject 4, 2
-	return
-
-MossdeepCity_SpaceCenter_2F_EventScript_224152:: @ 8224152
-	turnobject 4, 4
-	return
-
-MossdeepCity_SpaceCenter_2F_EventScript_224157:: @ 8224157
-	trainerbattle 10, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166
-	trainerbattle 11, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175
-	lockall
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_224193
-	compare VAR_RESULT, 1
-	call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_22419A
-	closemessage
-	clearflag FLAG_0x075
-	releaseall
-	end
-
-MossdeepCity_SpaceCenter_2F_EventScript_224193:: @ 8224193
-	pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B38C1
-	waitmessage
-	return
-
-MossdeepCity_SpaceCenter_2F_EventScript_22419A:: @ 822419A
-	pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B39C6
-	waitmessage
-	return
-
-MossdeepCity_SpaceCenter_2F_Text_2241A1: @ 82241A1
-	.string "MOSSDEEP has mainly sunny weather,\n"
-	.string "and its winds are stable.\p"
-	.string "It’s an ideal location for launching\n"
-	.string "rockets.$"
-
-MossdeepCity_SpaceCenter_2F_Text_22420C: @ 822420C
-	.string "Why would TEAM MAGMA want to steal\n"
-	.string "our rocket fuel in the first place?$"
-
-MossdeepCity_SpaceCenter_2F_Text_224253: @ 8224253
-	.string "If only I was a little younger, I would\n"
-	.string "have liked being an astronaut…\p"
-	.string "No… It’s not too late!\n"
-	.string "I can and will try!$"
-
-MossdeepCity_SpaceCenter_2F_Text_2242C5: @ 82242C5
-	.string "If TEAM MAGMA takes the rocket fuel,\n"
-	.string "I won’t be able to go to space!\p"
-	.string "They can’t be allowed to get away\n"
-	.string "with such an outrage!$"
-
-MossdeepCity_SpaceCenter_2F_Text_224342: @ 8224342
-	.string "I wish ordinary people could go into\n"
-	.string "space one day…$"
-
-MossdeepCity_SpaceCenter_2F_Text_224376: @ 8224376
-	.string "TEAM MAGMA…\n"
-	.string "Do they want to go to space, too?$"
-
-MossdeepCity_SpaceCenter_2F_Text_2243A4: @ 82243A4
-	.string "What’s wrong with you?\p"
-	.string "You’re outnumbered three to one,\n"
-	.string "but you still want to take us on?$"
-
-MossdeepCity_SpaceCenter_2F_Text_2243FE: @ 82243FE
-	.string "Good answer!\n"
-	.string "That’s what a smart person’ll do!$"
-
-MossdeepCity_SpaceCenter_2F_Text_22442D: @ 822442D
-	.string "A reckless go-getter, are you?\n"
-	.string "Okay, I’ll go first!$"
-
-MossdeepCity_SpaceCenter_2F_Text_224461: @ 8224461
-	.string "I lost!\n"
-	.string "But!$"
-
-MossdeepCity_SpaceCenter_2F_Text_22446E: @ 822446E
-	.string "It’s too soon to be relieved!\n"
-	.string "I’m up next!$"
-
-MossdeepCity_SpaceCenter_2F_Text_224499: @ 8224499
-	.string "I lost, too!\n"
-	.string "But!$"
-
-MossdeepCity_SpaceCenter_2F_Text_2244AB: @ 82244AB
-	.string "I bet you want to take a break.\n"
-	.string "But I’m not about to let you do that!$"
-
-MossdeepCity_SpaceCenter_2F_Text_2244F1: @ 82244F1
-	.string "We should’ve taken a break…\n"
-	.string "That’s what we should’ve done…$"
-
-MossdeepCity_SpaceCenter_2F_Text_22452C: @ 822452C
-	.string "Three of us here, and look at the sorry\n"
-	.string "mess we got ourselves into.$"
-
-MossdeepCity_SpaceCenter_2F_Text_224570: @ 8224570
-	.string "We three losing like this…\n"
-	.string "We look worse than usual by triple!$"
-
-MossdeepCity_SpaceCenter_2F_Text_2245AF: @ 82245AF
-	.string "Are we being useful to our leader\n"
-	.string "at all?$"
-
-MossdeepCity_SpaceCenter_2F_Text_2245D9: @ 82245D9
-	.string "Hehehe!\p"
-	.string "We come all the way here to get some\n"
-	.string "fuel, and we’re interfered with again!\p"
-	.string "If you’re going to mess with us too,\n"
-	.string "we’ll take care of you at the same time!$"
-
-MossdeepCity_SpaceCenter_2F_Text_22467B: @ 822467B
-	.string "MAXIE: Clear out of the way!\n"
-	.string "Don’t you dare interfere!$"
-
-MossdeepCity_SpaceCenter_2F_Text_2246B2: @ 82246B2
-	.string "STEVEN: TEAM MAGMA…\p"
-	.string "What’s the point of stealing rocket\n"
-	.string "fuel?$"
-
-MossdeepCity_SpaceCenter_2F_Text_2246F0: @ 82246F0
-	.string "MAXIE: Fufufu… Since you’re so\n"
-	.string "curious, you deserve an explanation.\p"
-	.string "We’re going to jettison the entire\n"
-	.string "load into MT. CHIMNEY!\p"
-	.string "With GROUDON gone, we have no need\n"
-	.string "for that slag heap of a mountain!\p"
-	.string "So we’ll use the fuel’s power to make\n"
-	.string "the volcano erupt!\p"
-	.string "It will be savage!$"
-
-MossdeepCity_SpaceCenter_2F_Text_2247FF: @ 82247FF
-	.string "STEVEN: {PLAYER}{KUN}!\n"
-	.string "You’re going to help me?\p"
-	.string "Let’s go into battle together!\n"
-	.string "Are you ready?$"
-
-MossdeepCity_SpaceCenter_2F_Text_224854: @ 8224854
-	.string "STEVEN: Then, hurry!\n"
-	.string "Get ready quickly!$"
-
-MossdeepCity_SpaceCenter_2F_Text_22487C: @ 822487C
-	.string "All I want…\n"
-	.string "I just want to expand the land mass…$"
-
-MossdeepCity_SpaceCenter_Text_2248AD: @ 82248AD
-	.string "I’m with our leader…$"
-
-MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2
-	.string "MAXIE: We failed to make the volcano\n"
-	.string "erupt…\p"
-	.string "We failed to control GROUDON after\n"
-	.string "we had awoken it…\p"
-	.string "Is our goal to expand the land\n"
-	.string "misguided?\p"
-	.string "… … … … … …\n"
-	.string "… … … … … …\p"
-	.string "If…\n"
-	.string "If we, TEAM MAGMA, are wrong…\l"
-	.string "… … … … … …\p"
-	.string "Then might TEAM AQUA’s goal to expand\n"
-	.string "the sea also be equally misguided?$"
-
-MossdeepCity_SpaceCenter_2F_Text_2249DC: @ 82249DC
-	.string "MAXIE: All right…\n"
-	.string "We will give up on the fuel…\p"
-	.string "There appear to be more important\n"
-	.string "matters that I must examine…$"
-
-MossdeepCity_SpaceCenter_2F_Text_224A4A: @ 8224A4A
-	.string "STEVEN: Whew, that was too tense.\n"
-	.string "{PLAYER}{KUN}, thank you.\p"
-	.string "I have something to give you as\n"
-	.string "thanks for your support.\p"
-	.string "Please come see me at home\n"
-	.string "after this.\p"
-	.string "Oh, yes, I don’t live in RUSTBORO CITY.\n"
-	.string "I live right here on this island.$"
-
diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc
deleted file mode 100644
index 9a479846f..000000000
--- a/data/scripts/maps/MtPyre_2F.inc
+++ /dev/null
@@ -1,135 +0,0 @@
-MtPyre_2F_MapScripts:: @ 82310FB
-	map_script 2, MtPyre_2F_MapScript2_2A8327
-	map_script 3, MtPyre_2F_MapScript1_2A8331
-	map_script 5, MtPyre_2F_MapScript1_23110B
-	.byte 0
-
-MtPyre_2F_MapScript1_23110B: @ 823110B
-	setstepcallback 7
-	setholewarp MT_PYRE_1F, 255, 0, 0
-	end
-
-MtPyre_2F_EventScript_231116:: @ 8231116
-	msgbox MtPyre_2F_Text_2311A3, 2
-	end
-
-MtPyre_2F_EventScript_23111F:: @ 823111F
-	msgbox MtPyre_2F_Text_2311E6, 2
-	end
-
-MtPyre_2F_EventScript_231128:: @ 8231128
-	trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2
-	msgbox MtPyre_2F_Text_2312CB, 6
-	end
-
-MtPyre_2F_EventScript_23113F:: @ 823113F
-	trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414
-	msgbox MtPyre_2F_Text_2313B1, 6
-	end
-
-MtPyre_2F_EventScript_23115A:: @ 823115A
-	trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582
-	msgbox MtPyre_2F_Text_23154D, 6
-	end
-
-MtPyre_2F_EventScript_231175:: @ 8231175
-	trainerbattle 0, TRAINER_LEAH, 0, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645
-	msgbox MtPyre_2F_Text_23165A, 6
-	end
-
-MtPyre_2F_EventScript_23118C:: @ 823118C
-	trainerbattle 0, TRAINER_ZANDER, 0, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1
-	msgbox MtPyre_2F_Text_2316FB, 6
-	end
-
-MtPyre_2F_Text_2311A3: @ 82311A3
-	.string "Memories of my darling SKITTY…\n"
-	.string "My eyes overflow thinking about it.$"
-
-MtPyre_2F_Text_2311E6: @ 82311E6
-	.string "Ooch, ouch… There are holes in the\n"
-	.string "ground here and there.\p"
-	.string "I didn’t notice and took a tumble from\n"
-	.string "the floor above.$"
-
-MtPyre_2F_Text_231258: @ 8231258
-	.string "Hey! Are you searching for POKéMON?\n"
-	.string "You came along after me! You’re rude!$"
-
-MtPyre_2F_Text_2312A2: @ 82312A2
-	.string "Ayieeeeh!\n"
-	.string "I’m sorry, forgive me, please!$"
-
-MtPyre_2F_Text_2312CB: @ 82312CB
-	.string "People don’t come here often, so\n"
-	.string "I thought there’d be rare POKéMON.$"
-
-MtPyre_2F_Text_23130F: @ 823130F
-	.string "LUKE: We’re here on a dare.\p"
-	.string "Heheh, if I show her how cool I am,\n"
-	.string "she’ll fall for me. I know it!\p"
-	.string "I know! I’ll cream you and show her\n"
-	.string "how cool I am!$"
-
-MtPyre_2F_Text_2313A1: @ 82313A1
-	.string "LUKE: Whoopsie!$"
-
-MtPyre_2F_Text_2313B1: @ 82313B1
-	.string "LUKE: Well, we lost but that’s okay!\n"
-	.string "I’m right here by your side.\l"
-	.string "We’ll make it through this dare!$"
-
-MtPyre_2F_Text_231414: @ 8231414
-	.string "LUKE: If you want to take me on,\n"
-	.string "bring some more POKéMON.\p"
-	.string "If you don’t, I won’t be able to show\n"
-	.string "off to my girl how cool I am!$"
-
-MtPyre_2F_Text_231492: @ 8231492
-	.string "DEZ: I came here on a dare with my\n"
-	.string "boyfriend.\p"
-	.string "It’s really scary, but I’m with my\n"
-	.string "boyfriend. It’s okay.\p"
-	.string "I know! I’ll get my boyfriend to look\n"
-	.string "cool by beating you!$"
-
-MtPyre_2F_Text_231534: @ 8231534
-	.string "DEZ: Waaaah! I’m scared!$"
-
-MtPyre_2F_Text_23154D: @ 823154D
-	.string "DEZ: We’re lovey-dovey, so we don’t\n"
-	.string "care if we lose!$"
-
-MtPyre_2F_Text_231582: @ 8231582
-	.string "DEZ: If you want to challenge us, you\n"
-	.string "should bring at least two POKéMON.\p"
-	.string "My boyfriend’s strong.\n"
-	.string "Just one POKéMON won’t do at all.$"
-
-MtPyre_2F_Text_231604: @ 8231604
-	.string "You are an unfamiliar sight…\n"
-	.string "Depart before anything befalls you!$"
-
-MtPyre_2F_Text_231645: @ 8231645
-	.string "Hmm…\n"
-	.string "You’re durable.$"
-
-MtPyre_2F_Text_23165A: @ 823165A
-	.string "Our family has been TRAINERS here\n"
-	.string "since my great-grandmother’s time…\p"
-	.string "It is my duty to protect this\n"
-	.string "mountain…$"
-
-MtPyre_2F_Text_2316C7: @ 82316C7
-	.string "Kiyaaaaah!\n"
-	.string "I’m terrified!$"
-
-MtPyre_2F_Text_2316E1: @ 82316E1
-	.string "Nooooooo!\n"
-	.string "I lost my wits!$"
-
-MtPyre_2F_Text_2316FB: @ 82316FB
-	.string "I get freaked out every time I see\n"
-	.string "anything move…\p"
-	.string "I shouldn’t have come here to train…$"
-
diff --git a/data/scripts/maps/NavelRock_Harbor.inc b/data/scripts/maps/NavelRock_Harbor.inc
deleted file mode 100644
index c7acaf066..000000000
--- a/data/scripts/maps/NavelRock_Harbor.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-NavelRock_Harbor_MapScripts:: @ 82690BC
-	.byte 0
-
-NavelRock_Harbor_EventScript_2690BD:: @ 82690BD
-	lock
-	faceplayer
-	msgbox NavelRock_Harbor_Text_2C6CE6, 5
-	compare VAR_RESULT, 0
-	goto_eq NavelRock_Harbor_EventScript_269102
-	msgbox NavelRock_Harbor_Text_2A6A5D, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA
-	waitmovement 0
-	delay 30
-	hideobjectat 1, NAVEL_ROCK_HARBOR
-	setvar VAR_0x8004, 2
-	call NavelRock_Harbor_EventScript_272250
-	warp LILYCOVE_CITY_HARBOR, 255, 8, 11
-	waitstate
-	release
-	end
-
-NavelRock_Harbor_EventScript_269102:: @ 8269102
-	msgbox NavelRock_Harbor_Text_2A6A82, 4
-	release
-	end
-
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc
deleted file mode 100644
index 891b5a25a..000000000
--- a/data/scripts/maps/PetalburgCity.inc
+++ /dev/null
@@ -1,771 +0,0 @@
-PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7
-	setflag FLAG_VISITED_PETALBURG_CITY
-	compare VAR_0x4057, 0
-	call_if 1, PetalburgCity_EventScript_1DC307
-	compare VAR_0x4057, 2
-	call_if 1, PetalburgCity_EventScript_1DC30F
-	compare VAR_0x4057, 4
-	call_if 1, PetalburgCity_EventScript_1DC30F
-	compare VAR_0x4085, 8
-	call_if 1, PetalburgCity_EventScript_1DC316
-	end
-
-PetalburgCity_EventScript_1DC307:: @ 81DC307
-	setobjectxyperm 8, 5, 11
-	return
-
-PetalburgCity_EventScript_1DC30F:: @ 81DC30F
-	setflag FLAG_SPECIAL_FLAG_0x4000
-	savebgm MUS_TSURETEK
-	return
-
-PetalburgCity_EventScript_1DC316:: @ 81DC316
-	setvar VAR_0x4085, 7
-	return
-
-PetalburgCity_MapScript2_1DC31C: @ 81DC31C
-	map_script_2 VAR_0x4057, 2, PetalburgCity_EventScript_1DC32E
-	map_script_2 VAR_0x4057, 4, PetalburgCity_EventScript_1DC390
-	.2byte 0
-
-PetalburgCity_EventScript_1DC32E:: @ 81DC32E
-	lockall
-	special SavePlayerParty
-	special PutZigzagoonInPlayerParty
-	applymovement 2, PetalburgCity_Movement_1DC451
-	applymovement 255, PetalburgCity_Movement_1DC430
-	waitmovement 0
-	msgbox PetalburgCity_Text_1EC1F8, 4
-	special StartWallyTutorialBattle
-	waitstate
-	msgbox PetalburgCity_Text_1EC271, 4
-	applymovement 2, PetalburgCity_Movement_2725A4, PETALBURG_CITY
-	waitmovement 2, PETALBURG_CITY
-	msgbox PetalburgCity_Text_1EC297, 4
-	closemessage
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	setvar VAR_0x4057, 3
-	fadedefaultbgm
-	clearflag FLAG_SPECIAL_FLAG_0x4001
-	special LoadPlayerParty
-	setvar VAR_0x4085, 1
-	warp PETALBURG_CITY_GYM, 255, 4, 108
-	waitstate
-	releaseall
-	end
-
-PetalburgCity_EventScript_1DC390:: @ 81DC390
-	lockall
-	setflag FLAG_SPECIAL_FLAG_0x4000
-	applymovement 5, PetalburgCity_Movement_1DC41B
-	applymovement 255, PetalburgCity_Movement_1DC406
-	waitmovement 0
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 5
-	opendoor VAR_0x8004, VAR_0x8005
-	waitdooranim
-	applymovement 5, PetalburgCity_Movement_1DC42D
-	applymovement 255, PetalburgCity_Movement_1DC418
-	waitmovement 0
-	setflag FLAG_0x33E
-	hideobjectat 255, PETALBURG_CITY
-	closedoor VAR_0x8004, VAR_0x8005
-	waitdooranim
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	fadedefaultbgm
-	clearflag FLAG_SPECIAL_FLAG_0x4001
-	warp PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4
-	waitstate
-	releaseall
-	end
-
-PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6
-	lock
-	faceplayer
-	msgbox PetalburgCity_Text_1DC985, 4
-	closemessage
-	applymovement 3, PetalburgCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD
-	msgbox PetalburgCity_Text_1DC837, 2
-	end
-
-PetalburgCity_Movement_1DC406: @ 81DC406
-	delay_8
-	walk_down
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-PetalburgCity_Movement_1DC418: @ 81DC418
-	walk_up
-	walk_up
-	step_end
-
-PetalburgCity_Movement_1DC41B: @ 81DC41B
-	delay_8
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-PetalburgCity_Movement_1DC42D: @ 81DC42D
-	walk_up
-	set_invisible
-	step_end
-
-PetalburgCity_Movement_1DC430: @ 81DC430
-	delay_8
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_in_place_fastest_right
-	step_end
-
-PetalburgCity_Movement_1DC451: @ 81DC451
-	delay_8
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_right
-	delay_16
-	walk_in_place_fastest_up
-	delay_16
-	delay_16
-	walk_in_place_fastest_right
-	step_end
-
-PetalburgCity_EventScript_1DC476:: @ 81DC476
-	msgbox PetalburgCity_Text_1DCAAA, 3
-	end
-
-PetalburgCity_EventScript_1DC47F:: @ 81DC47F
-	msgbox PetalburgCity_Text_1DCAF1, 3
-	end
-
-PetalburgCity_EventScript_1DC488:: @ 81DC488
-	msgbox PetalburgCity_Text_1DCA30, 2
-	end
-
-PetalburgCity_EventScript_1DC491:: @ 81DC491
-	msgbox PetalburgCity_Text_1DCB23, 3
-	end
-
-PetalburgCity_EventScript_1DC49A:: @ 81DC49A
-	lockall
-	setvar VAR_0x8008, 0
-	goto PetalburgCity_EventScript_1DC4CA
-	end
-
-PetalburgCity_EventScript_1DC4A6:: @ 81DC4A6
-	lockall
-	setvar VAR_0x8008, 1
-	goto PetalburgCity_EventScript_1DC4CA
-	end
-
-PetalburgCity_EventScript_1DC4B2:: @ 81DC4B2
-	lockall
-	setvar VAR_0x8008, 2
-	goto PetalburgCity_EventScript_1DC4CA
-	end
-
-PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE
-	lockall
-	setvar VAR_0x8008, 3
-	goto PetalburgCity_EventScript_1DC4CA
-	end
-
-PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA
-	applymovement 8, PetalburgCity_Movement_27259E
-	waitmovement 0
-	playbgm MUS_TSURETEK, 0
-	playse SE_PIN
-	applymovement 8, PetalburgCity_Movement_272598
-	waitmovement 0
-	applymovement 8, PetalburgCity_Movement_27259A
-	waitmovement 0
-	compare VAR_0x8008, 0
-	call_if 1, PetalburgCity_EventScript_1DC57F
-	compare VAR_0x8008, 1
-	call_if 1, PetalburgCity_EventScript_1DC594
-	compare VAR_0x8008, 2
-	call_if 1, PetalburgCity_EventScript_1DC59F
-	compare VAR_0x8008, 3
-	call_if 1, PetalburgCity_EventScript_1DC5B4
-	msgbox PetalburgCity_Text_1DC881, 4
-	closemessage
-	compare VAR_0x8008, 0
-	call_if 1, PetalburgCity_EventScript_1DC5C9
-	compare VAR_0x8008, 1
-	call_if 1, PetalburgCity_EventScript_1DC5DB
-	compare VAR_0x8008, 2
-	call_if 1, PetalburgCity_EventScript_1DC5ED
-	compare VAR_0x8008, 3
-	call_if 1, PetalburgCity_EventScript_1DC5FF
-	msgbox PetalburgCity_Text_1DC91B, 4
-	applymovement 8, PetalburgCity_Movement_2725A8
-	applymovement 255, PetalburgCity_Movement_2725A8
-	waitmovement 0
-	msgbox PetalburgCity_Text_1DC93E, 4
-	closemessage
-	applymovement 8, PetalburgCity_Movement_1DC658
-	waitmovement 0
-	fadedefaultbgm
-	releaseall
-	end
-
-PetalburgCity_EventScript_1DC57F:: @ 81DC57F
-	applymovement 8, PetalburgCity_Movement_1DC615
-	waitmovement 0
-	applymovement 255, PetalburgCity_Movement_2725AA
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_1DC594:: @ 81DC594
-	applymovement 8, PetalburgCity_Movement_1DC61A
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_1DC59F:: @ 81DC59F
-	applymovement 8, PetalburgCity_Movement_1DC61D
-	waitmovement 0
-	applymovement 255, PetalburgCity_Movement_2725A6
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4
-	applymovement 8, PetalburgCity_Movement_1DC622
-	waitmovement 0
-	applymovement 255, PetalburgCity_Movement_2725A6
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_1DC5C9:: @ 81DC5C9
-	applymovement 8, PetalburgCity_Movement_1DC628
-	applymovement 255, PetalburgCity_Movement_1DC665
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_1DC5DB:: @ 81DC5DB
-	applymovement 8, PetalburgCity_Movement_1DC633
-	applymovement 255, PetalburgCity_Movement_1DC66F
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_1DC5ED:: @ 81DC5ED
-	applymovement 8, PetalburgCity_Movement_1DC641
-	applymovement 255, PetalburgCity_Movement_1DC67C
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF
-	applymovement 8, PetalburgCity_Movement_1DC64C
-	applymovement 255, PetalburgCity_Movement_1DC686
-	waitmovement 0
-	return
-
-PetalburgCity_Movement_1DC611:: @ 81DC611
-	delay_16
-	delay_16
-	delay_16
-	step_end
-
-PetalburgCity_Movement_1DC615: @ 81DC615
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-PetalburgCity_Movement_1DC61A: @ 81DC61A
-	walk_right
-	walk_right
-	step_end
-
-PetalburgCity_Movement_1DC61D: @ 81DC61D
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_down
-	step_end
-
-PetalburgCity_Movement_1DC622: @ 81DC622
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_down
-	step_end
-
-PetalburgCity_Movement_1DC628: @ 81DC628
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-PetalburgCity_Movement_1DC633: @ 81DC633
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-PetalburgCity_Movement_1DC641: @ 81DC641
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-PetalburgCity_Movement_1DC64C: @ 81DC64C
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-PetalburgCity_Movement_1DC658: @ 81DC658
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-PetalburgCity_Movement_1DC665: @ 81DC665
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	step_end
-
-PetalburgCity_Movement_1DC66F: @ 81DC66F
-	delay_16
-	delay_16
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	step_end
-
-PetalburgCity_Movement_1DC67C: @ 81DC67C
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	step_end
-
-PetalburgCity_Movement_1DC686: @ 81DC686
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	step_end
-
-PetalburgCity_EventScript_1DC691:: @ 81DC691
-	lockall
-	addobject 9
-	setvar VAR_0x8008, 0
-	setobjectxy 9, 13, 10
-	goto PetalburgCity_EventScript_1DC6E9
-	end
-
-PetalburgCity_EventScript_1DC6A7:: @ 81DC6A7
-	lockall
-	addobject 9
-	setvar VAR_0x8008, 1
-	setobjectxy 9, 13, 11
-	goto PetalburgCity_EventScript_1DC6E9
-	end
-
-PetalburgCity_EventScript_1DC6BD:: @ 81DC6BD
-	lockall
-	addobject 9
-	setvar VAR_0x8008, 2
-	setobjectxy 9, 13, 12
-	goto PetalburgCity_EventScript_1DC6E9
-	end
-
-PetalburgCity_EventScript_1DC6D3:: @ 81DC6D3
-	lockall
-	addobject 9
-	setvar VAR_0x8008, 3
-	setobjectxy 9, 13, 13
-	goto PetalburgCity_EventScript_1DC6E9
-	end
-
-PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9
-	applymovement 9, PetalburgCity_Movement_1DC7D6
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, PetalburgCity_Movement_272598
-	waitmovement 0
-	applymovement 9, PetalburgCity_Movement_27259A
-	waitmovement 0
-	applymovement 9, PetalburgCity_Movement_1DC7DB
-	waitmovement 0
-	applymovement 255, PetalburgCity_Movement_2725A8
-	waitmovement 0
-	setvar VAR_0x40D1, 1
-	msgbox PetalburgCity_Text_1DCB31, 4
-	closemessage
-	applymovement 9, PetalburgCity_Movement_2725A8
-	waitmovement 0
-	delay 30
-	msgbox PetalburgCity_Text_1DCB82, 4
-	closemessage
-	applymovement 9, PetalburgCity_Movement_2725A4
-	waitmovement 0
-	delay 30
-	msgbox PetalburgCity_Text_1DCC09, 4
-	closemessage
-	compare VAR_0x8008, 0
-	call_if 1, PetalburgCity_EventScript_1DC78E
-	compare VAR_0x8008, 1
-	call_if 1, PetalburgCity_EventScript_1DC7A0
-	compare VAR_0x8008, 2
-	call_if 1, PetalburgCity_EventScript_1DC7B2
-	compare VAR_0x8008, 3
-	call_if 1, PetalburgCity_EventScript_1DC7C4
-	setvar VAR_0x40C9, 1
-	removeobject 9
-	releaseall
-	end
-
-PetalburgCity_EventScript_1DC78E:: @ 81DC78E
-	applymovement 255, PetalburgCity_Movement_1DC7EE
-	applymovement 9, PetalburgCity_Movement_1DC7E0
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_1DC7A0:: @ 81DC7A0
-	applymovement 255, PetalburgCity_Movement_1DC802
-	applymovement 9, PetalburgCity_Movement_1DC7F5
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_1DC7B2:: @ 81DC7B2
-	applymovement 255, PetalburgCity_Movement_1DC815
-	applymovement 9, PetalburgCity_Movement_1DC808
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_1DC7C4:: @ 81DC7C4
-	applymovement 255, PetalburgCity_Movement_1DC828
-	applymovement 9, PetalburgCity_Movement_1DC81B
-	waitmovement 0
-	return
-
-PetalburgCity_Movement_1DC7D6: @ 81DC7D6
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-PetalburgCity_Movement_1DC7DB: @ 81DC7DB
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-PetalburgCity_Movement_1DC7E0: @ 81DC7E0
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-PetalburgCity_Movement_1DC7EE: @ 81DC7EE
-	delay_16
-	walk_in_place_fastest_down
-	delay_16
-	delay_16
-	delay_8
-	walk_in_place_fastest_left
-	step_end
-
-PetalburgCity_Movement_1DC7F5: @ 81DC7F5
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-PetalburgCity_Movement_1DC802: @ 81DC802
-	delay_16
-	walk_in_place_fastest_down
-	delay_16
-	delay_8
-	walk_in_place_fastest_left
-	step_end
-
-PetalburgCity_Movement_1DC808: @ 81DC808
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-PetalburgCity_Movement_1DC815: @ 81DC815
-	delay_16
-	walk_in_place_fastest_down
-	delay_16
-	delay_8
-	walk_in_place_fastest_left
-	step_end
-
-PetalburgCity_Movement_1DC81B: @ 81DC81B
-	walk_up
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-PetalburgCity_Movement_1DC828: @ 81DC828
-	delay_16
-	walk_in_place_fastest_up
-	delay_16
-	delay_8
-	walk_in_place_fastest_left
-	step_end
-
-PetalburgCity_EventScript_1DC82E:: @ 81DC82E
-	msgbox PetalburgCity_Text_1DC881, 2
-	end
-
-PetalburgCity_Text_1DC837: @ 81DC837
-	.string "Where has our WALLY gone?\p"
-	.string "We have to leave for VERDANTURF TOWN\n"
-	.string "very soon…$"
-
-PetalburgCity_Text_1DC881: @ 81DC881
-	.string "Hiya! Are you maybe…\n"
-	.string "A rookie TRAINER?\p"
-	.string "Do you know what POKéMON TRAINERS\n"
-	.string "do when they reach a new town?\p"
-	.string "They first check what kind of GYM\n"
-	.string "is in the town.$"
-
-PetalburgCity_Text_1DC91B: @ 81DC91B
-	.string "See? This is PETALBURG CITY’s GYM.$"
-
-PetalburgCity_Text_1DC93E: @ 81DC93E
-	.string "This is the GYM’s sign. Look for it\n"
-	.string "whenever you’re looking for a GYM.$"
-
-PetalburgCity_Text_1DC985: @ 81DC985
-	.string "My face is reflected in the water.\p"
-	.string "It’s a shining grin full of hope…\p"
-	.string "Or it could be a look of somber silence\n"
-	.string "struggling with fear…\p"
-	.string "What do you see reflected in your face?$"
-
-PetalburgCity_Text_1DCA30: @ 81DCA30
-	.string "Let’s say you have six POKéMON.\n"
-	.string "If you catch another one…\p"
-	.string "It is automatically sent to a STORAGE\n"
-	.string "BOX over a PC connection.$"
-
-PetalburgCity_Text_1DCAAA: @ 81DCAAA
-	.string "PETALBURG CITY POKéMON GYM\n"
-	.string "LEADER: NORMAN\l"
-	.string "“A man in pursuit of power!”$"
-
-PetalburgCity_Text_1DCAF1: @ 81DCAF1
-	.string "PETALBURG CITY\n"
-	.string "“Where people mingle with nature.”$"
-
-PetalburgCity_Text_1DCB23: @ 81DCB23
-	.string "WALLY’S HOUSE$"
-
-PetalburgCity_Text_1DCB31: @ 81DCB31
-	.string "Excuse me!\p"
-	.string "Let me guess, from the way you’re\n"
-	.string "dressed, are you a POKéMON TRAINER?$"
-
-PetalburgCity_Text_1DCB82: @ 81DCB82
-	.string "… … … … … …\p"
-	.string "Well, maybe not.\n"
-	.string "Your clothes aren’t all that dirty.\p"
-	.string "You’re either a rookie TRAINER,\n"
-	.string "or maybe you’re just an ordinary kid.$"
-
-PetalburgCity_Text_1DCC09: @ 81DCC09
-	.string "I’m roaming the land in search of\n"
-	.string "talented TRAINERS.\p"
-	.string "I’m sorry to have taken your time.$"
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
deleted file mode 100644
index 663165611..000000000
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ /dev/null
@@ -1,1703 +0,0 @@
-PetalburgCity_Gym_MapScripts:: @ 8204889
-	map_script 1, PetalburgCity_Gym_MapScript1_20489E
-	map_script 3, PetalburgCity_Gym_MapScript1_20492D
-	map_script 4, PetalburgCity_Gym_MapScript2_20498B
-	map_script 2, PetalburgCity_Gym_MapScript2_20499A
-	.byte 0
-
-PetalburgCity_Gym_MapScript1_20489E: @ 820489E
-	compare VAR_0x4085, 6
-	goto_eq PetalburgCity_Gym_EventScript_2048B5
-	compare VAR_0x4085, 7
-	call_if 4, PetalburgCity_Gym_EventScript_2048FF
-	end
-
-PetalburgCity_Gym_EventScript_2048B5:: @ 82048B5
-	setvar VAR_0x8005, 1
-	call PetalburgCity_Gym_EventScript_20555E
-	checktrainerflag TRAINER_RANDALL
-	call_if 1, PetalburgCity_Gym_EventScript_20557F
-	checktrainerflag TRAINER_MARY
-	call_if 1, PetalburgCity_Gym_EventScript_2055A0
-	checktrainerflag TRAINER_PARKER
-	call_if 1, PetalburgCity_Gym_EventScript_2055C1
-	checktrainerflag TRAINER_ALEXIA
-	call_if 1, PetalburgCity_Gym_EventScript_2055E2
-	checktrainerflag TRAINER_GEORGE
-	call_if 1, PetalburgCity_Gym_EventScript_205603
-	checktrainerflag TRAINER_JODY
-	call_if 1, PetalburgCity_Gym_EventScript_205624
-	checktrainerflag TRAINER_BERKE
-	call_if 1, PetalburgCity_Gym_EventScript_205645
-	end
-
-PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF
-	setvar VAR_0x8005, 1
-	call PetalburgCity_Gym_EventScript_20555E
-	call PetalburgCity_Gym_EventScript_20557F
-	call PetalburgCity_Gym_EventScript_2055A0
-	call PetalburgCity_Gym_EventScript_2055C1
-	call PetalburgCity_Gym_EventScript_2055E2
-	call PetalburgCity_Gym_EventScript_205603
-	call PetalburgCity_Gym_EventScript_205624
-	call PetalburgCity_Gym_EventScript_205645
-	return
-
-PetalburgCity_Gym_MapScript1_20492D: @ 820492D
-	compare VAR_0x4085, 1
-	call_if 1, PetalburgCity_Gym_EventScript_20494D
-	compare VAR_0x4085, 6
-	call_if 0, PetalburgCity_Gym_EventScript_204955
-	checkflag FLAG_SYS_GAME_CLEAR
-	call_if 1, PetalburgCity_Gym_EventScript_20495D
-	end
-
-PetalburgCity_Gym_EventScript_20494D:: @ 820494D
-	setobjectxyperm 10, 5, 108
-	return
-
-PetalburgCity_Gym_EventScript_204955:: @ 8204955
-	setobjectxyperm 1, 4, 107
-	return
-
-PetalburgCity_Gym_EventScript_20495D:: @ 820495D
-	setorcopyvar 0x8015, 269
-	specialvar VAR_RESULT, IsTrainerReadyForRematch
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_204985
-	compare VAR_0x4085, 8
-	goto_eq PetalburgCity_Gym_EventScript_204985
-	setobjectxyperm 1, 4, 107
-	return
-
-PetalburgCity_Gym_EventScript_204985:: @ 8204985
-	setvar VAR_0x4085, 8
-	end
-
-PetalburgCity_Gym_MapScript2_20498B: @ 820498B
-	map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_204995
-	.2byte 0
-
-PetalburgCity_Gym_EventScript_204995:: @ 8204995
-	turnobject 255, 2
-	end
-
-PetalburgCity_Gym_MapScript2_20499A: @ 820499A
-	map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_2049A4
-	.2byte 0
-
-PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4
-	lockall
-	msgbox PetalburgCity_Gym_Text_205B32, 4
-	msgbox PetalburgCity_Gym_Text_205B4C, 4
-	closemessage
-	applymovement 255, PetalburgCity_Gym_Movement_2725AA
-	applymovement 10, PetalburgCity_Gym_Movement_2049EC
-	waitmovement 0
-	playse SE_KAIDAN
-	removeobject 10
-	setflag FLAG_0x2D6
-	delay 30
-	applymovement 255, PetalburgCity_Gym_Movement_2725A6
-	waitmovement 0
-	msgbox PetalburgCity_Gym_Text_205C40, 4
-	setvar VAR_0x4085, 2
-	releaseall
-	end
-
-PetalburgCity_Gym_Movement_2049EC: @ 82049EC
-	walk_down
-	walk_down
-	walk_down
-	delay_16
-	step_end
-
-PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1
-	lock
-	faceplayer
-	switch VAR_0x4085
-	case 2, PetalburgCity_Gym_EventScript_204D4A
-	case 3, PetalburgCity_Gym_EventScript_204D54
-	case 4, PetalburgCity_Gym_EventScript_204D5E
-	case 5, PetalburgCity_Gym_EventScript_204D68
-	case 6, PetalburgCity_Gym_EventScript_204E3B
-	case 7, PetalburgCity_Gym_EventScript_204D80
-	case 8, PetalburgCity_Gym_EventScript_204DB3
-	msgbox PetalburgCity_Gym_Text_2057A2, 4
-	closemessage
-	switch VAR_FACING
-	case 1, PetalburgCity_Gym_EventScript_204A80
-	case 2, PetalburgCity_Gym_EventScript_204A8B
-	case 3, PetalburgCity_Gym_EventScript_204A96
-	case 4, PetalburgCity_Gym_EventScript_204AA1
-	end
-
-PetalburgCity_Gym_EventScript_204A80:: @ 8204A80
-	setvar VAR_0x8008, 0
-	goto PetalburgCity_Gym_EventScript_204AAC
-	end
-
-PetalburgCity_Gym_EventScript_204A8B:: @ 8204A8B
-	setvar VAR_0x8008, 1
-	goto PetalburgCity_Gym_EventScript_204AAC
-	end
-
-PetalburgCity_Gym_EventScript_204A96:: @ 8204A96
-	setvar VAR_0x8008, 2
-	goto PetalburgCity_Gym_EventScript_204AAC
-	end
-
-PetalburgCity_Gym_EventScript_204AA1:: @ 8204AA1
-	setvar VAR_0x8008, 3
-	goto PetalburgCity_Gym_EventScript_204AAC
-	end
-
-PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC
-	addobject 10
-	playse SE_DOOR
-	compare VAR_0x8008, 0
-	call_if 1, PetalburgCity_Gym_EventScript_204C31
-	compare VAR_0x8008, 1
-	call_if 1, PetalburgCity_Gym_EventScript_204C43
-	compare VAR_0x8008, 2
-	call_if 1, PetalburgCity_Gym_EventScript_204C5F
-	compare VAR_0x8008, 3
-	call_if 1, PetalburgCity_Gym_EventScript_204C5F
-	msgbox PetalburgCity_Gym_Text_2058B1, 4
-	msgbox PetalburgCity_Gym_Text_2058DB, 4
-	msgbox PetalburgCity_Gym_Text_205910, 4
-	msgbox PetalburgCity_Gym_Text_2059D8, 4
-	compare VAR_0x8008, 0
-	call_if 1, PetalburgCity_Gym_EventScript_204CC7
-	compare VAR_0x8008, 1
-	call_if 1, PetalburgCity_Gym_EventScript_204CD2
-	compare VAR_0x8008, 2
-	call_if 1, PetalburgCity_Gym_EventScript_204CE4
-	compare VAR_0x8008, 3
-	call_if 1, PetalburgCity_Gym_EventScript_204CF6
-	msgbox PetalburgCity_Gym_Text_2059E8, 4
-	compare VAR_0x8008, 0
-	call_if 1, PetalburgCity_Gym_EventScript_204D08
-	compare VAR_0x8008, 1
-	call_if 1, PetalburgCity_Gym_EventScript_204D13
-	compare VAR_0x8008, 2
-	call_if 1, PetalburgCity_Gym_EventScript_204D1E
-	compare VAR_0x8008, 3
-	call_if 1, PetalburgCity_Gym_EventScript_204D29
-	msgbox PetalburgCity_Gym_Text_205A46, 4
-	msgbox PetalburgCity_Gym_Text_205A89, 4
-	msgbox PetalburgCity_Gym_Text_205AF4, 4
-	compare VAR_0x8008, 0
-	call_if 1, PetalburgCity_Gym_EventScript_204D72
-	compare VAR_0x8008, 1
-	call_if 1, PetalburgCity_Gym_EventScript_204D73
-	compare VAR_0x8008, 2
-	call_if 1, PetalburgCity_Gym_EventScript_204D7E
-	compare VAR_0x8008, 3
-	call_if 1, PetalburgCity_Gym_EventScript_204D7F
-	compare VAR_0x8008, 0
-	call_if 1, PetalburgCity_Gym_EventScript_204D34
-	compare VAR_0x8008, 1
-	call_if 1, PetalburgCity_Gym_EventScript_204D3F
-	compare VAR_0x8008, 2
-	call_if 1, PetalburgCity_Gym_EventScript_204D34
-	compare VAR_0x8008, 3
-	call_if 1, PetalburgCity_Gym_EventScript_204D34
-	msgbox PetalburgCity_Gym_Text_205B0F, 4
-	closemessage
-	setflag FLAG_SPECIAL_FLAG_0x4001
-	playbgm MUS_TSURETEK, 0
-	compare VAR_0x8008, 0
-	call_if 1, PetalburgCity_Gym_EventScript_204C78
-	compare VAR_0x8008, 1
-	call_if 1, PetalburgCity_Gym_EventScript_204C91
-	compare VAR_0x8008, 2
-	call_if 1, PetalburgCity_Gym_EventScript_204CA3
-	compare VAR_0x8008, 3
-	call_if 1, PetalburgCity_Gym_EventScript_204CB5
-	removeobject 10
-	setflag FLAG_0x2D8
-	setvar VAR_0x4085, 1
-	setvar VAR_0x4057, 2
-	clearflag FLAG_0x2D6
-	clearflag FLAG_0x362
-	setflag FLAG_0x379
-	special InitBirchState
-	warp PETALBURG_CITY, 255, 15, 8
-	waitstate
-	release
-	end
-
-PetalburgCity_Gym_EventScript_204C31:: @ 8204C31
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
-	applymovement 10, PetalburgCity_Gym_Movement_2050EB
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204C43:: @ 8204C43
-	applymovement 10, PetalburgCity_Gym_Movement_2050E1
-	waitmovement 0
-	applymovement 1, PetalburgCity_Gym_Movement_2725A8
-	applymovement 255, PetalburgCity_Gym_Movement_2725A8
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
-	applymovement 255, PetalburgCity_Gym_Movement_2725AA
-	applymovement 10, PetalburgCity_Gym_Movement_2050EB
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204C78:: @ 8204C78
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
-	applymovement 10, PetalburgCity_Gym_Movement_205102
-	applymovement 255, PetalburgCity_Gym_Movement_205111
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204C91:: @ 8204C91
-	applymovement 10, PetalburgCity_Gym_Movement_2050F2
-	applymovement 255, PetalburgCity_Gym_Movement_205109
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204CA3:: @ 8204CA3
-	applymovement 10, PetalburgCity_Gym_Movement_205102
-	applymovement 255, PetalburgCity_Gym_Movement_20511B
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5
-	applymovement 10, PetalburgCity_Gym_Movement_2050FA
-	applymovement 255, PetalburgCity_Gym_Movement_205123
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7
-	applymovement 1, PetalburgCity_Gym_Movement_2725A6
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
-	applymovement 255, PetalburgCity_Gym_Movement_2725A6
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4
-	applymovement 1, PetalburgCity_Gym_Movement_2725A8
-	applymovement 255, PetalburgCity_Gym_Movement_2725A4
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6
-	applymovement 1, PetalburgCity_Gym_Movement_2725A4
-	applymovement 255, PetalburgCity_Gym_Movement_2725A8
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204D08:: @ 8204D08
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204D13:: @ 8204D13
-	applymovement 1, PetalburgCity_Gym_Movement_2725A8
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204D29:: @ 8204D29
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204D34:: @ 8204D34
-	applymovement 10, PetalburgCity_Gym_Movement_27259E
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F
-	applymovement 10, PetalburgCity_Gym_Movement_2725AA
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204D4A:: @ 8204D4A
-	msgbox PetalburgCity_Gym_Text_205DB4, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_204D54:: @ 8204D54
-	msgbox PetalburgCity_Gym_Text_205EAE, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_204D5E:: @ 8204D5E
-	msgbox PetalburgCity_Gym_Text_205F87, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_204D68:: @ 8204D68
-	msgbox PetalburgCity_Gym_Text_205F87, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_204D72:: @ 8204D72
-	return
-
-PetalburgCity_Gym_EventScript_204D73:: @ 8204D73
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204D7E:: @ 8204D7E
-	return
-
-PetalburgCity_Gym_EventScript_204D7F:: @ 8204D7F
-	return
-
-PetalburgCity_Gym_EventScript_204D80:: @ 8204D80
-	call PetalburgCity_Gym_EventScript_204DCE
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_204E1D
-	checkflag FLAG_0x0A9
-	goto_if 0, PetalburgCity_Gym_EventScript_204DAC
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq PetalburgCity_Gym_EventScript_20512D
-	msgbox PetalburgCity_Gym_Text_206417, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_204DAC:: @ 8204DAC
-	call PetalburgCity_Gym_EventScript_204ED2
-	release
-	end
-
-PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3
-	trainerbattle 7, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A
-	msgbox PetalburgCity_Gym_Text_2075F7, 6
-	end
-
-PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE
-	specialvar VAR_RESULT, IsEnigmaBerryValid
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_204E17
-	checkitem ITEM_ENIGMA_BERRY, 1
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_204E17
-	checkpcitem ITEM_ENIGMA_BERRY, 1
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_204E17
-	compare VAR_ENIGMA_BERRY_AVAILABLE, 0
-	goto_eq PetalburgCity_Gym_EventScript_204E17
-	msgbox PetalburgCity_Gym_Text_2A6D3D, 4
-	setvar VAR_RESULT, 1
-	return
-
-PetalburgCity_Gym_EventScript_204E17:: @ 8204E17
-	setvar VAR_RESULT, 0
-	return
-
-PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D
-	giveitem_std ITEM_ENIGMA_BERRY
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_272054
-	setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
-	release
-	end
-
-PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
-	msgbox PetalburgCity_Gym_Text_205FE5, 4
-	trainerbattle 3, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_206107
-	message PetalburgCity_Gym_Text_206162
-	waitmessage
-	call PetalburgCity_Gym_EventScript_27207E
-	msgbox PetalburgCity_Gym_Text_20618A, 4
-	setflag FLAG_0x4F4
-	setvar VAR_0x4085, 7
-	setflag FLAG_BADGE05_GET
-	special sub_813B9A0
-	call PetalburgCity_Gym_EventScript_2721F8
-	setflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON
-	clearflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
-	setvar VAR_0x8008, 5
-	call PetalburgCity_Gym_EventScript_271F43
-	clearflag FLAG_0x3AC
-	call PetalburgCity_Gym_EventScript_2048FF
-	special DrawWholeMapView
-	call PetalburgCity_Gym_EventScript_204ED2
-	delay 30
-	msgbox PetalburgCity_Gym_Text_2062FB, 4
-	closemessage
-	delay 40
-	playse SE_DOOR
-	delay 10
-	addobject 11
-	switch VAR_FACING
-	case 2, PetalburgCity_Gym_EventScript_204EF5
-	case 3, PetalburgCity_Gym_EventScript_204F09
-	case 4, PetalburgCity_Gym_EventScript_204EFF
-	end
-
-PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2
-	giveitem_std ITEM_TM42
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_27205E
-	setflag FLAG_0x0A9
-	msgbox PetalburgCity_Gym_Text_206254, 4
-	return
-
-PetalburgCity_Gym_EventScript_204EF5:: @ 8204EF5
-	setvar VAR_0x8008, 1
-	goto PetalburgCity_Gym_EventScript_204F13
-
-PetalburgCity_Gym_EventScript_204EFF:: @ 8204EFF
-	setvar VAR_0x8008, 2
-	goto PetalburgCity_Gym_EventScript_204F13
-
-PetalburgCity_Gym_EventScript_204F09:: @ 8204F09
-	setvar VAR_0x8008, 3
-	goto PetalburgCity_Gym_EventScript_204F13
-
-PetalburgCity_Gym_EventScript_204F13:: @ 8204F13
-	applymovement 11, PetalburgCity_Gym_Movement_2050BB
-	waitmovement 0
-	playse SE_PIN
-	applymovement 11, PetalburgCity_Gym_Movement_272598
-	waitmovement 0
-	applymovement 11, PetalburgCity_Gym_Movement_27259A
-	waitmovement 0
-	delay 10
-	compare VAR_0x8008, 1
-	call_if 1, PetalburgCity_Gym_EventScript_204FED
-	compare VAR_0x8008, 2
-	call_if 1, PetalburgCity_Gym_EventScript_205009
-	compare VAR_0x8008, 3
-	call_if 1, PetalburgCity_Gym_EventScript_205025
-	msgbox PetalburgCity_Gym_Text_206377, 4
-	closemessage
-	delay 20
-	compare VAR_0x8008, 1
-	call_if 1, PetalburgCity_Gym_EventScript_204FCC
-	compare VAR_0x8008, 2
-	call_if 1, PetalburgCity_Gym_EventScript_204FD7
-	compare VAR_0x8008, 3
-	call_if 1, PetalburgCity_Gym_EventScript_204FE2
-	msgbox PetalburgCity_Gym_Text_2063CA, 4
-	closemessage
-	setflag FLAG_SPECIAL_FLAG_0x4001
-	playbgm MUS_TSURETEK, 0
-	compare VAR_0x8008, 1
-	call_if 1, PetalburgCity_Gym_EventScript_205041
-	compare VAR_0x8008, 2
-	call_if 1, PetalburgCity_Gym_EventScript_20505A
-	compare VAR_0x8008, 3
-	call_if 1, PetalburgCity_Gym_EventScript_20506C
-	removeobject 11
-	setvar VAR_0x4057, 4
-	clearflag FLAG_0x33E
-	warp PETALBURG_CITY, 255, 15, 8
-	waitstate
-	release
-	end
-
-PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC
-	applymovement 11, PetalburgCity_Gym_Movement_2725A6
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7
-	applymovement 11, PetalburgCity_Gym_Movement_2725A8
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2
-	applymovement 11, PetalburgCity_Gym_Movement_2725A4
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_204FED:: @ 8204FED
-	applymovement 11, PetalburgCity_Gym_Movement_2050C3
-	waitmovement 0
-	applymovement 255, PetalburgCity_Gym_Movement_2725A4
-	applymovement 1, PetalburgCity_Gym_Movement_2725A4
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_205009:: @ 8205009
-	applymovement 11, PetalburgCity_Gym_Movement_2050CA
-	waitmovement 0
-	applymovement 255, PetalburgCity_Gym_Movement_2725AA
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_205025:: @ 8205025
-	applymovement 11, PetalburgCity_Gym_Movement_2050D0
-	waitmovement 0
-	applymovement 255, PetalburgCity_Gym_Movement_2725AA
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_205041:: @ 8205041
-	applymovement 11, PetalburgCity_Gym_Movement_20507E
-	applymovement 1, PetalburgCity_Gym_Movement_2725AA
-	applymovement 255, PetalburgCity_Gym_Movement_2050A1
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_20505A:: @ 820505A
-	applymovement 11, PetalburgCity_Gym_Movement_205089
-	applymovement 255, PetalburgCity_Gym_Movement_2050A9
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_20506C:: @ 820506C
-	applymovement 11, PetalburgCity_Gym_Movement_205094
-	applymovement 255, PetalburgCity_Gym_Movement_2050B1
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_Movement_20507E: @ 820507E
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_down
-	walk_down
-	walk_in_place_fastest_up
-	delay_8
-	walk_in_place_down
-	set_invisible
-	step_end
-
-PetalburgCity_Gym_Movement_205089: @ 8205089
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_down
-	walk_down
-	walk_in_place_fastest_up
-	delay_8
-	walk_in_place_down
-	set_invisible
-	step_end
-
-PetalburgCity_Gym_Movement_205094: @ 8205094
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_down
-	walk_down
-	walk_in_place_fastest_up
-	delay_8
-	walk_in_place_down
-	set_invisible
-	step_end
-
-PetalburgCity_Gym_Movement_2050A1: @ 82050A1
-	delay_16
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_down
-	walk_down
-	step_end
-
-PetalburgCity_Gym_Movement_2050A9: @ 82050A9
-	delay_16
-	walk_down
-	walk_down
-	walk_left
-	walk_down
-	walk_down
-	walk_down
-	step_end
-
-PetalburgCity_Gym_Movement_2050B1: @ 82050B1
-	delay_16
-	walk_down
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_down
-	walk_down
-	step_end
-
-PetalburgCity_Gym_Movement_2050BB: @ 82050BB
-	walk_up
-	delay_8
-	walk_in_place_fastest_right
-	delay_8
-	walk_in_place_fastest_left
-	delay_16
-	walk_in_place_fastest_up
-	step_end
-
-PetalburgCity_Gym_Movement_2050C3: @ 82050C3
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_right
-	step_end
-
-PetalburgCity_Gym_Movement_2050CA: @ 82050CA
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-PetalburgCity_Gym_Movement_2050D0: @ 82050D0
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_right
-	walk_right
-	walk_up
-	step_end
-
-PetalburgCity_Gym_Movement_2050D8: @ 82050D8
-	walk_in_place_fastest_up
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_8
-	walk_in_place_fastest_down
-	step_end
-
-PetalburgCity_Gym_Movement_2050E1: @ 82050E1
-	delay_16
-	walk_up
-	delay_16
-	delay_8
-	walk_up
-	walk_right
-	walk_up
-	walk_up
-	walk_in_place_fastest_left
-	step_end
-
-PetalburgCity_Gym_Movement_2050EB: @ 82050EB
-	delay_16
-	walk_up
-	delay_16
-	delay_8
-	walk_up
-	walk_up
-	step_end
-
-PetalburgCity_Gym_Movement_2050F2: @ 82050F2
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_in_place_fastest_up
-	delay_16
-	walk_in_place_down
-	step_end
-
-PetalburgCity_Gym_Movement_2050FA: @ 82050FA
-	walk_down
-	walk_down
-	walk_right
-	walk_down
-	walk_in_place_fastest_up
-	delay_16
-	walk_in_place_down
-	step_end
-
-PetalburgCity_Gym_Movement_205102: @ 8205102
-	walk_down
-	walk_down
-	walk_down
-	walk_in_place_fastest_up
-	delay_16
-	walk_in_place_down
-	step_end
-
-PetalburgCity_Gym_Movement_205109: @ 8205109
-	delay_16
-	delay_16
-	delay_16
-	walk_down
-	walk_down
-	walk_down
-	delay_8
-	step_end
-
-PetalburgCity_Gym_Movement_205111: @ 8205111
-	delay_16
-	delay_16
-	walk_right
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	delay_8
-	step_end
-
-PetalburgCity_Gym_Movement_20511B: @ 820511B
-	delay_16
-	delay_16
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	delay_8
-	step_end
-
-PetalburgCity_Gym_Movement_205123: @ 8205123
-	walk_in_place_fastest_down
-	delay_16
-	delay_16
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_down
-	delay_8
-	step_end
-
-PetalburgCity_Gym_EventScript_20512D:: @ 820512D
-	msgbox PetalburgCity_Gym_Text_2064C3, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_205137:: @ 8205137
-	lockall
-	compare VAR_0x4085, 6
-	goto_if 0, PetalburgCity_Gym_EventScript_20517D
-	setvar VAR_0x8008, 7
-	setvar VAR_0x8009, 85
-	msgbox PetalburgCity_Gym_Text_20721E, 5
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_20516C
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_20517B
-	end
-
-PetalburgCity_Gym_EventScript_20516C:: @ 820516C
-	closemessage
-	delay 30
-	warpdoor PETALBURG_CITY_GYM, 255, 32776, 32777
-	waitstate
-	releaseall
-	end
-
-PetalburgCity_Gym_EventScript_20517B:: @ 820517B
-	releaseall
-	end
-
-PetalburgCity_Gym_EventScript_20517D:: @ 820517D
-	msgbox PetalburgCity_Gym_Text_2071F4, 4
-	releaseall
-	end
-
-PetalburgCity_Gym_EventScript_205187:: @ 8205187
-	lockall
-	compare VAR_0x4085, 6
-	goto_if 0, PetalburgCity_Gym_EventScript_20517D
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 98
-	msgbox PetalburgCity_Gym_Text_207280, 5
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_20516C
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_20517B
-	end
-
-PetalburgCity_Gym_EventScript_2051BC:: @ 82051BC
-	lockall
-	checktrainerflag TRAINER_RANDALL
-	goto_if 0, PetalburgCity_Gym_EventScript_20517D
-	setvar VAR_0x8008, 7
-	setvar VAR_0x8009, 46
-	msgbox PetalburgCity_Gym_Text_2072BB, 5
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_20516C
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_20517B
-	end
-
-PetalburgCity_Gym_EventScript_2051EF:: @ 82051EF
-	lockall
-	checktrainerflag TRAINER_RANDALL
-	goto_if 0, PetalburgCity_Gym_EventScript_20517D
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 59
-	msgbox PetalburgCity_Gym_Text_2072F7, 5
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_20516C
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_20517B
-	end
-
-PetalburgCity_Gym_EventScript_205222:: @ 8205222
-	lockall
-	checktrainerflag TRAINER_MARY
-	goto_if 0, PetalburgCity_Gym_EventScript_20517D
-	setvar VAR_0x8008, 7
-	setvar VAR_0x8009, 59
-	msgbox PetalburgCity_Gym_Text_2072F7, 5
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_20516C
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_20517B
-	end
-
-PetalburgCity_Gym_EventScript_205255:: @ 8205255
-	lockall
-	checktrainerflag TRAINER_MARY
-	goto_if 0, PetalburgCity_Gym_EventScript_20517D
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 72
-	msgbox PetalburgCity_Gym_Text_207331, 5
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_20516C
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_20517B
-	end
-
-PetalburgCity_Gym_EventScript_205288:: @ 8205288
-	lockall
-	checktrainerflag TRAINER_PARKER
-	goto_if 0, PetalburgCity_Gym_EventScript_20517D
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 20
-	msgbox PetalburgCity_Gym_Text_20736C, 5
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_20516C
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_20517B
-	end
-
-PetalburgCity_Gym_EventScript_2052BB:: @ 82052BB
-	lockall
-	checktrainerflag TRAINER_ALEXIA
-	goto_if 0, PetalburgCity_Gym_EventScript_20517D
-	setvar VAR_0x8008, 7
-	setvar VAR_0x8009, 20
-	msgbox PetalburgCity_Gym_Text_20736C, 5
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_20516C
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_20517B
-	end
-
-PetalburgCity_Gym_EventScript_2052EE:: @ 82052EE
-	lockall
-	checktrainerflag TRAINER_ALEXIA
-	goto_if 0, PetalburgCity_Gym_EventScript_20517D
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 33
-	msgbox PetalburgCity_Gym_Text_2073A7, 5
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_20516C
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_20517B
-	end
-
-PetalburgCity_Gym_EventScript_205321:: @ 8205321
-	lockall
-	checktrainerflag TRAINER_GEORGE
-	goto_if 0, PetalburgCity_Gym_EventScript_20517D
-	setvar VAR_0x8008, 7
-	setvar VAR_0x8009, 33
-	msgbox PetalburgCity_Gym_Text_2073A7, 5
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_20516C
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_20517B
-	end
-
-PetalburgCity_Gym_EventScript_205354:: @ 8205354
-	lockall
-	checktrainerflag TRAINER_JODY
-	goto_if 0, PetalburgCity_Gym_EventScript_20517D
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 7
-	msgbox PetalburgCity_Gym_Text_2073E4, 5
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_20516C
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_20517B
-	end
-
-PetalburgCity_Gym_EventScript_205387:: @ 8205387
-	lockall
-	checktrainerflag TRAINER_BERKE
-	goto_if 0, PetalburgCity_Gym_EventScript_20517D
-	setvar VAR_0x8008, 7
-	setvar VAR_0x8009, 7
-	msgbox PetalburgCity_Gym_Text_2073E4, 5
-	compare VAR_RESULT, 1
-	goto_eq PetalburgCity_Gym_EventScript_20516C
-	compare VAR_RESULT, 0
-	goto_eq PetalburgCity_Gym_EventScript_20517B
-	end
-
-PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA
-	trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE
-	checkflag FLAG_0x4F4
-	goto_eq PetalburgCity_Gym_EventScript_2053ED
-	msgbox PetalburgCity_Gym_Text_2067D8, 6
-	end
-
-PetalburgCity_Gym_EventScript_2053DE:: @ 82053DE
-	setvar VAR_0x8005, 0
-	call PetalburgCity_Gym_EventScript_20557F
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED
-	msgbox PetalburgCity_Gym_Text_20685E, 2
-	end
-
-PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6
-	trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A
-	checkflag FLAG_0x4F4
-	goto_eq PetalburgCity_Gym_EventScript_205429
-	msgbox PetalburgCity_Gym_Text_206996, 6
-	end
-
-PetalburgCity_Gym_EventScript_20541A:: @ 820541A
-	setvar VAR_0x8005, 0
-	call PetalburgCity_Gym_EventScript_2055C1
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_205429:: @ 8205429
-	msgbox PetalburgCity_Gym_Text_2069D9, 2
-	end
-
-PetalburgCity_Gym_EventScript_205432:: @ 8205432
-	trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456
-	checkflag FLAG_0x4F4
-	goto_eq PetalburgCity_Gym_EventScript_205465
-	msgbox PetalburgCity_Gym_Text_206AE9, 6
-	end
-
-PetalburgCity_Gym_EventScript_205456:: @ 8205456
-	setvar VAR_0x8005, 0
-	call PetalburgCity_Gym_EventScript_205603
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_205465:: @ 8205465
-	msgbox PetalburgCity_Gym_Text_206BB1, 2
-	end
-
-PetalburgCity_Gym_EventScript_20546E:: @ 820546E
-	trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492
-	checkflag FLAG_0x4F4
-	goto_eq PetalburgCity_Gym_EventScript_2054A1
-	msgbox PetalburgCity_Gym_Text_206C9F, 6
-	end
-
-PetalburgCity_Gym_EventScript_205492:: @ 8205492
-	setvar VAR_0x8005, 0
-	call PetalburgCity_Gym_EventScript_205645
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1
-	msgbox PetalburgCity_Gym_Text_206D56, 2
-	end
-
-PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA
-	trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE
-	checkflag FLAG_0x4F4
-	goto_eq PetalburgCity_Gym_EventScript_2054DD
-	msgbox PetalburgCity_Gym_Text_206E26, 6
-	end
-
-PetalburgCity_Gym_EventScript_2054CE:: @ 82054CE
-	setvar VAR_0x8005, 0
-	call PetalburgCity_Gym_EventScript_2055A0
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD
-	msgbox PetalburgCity_Gym_Text_206ED8, 2
-	end
-
-PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6
-	trainerbattle 2, TRAINER_ALEXIA, 0, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A
-	checkflag FLAG_0x4F4
-	goto_eq PetalburgCity_Gym_EventScript_205519
-	msgbox PetalburgCity_Gym_Text_206F9F, 6
-	end
-
-PetalburgCity_Gym_EventScript_20550A:: @ 820550A
-	setvar VAR_0x8005, 0
-	call PetalburgCity_Gym_EventScript_2055E2
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_205519:: @ 8205519
-	msgbox PetalburgCity_Gym_Text_207069, 2
-	end
-
-PetalburgCity_Gym_EventScript_205522:: @ 8205522
-	trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546
-	checkflag FLAG_0x4F4
-	goto_eq PetalburgCity_Gym_EventScript_205555
-	msgbox PetalburgCity_Gym_Text_2070FB, 6
-	end
-
-PetalburgCity_Gym_EventScript_205546:: @ 8205546
-	setvar VAR_0x8005, 0
-	call PetalburgCity_Gym_EventScript_205624
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_205555:: @ 8205555
-	msgbox PetalburgCity_Gym_Text_207170, 2
-	end
-
-PetalburgCity_Gym_EventScript_20555E:: @ 820555E
-	setvar VAR_0x8004, 1
-	compare VAR_0x8005, 0
-	call_if 1, PetalburgCity_Gym_EventScript_205746
-	compare VAR_0x8005, 1
-	call_if 1, PetalburgCity_Gym_EventScript_20574B
-	call PetalburgCity_Gym_EventScript_205666
-	return
-
-PetalburgCity_Gym_EventScript_20557F:: @ 820557F
-	setvar VAR_0x8004, 2
-	compare VAR_0x8005, 0
-	call_if 1, PetalburgCity_Gym_EventScript_205746
-	compare VAR_0x8005, 1
-	call_if 1, PetalburgCity_Gym_EventScript_20574B
-	call PetalburgCity_Gym_EventScript_20568B
-	return
-
-PetalburgCity_Gym_EventScript_2055A0:: @ 82055A0
-	setvar VAR_0x8004, 3
-	compare VAR_0x8005, 0
-	call_if 1, PetalburgCity_Gym_EventScript_205746
-	compare VAR_0x8005, 1
-	call_if 1, PetalburgCity_Gym_EventScript_20574B
-	call PetalburgCity_Gym_EventScript_2056B0
-	return
-
-PetalburgCity_Gym_EventScript_2055C1:: @ 82055C1
-	setvar VAR_0x8004, 4
-	compare VAR_0x8005, 0
-	call_if 1, PetalburgCity_Gym_EventScript_205746
-	compare VAR_0x8005, 1
-	call_if 1, PetalburgCity_Gym_EventScript_20574B
-	call PetalburgCity_Gym_EventScript_2056D5
-	return
-
-PetalburgCity_Gym_EventScript_2055E2:: @ 82055E2
-	setvar VAR_0x8004, 5
-	compare VAR_0x8005, 0
-	call_if 1, PetalburgCity_Gym_EventScript_205746
-	compare VAR_0x8005, 1
-	call_if 1, PetalburgCity_Gym_EventScript_20574B
-	call PetalburgCity_Gym_EventScript_2056E8
-	return
-
-PetalburgCity_Gym_EventScript_205603:: @ 8205603
-	setvar VAR_0x8004, 6
-	compare VAR_0x8005, 0
-	call_if 1, PetalburgCity_Gym_EventScript_205746
-	compare VAR_0x8005, 1
-	call_if 1, PetalburgCity_Gym_EventScript_20574B
-	call PetalburgCity_Gym_EventScript_20570D
-	return
-
-PetalburgCity_Gym_EventScript_205624:: @ 8205624
-	setvar VAR_0x8004, 7
-	compare VAR_0x8005, 0
-	call_if 1, PetalburgCity_Gym_EventScript_205746
-	compare VAR_0x8005, 1
-	call_if 1, PetalburgCity_Gym_EventScript_20574B
-	call PetalburgCity_Gym_EventScript_205720
-	return
-
-PetalburgCity_Gym_EventScript_205645:: @ 8205645
-	setvar VAR_0x8004, 8
-	compare VAR_0x8005, 0
-	call_if 1, PetalburgCity_Gym_EventScript_205746
-	compare VAR_0x8005, 1
-	call_if 1, PetalburgCity_Gym_EventScript_20574B
-	call PetalburgCity_Gym_EventScript_205733
-	return
-
-PetalburgCity_Gym_EventScript_205666:: @ 8205666
-	setmetatile 6, 85, 528, 0
-	setmetatile 7, 85, 529, 0
-	setmetatile 1, 98, 528, 0
-	setmetatile 2, 98, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_20568B:: @ 820568B
-	setmetatile 6, 46, 528, 0
-	setmetatile 7, 46, 529, 0
-	setmetatile 1, 59, 528, 0
-	setmetatile 2, 59, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_2056B0:: @ 82056B0
-	setmetatile 6, 59, 528, 0
-	setmetatile 7, 59, 529, 0
-	setmetatile 1, 72, 528, 0
-	setmetatile 2, 72, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_2056D5:: @ 82056D5
-	setmetatile 1, 20, 528, 0
-	setmetatile 2, 20, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_2056E8:: @ 82056E8
-	setmetatile 6, 20, 528, 0
-	setmetatile 7, 20, 529, 0
-	setmetatile 1, 33, 528, 0
-	setmetatile 2, 33, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_20570D:: @ 820570D
-	setmetatile 6, 33, 528, 0
-	setmetatile 7, 33, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_205720:: @ 8205720
-	setmetatile 1, 7, 528, 0
-	setmetatile 2, 7, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_205733:: @ 8205733
-	setmetatile 6, 7, 528, 0
-	setmetatile 7, 7, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_205746:: @ 8205746
-	special PetalburgGymSpecial1
-	waitstate
-	return
-
-PetalburgCity_Gym_EventScript_20574B:: @ 820574B
-	special PetalburgGymSpecial2
-	return
-
-PetalburgCity_Gym_EventScript_20574F:: @ 820574F
-	lock
-	faceplayer
-	checkflag FLAG_0x4F4
-	goto_eq PetalburgCity_Gym_EventScript_205764
-	msgbox PetalburgCity_Gym_Text_206542, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_205764:: @ 8205764
-	msgbox PetalburgCity_Gym_Text_2066F3, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_20576E:: @ 820576E
-	lockall
-	checkflag FLAG_BADGE05_GET
-	goto_eq PetalburgCity_Gym_EventScript_20578E
-	goto PetalburgCity_Gym_EventScript_205798
-	end
-
-PetalburgCity_Gym_EventScript_20577E:: @ 820577E
-	lockall
-	checkflag FLAG_BADGE05_GET
-	goto_eq PetalburgCity_Gym_EventScript_20578E
-	goto PetalburgCity_Gym_EventScript_205798
-	end
-
-PetalburgCity_Gym_EventScript_20578E:: @ 820578E
-	msgbox PetalburgCity_Gym_Text_207467, 4
-	releaseall
-	end
-
-PetalburgCity_Gym_EventScript_205798:: @ 8205798
-	msgbox PetalburgCity_Gym_Text_20744C, 4
-	releaseall
-	end
-
-PetalburgCity_Gym_Text_2057A2: @ 82057A2
-	.string "DAD: Hm?\p"
-	.string "Well, if it isn’t {PLAYER}!\n"
-	.string "So you’re all finished moving in?\p"
-	.string "I’m surprised that you managed to\n"
-	.string "get here by yourself.\p"
-	.string "Oh, I see.\n"
-	.string "You’re with your POKéMON.\p"
-	.string "Hm… Then I guess you’re going to\n"
-	.string "become a TRAINER like me, {PLAYER}.\p"
-	.string "That’s great news!\n"
-	.string "I’ll be looking forward to it!$"
-
-PetalburgCity_Gym_Text_2058B1: @ 82058B1
-	.string "Um… I…\n"
-	.string "I’d like to get a POKéMON, please…$"
-
-PetalburgCity_Gym_Text_2058DB: @ 82058DB
-	.string "DAD: Hm? You’re… Uh… Oh, right.\n"
-	.string "You’re WALLY, right?$"
-
-PetalburgCity_Gym_Text_205910: @ 8205910
-	.string "WALLY: I’m going to go stay with my\n"
-	.string "relatives in VERDANTURF TOWN.\p"
-	.string "I thought I would be lonely by myself,\n"
-	.string "so I wanted to take a POKéMON along.\p"
-	.string "But I’ve never caught a POKéMON before.\n"
-	.string "I don’t know how…$"
-
-PetalburgCity_Gym_Text_2059D8: @ 82059D8
-	.string "DAD: Hm. I see.$"
-
-PetalburgCity_Gym_Text_2059E8: @ 82059E8
-	.string "DAD: {PLAYER}, you heard that,\n"
-	.string "right?\p"
-	.string "Go with WALLY and make sure that he\n"
-	.string "safely catches a POKéMON.$"
-
-PetalburgCity_Gym_Text_205A46: @ 8205A46
-	.string "WALLY, here, I’ll loan you my POKéMON.\p"
-	.string "WALLY received a ZIGZAGOON!$"
-
-PetalburgCity_Gym_Text_205A89: @ 8205A89
-	.string "WALLY: Oh, wow!\n"
-	.string "A POKéMON!\p"
-	.string "DAD: Hm. I’ll give you a POKé BALL, too.\n"
-	.string "Go for it!\p"
-	.string "WALLY received a POKé BALL!$"
-
-PetalburgCity_Gym_Text_205AF4: @ 8205AF4
-	.string "WALLY: Oh, wow!\n"
-	.string "Thank you!$"
-
-PetalburgCity_Gym_Text_205B0F: @ 8205B0F
-	.string "{PLAYER}… Would you really come\n"
-	.string "with me?$"
-
-PetalburgCity_Gym_Text_205B32: @ 8205B32
-	.string "DAD: So, did it work out?$"
-
-PetalburgCity_Gym_Text_205B4C: @ 8205B4C
-	.string "WALLY: Thank you, yes, it did.\n"
-	.string "Here’s your POKéMON back.\p"
-	.string "{PLAYER}, thank you for coming along\n"
-	.string "with me.\p"
-	.string "You two are why I was able to catch\n"
-	.string "my POKéMON.\p"
-	.string "I promise I’ll take really good\n"
-	.string "care of it.\p"
-	.string "Oh! My mom’s waiting for me,\n"
-	.string "so I have to go!\p"
-	.string "Bye, {PLAYER}!$"
-
-PetalburgCity_Gym_Text_205C40: @ 8205C40
-	.string "DAD: Now…\p"
-	.string "{PLAYER}, if you want to become a\n"
-	.string "strong TRAINER, here’s my advice.\p"
-	.string "Head for RUSTBORO CITY beyond this\n"
-	.string "town.\p"
-	.string "There, you should challenge\n"
-	.string "the GYM LEADER, ROXANNE.\p"
-	.string "After her, go on to other POKéMON\n"
-	.string "GYMS and defeat their LEADERS.\p"
-	.string "Collect BADGES from them,\n"
-	.string "understood?\p"
-	.string "Of course, I’m a GYM LEADER, too.\n"
-	.string "We’ll battle one day, {PLAYER}.\p"
-	.string "But that’s only after you become\n"
-	.string "stronger.$"
-
-PetalburgCity_Gym_Text_205DB4: @ 8205DB4
-	.string "DAD: Hm? Aren’t you going to the\n"
-	.string "POKéMON GYM in RUSTBORO CITY?\p"
-	.string "There’s no challenge for me to\n"
-	.string "battle a greenhorn TRAINER.\p"
-	.string "{PLAYER}, I want you to challenge me\n"
-	.string "when you become a lot stronger.\p"
-	.string "I’ll battle you, {PLAYER}, when you\n"
-	.string "can show me four GYM BADGES, okay?$"
-
-PetalburgCity_Gym_Text_205EAE: @ 8205EAE
-	.string "DAD: I see… So, you’ve beaten\n"
-	.string "the GYM LEADER in RUSTBORO CITY.\p"
-	.string "But there are many more TRAINERS\n"
-	.string "who are stronger than you, {PLAYER}.\p"
-	.string "Across the sea in DEWFORD TOWN is a\n"
-	.string "GYM LEADER named BRAWLY.\p"
-	.string "You should go challenge him.$"
-
-PetalburgCity_Gym_Text_205F87: @ 8205F87
-	.string "DAD: Hm… {PLAYER}, you have gotten\n"
-	.string "stronger.\p"
-	.string "I can tell by the number of BADGES\n"
-	.string "that you’ve earned.$"
-
-PetalburgCity_Gym_Text_205FE5: @ 8205FE5
-	.string "DAD: Hm…\n"
-	.string "So, you did get four GYM BADGES.\p"
-	.string "Fine, as I promised, we will have\n"
-	.string "a POKéMON battle.\p"
-	.string "{PLAYER}…\p"
-	.string "I’m so happy that I can have\n"
-	.string "a real battle with my own child.\p"
-	.string "But, a battle is a battle!\p"
-	.string "I will do everything in my power as\n"
-	.string "a GYM LEADER to win.\p"
-	.string "{PLAYER}, you’d better give it your\n"
-	.string "best shot, too!$"
-
-PetalburgCity_Gym_Text_206107: @ 8206107
-	.string "…\p"
-	.string "I… I can’t…\p"
-	.string "I can’t believe it. {PLAYER}…\p"
-	.string "I lost to {PLAYER}?\p"
-	.string "But, rules are rules!\n"
-	.string "Here, take this.$"
-
-PetalburgCity_Gym_Text_206162: @ 8206162
-	.string "{PLAYER} received the BALANCE BADGE\n"
-	.string "from DAD!$"
-
-PetalburgCity_Gym_Text_20618A: @ 820618A
-	.string "DAD: With that BADGE, the DEFENSE\n"
-	.string "of all your POKéMON will increase.\p"
-	.string "POKéMON that know the HM move SURF\n"
-	.string "will be able to travel over water.\p"
-	.string "This is my gift to you. {PLAYER}, I’m\n"
-	.string "sure you can use it correctly.$"
-
-PetalburgCity_Gym_Text_206254: @ 8206254
-	.string "DAD: TM42 contains FACADE.\p"
-	.string "It doubles the power of moves if\n"
-	.string "the POKéMON is poisoned, paralyzed,\l"
-	.string "or burned.\p"
-	.string "It might be able to turn a bad\n"
-	.string "situation into an advantage.$"
-
-PetalburgCity_Gym_Text_2062FB: @ 82062FB
-	.string "DAD: As the GYM LEADER, I can’t\n"
-	.string "express how upset I am…\p"
-	.string "But as a father, it makes me both\n"
-	.string "happy and a little sad. It’s odd…$"
-
-PetalburgCity_Gym_Text_206377: @ 8206377
-	.string "Ah, there you are, {PLAYER}{KUN}!\p"
-	.string "Please come with me.\n"
-	.string "I have something I want you to have.$"
-
-PetalburgCity_Gym_Text_2063CA: @ 82063CA
-	.string "NORMAN, you don’t mind, do you?\p"
-	.string "Let me borrow your {PLAYER}{KUN} for\n"
-	.string "a minute or two.$"
-
-PetalburgCity_Gym_Text_206417: @ 8206417
-	.string "DAD: {PLAYER}, you should go visit\n"
-	.string "your mother every so often.\p"
-	.string "I’m going to stay here and redouble\n"
-	.string "my training.\p"
-	.string "It would bother me as a TRAINER to\n"
-	.string "not avenge my loss to you, {PLAYER}!$"
-
-PetalburgCity_Gym_Text_2064C3: @ 82064C3
-	.string "DAD: {PLAYER}, how are things going?\p"
-	.string "The world of POKéMON is deep.\p"
-	.string "I honestly think that no amount of\n"
-	.string "training would ever be enough.$"
-
-PetalburgCity_Gym_Text_206542: @ 8206542
-	.string "Hey, how’s it going, CHAMPION-\n"
-	.string "bound {PLAYER}?\p"
-	.string "The doors in this GYM open when you\n"
-	.string "beat the awaiting TRAINERS.\p"
-	.string "Whoops! The doors in this room are\n"
-	.string "already open, so don’t attack me!\p"
-	.string "The TRAINERS of PETALBURG GYM\n"
-	.string "use all kinds of items.\p"
-	.string "The door at the left leads to\n"
-	.string "the SPEED ROOM.\p"
-	.string "The door at the right leads to\n"
-	.string "the ACCURACY ROOM.\p"
-	.string "The room’s name will be on\n"
-	.string "the door, so choose carefully.\p"
-	.string "Once you’ve chosen the door…\n"
-	.string "Well, hey, go for it!$"
-
-PetalburgCity_Gym_Text_2066F3: @ 82066F3
-	.string "{PLAYER}! Whoa! You’ve overcome even\n"
-	.string "your own father!\p"
-	.string "Like, whoa!\n"
-	.string "What a stunning turn of events!$"
-
-PetalburgCity_Gym_Text_20674F: @ 820674F
-	.string "The ability to attack before the\n"
-	.string "opponent…\p"
-	.string "Just that alone puts me at a great\n"
-	.string "advantage, don’t you agree?$"
-
-PetalburgCity_Gym_Text_2067B9: @ 82067B9
-	.string "That was a magnificent battle!$"
-
-PetalburgCity_Gym_Text_2067D8: @ 82067D8
-	.string "Go on to the next room where a new\n"
-	.string "challenge awaits you.\p"
-	.string "At the left is the CONFUSION ROOM.\p"
-	.string "The right door leads to the DEFENSE\n"
-	.string "ROOM.$"
-
-PetalburgCity_Gym_Text_20685E: @ 820685E
-	.string "Whomever you beat, and whomever you\n"
-	.string "may lose to, you never shirk from\l"
-	.string "training yourself and your POKéMON.\p"
-	.string "That’s what I think being a\n"
-	.string "GYM LEADER is all about.$"
-
-PetalburgCity_Gym_Text_2068FD: @ 82068FD
-	.string "This is the CONFUSION ROOM.\p"
-	.string "Let me see how well bonded you are\n"
-	.string "with your POKéMON!$"
-
-PetalburgCity_Gym_Text_20694F: @ 820694F
-	.string "I couldn’t confuse your team enough…\n"
-	.string "You share a strong bond together.$"
-
-PetalburgCity_Gym_Text_206996: @ 8206996
-	.string "The next room is the STRENGTH ROOM.\n"
-	.string "Can you withstand brute force?$"
-
-PetalburgCity_Gym_Text_2069D9: @ 82069D9
-	.string "After you beat our LEADER, the\n"
-	.string "training has become a lot tougher.$"
-
-PetalburgCity_Gym_Text_206A1B: @ 8206A1B
-	.string "Just when you think you’re going to\n"
-	.string "win, your opponent restores HP…\p"
-	.string "Can you just imagine how awful that\n"
-	.string "must feel?\p"
-	.string "I’ll show you exactly how awful it\n"
-	.string "feels!$"
-
-PetalburgCity_Gym_Text_206AB8: @ 8206AB8
-	.string "I couldn’t restore HP enough…\n"
-	.string "What ATTACK power…$"
-
-PetalburgCity_Gym_Text_206AE9: @ 8206AE9
-	.string "I should have expected no less from\n"
-	.string "our LEADER’s kid.\p"
-	.string "No, wait! A TRAINER’s abilities are\n"
-	.string "earned only through effort.\p"
-	.string "I lost because my own efforts\n"
-	.string "weren’t enough.\p"
-	.string "Go on! The ONE-HIT KO ROOM is next.$"
-
-PetalburgCity_Gym_Text_206BB1: @ 8206BB1
-	.string "I’m going to keep training at GYMS.\n"
-	.string "One day, I’ll become a LEADER.$"
-
-PetalburgCity_Gym_Text_206BF4: @ 8206BF4
-	.string "I’m not going to take it easy just\n"
-	.string "because you’re our LEADER’s kid.\p"
-	.string "I’ll show you how horrid it is for\n"
-	.string "a POKéMON to take a critical hit!$"
-
-PetalburgCity_Gym_Text_206C7D: @ 8206C7D
-	.string "Your power…\n"
-	.string "You’re the real deal.$"
-
-PetalburgCity_Gym_Text_206C9F: @ 8206C9F
-	.string "Your father really is strong.\n"
-	.string "He’s a TRAINER worth my respect.\p"
-	.string "And, I sense the same glow coming\n"
-	.string "from you as your father.\p"
-	.string "I hope that you’ll stage a terrific\n"
-	.string "battle with your father!$"
-
-PetalburgCity_Gym_Text_206D56: @ 8206D56
-	.string "Since your dad became the LEADER,\n"
-	.string "the TRAINERS of PETALBURG CITY have\l"
-	.string "become a lot tougher.$"
-
-PetalburgCity_Gym_Text_206DB2: @ 8206DB2
-	.string "Giggle…\n"
-	.string "This is the ACCURACY ROOM.\p"
-	.string "It’s pretty nasty when every attack\n"
-	.string "lands without fail.$"
-
-PetalburgCity_Gym_Text_206E0D: @ 8206E0D
-	.string "You were a cut above me…$"
-
-PetalburgCity_Gym_Text_206E26: @ 8206E26
-	.string "There are some even stronger\n"
-	.string "TRAINERS waiting for you.\p"
-	.string "The left is the DEFENSE ROOM, and\n"
-	.string "the right is the RECOVERY ROOM.\p"
-	.string "Your POKéMON’s ATTACK power will be\n"
-	.string "on trial either way.$"
-
-PetalburgCity_Gym_Text_206ED8: @ 8206ED8
-	.string "Do you know what we’re trying to\n"
-	.string "achieve as TRAINERS?\p"
-	.string "We’re striving to become soul mates\n"
-	.string "with our POKéMON.$"
-
-PetalburgCity_Gym_Text_206F44: @ 8206F44
-	.string "The higher the DEFENSE, the more\n"
-	.string "reckless I can be in attack.$"
-
-PetalburgCity_Gym_Text_206F82: @ 8206F82
-	.string "Our defenses weren’t enough…$"
-
-PetalburgCity_Gym_Text_206F9F: @ 8206F9F
-	.string "I think you’ve taught me a valuable\n"
-	.string "lesson here.\p"
-	.string "Now, go on! The left door goes to\n"
-	.string "the STRENGTH ROOM.\p"
-	.string "The right door opens to\n"
-	.string "the ONE-HIT KO ROOM.\p"
-	.string "Both of them have TRAINERS who are\n"
-	.string "skilled at offense.$"
-
-PetalburgCity_Gym_Text_207069: @ 8207069
-	.string "Hi! Have you tried using SURF?$"
-
-PetalburgCity_Gym_Text_207088: @ 8207088
-	.string "Our GYM LEADER told us to go all out\n"
-	.string "and beat you.\p"
-	.string "Even if you happen to be the\n"
-	.string "LEADER’s kid!$"
-
-PetalburgCity_Gym_Text_2070E6: @ 82070E6
-	.string "But… I went all out!$"
-
-PetalburgCity_Gym_Text_2070FB: @ 82070FB
-	.string "The way you use your POKéMON…\n"
-	.string "It’s like your father’s style.\p"
-	.string "Go on through! The GYM LEADER, your\n"
-	.string "father, is waiting!$"
-
-PetalburgCity_Gym_Text_207170: @ 8207170
-	.string "Sure, it’s fine to make your POKéMON\n"
-	.string "stronger.\p"
-	.string "But what decides the winner?\p"
-	.string "Why, it’s the feelings TRAINERS have\n"
-	.string "for their POKéMON.$"
-
-PetalburgCity_Gym_Text_2071F4: @ 82071F4
-	.string "This door appears to be locked\n"
-	.string "right now…$"
-
-PetalburgCity_Gym_Text_20721E: @ 820721E
-	.string "“SPEED ROOM,” the sign says.\p"
-	.string "Do you want to go through?$"
-
-PetalburgCity_Gym_Text_207256: @ 8207256
-	.string "This door appears to be locked\n"
-	.string "right now…$"
-
-PetalburgCity_Gym_Text_207280: @ 8207280
-	.string "“ACCURACY ROOM,” the sign says.\p"
-	.string "Do you want to go through?$"
-
-PetalburgCity_Gym_Text_2072BB: @ 82072BB
-	.string "“CONFUSION ROOM,” the sign says.\p"
-	.string "Do you want to go through?$"
-
-PetalburgCity_Gym_Text_2072F7: @ 82072F7
-	.string "“DEFENSE ROOM,” the sign says.\p"
-	.string "Do you want to go through?$"
-
-PetalburgCity_Gym_Text_207331: @ 8207331
-	.string "“RECOVERY ROOM,” the sign says.\p"
-	.string "Do you want to go through?$"
-
-PetalburgCity_Gym_Text_20736C: @ 820736C
-	.string "“STRENGTH ROOM,” the sign says.\p"
-	.string "Do you want to go through?$"
-
-PetalburgCity_Gym_Text_2073A7: @ 82073A7
-	.string "“ONE-HIT KO ROOM,” the sign says.\p"
-	.string "Do you want to go through?$"
-
-PetalburgCity_Gym_Text_2073E4: @ 82073E4
-	.string "“GYM LEADER’S ROOM\p"
-	.string "“See for yourself what POKéMON await\n"
-	.string "you!” the sign says.\p"
-	.string "Do you want to go through?$"
-
-PetalburgCity_Gym_Text_20744C: @ 820744C
-	.string "PETALBURG CITY POKéMON GYM$"
-
-PetalburgCity_Gym_Text_207467: @ 8207467
-	.string "PETALBURG CITY POKéMON GYM\p"
-	.string "NORMAN’S CERTIFIED TRAINERS:\n"
-	.string "{PLAYER}$"
-
-PetalburgCity_Gym_Text_2074A2: @ 82074A2
-	.string "DAD: {PLAYER}…\n"
-	.string "I had a feeling that you would come.\p"
-	.string "I would never refuse to accept\n"
-	.string "a challenge from you.\p"
-	.string "You do understand, don’t you?\p"
-	.string "Inside a GYM, it doesn’t matter that\n"
-	.string "we are a parent and child.\p"
-	.string "…No, because we are parent and child,\n"
-	.string "we owe it to each other to do the best\l"
-	.string "we can. Isn’t that right, {PLAYER}?$"
-
-PetalburgCity_Gym_Text_2075CE: @ 82075CE
-	.string "Uh… Haha…\n"
-	.string "Maybe that was going too hard…$"
-
-PetalburgCity_Gym_Text_2075F7: @ 82075F7
-	.string "DAD: {PLAYER}…\n"
-	.string "What is your dream?\p"
-	.string "My dream…\n"
-	.string "Hahaha…\l"
-	.string "It has already come true, actually.$"
-
-PetalburgCity_Gym_Text_20764A: @ 820764A
-	.string "DAD: {PLAYER}…\n"
-	.string "I had a feeling that you would come.\p"
-	.string "I would never refuse to accept\n"
-	.string "a challenge from you.\p"
-	.string "You do understand, don’t you?\p"
-	.string "Inside a GYM, it doesn’t matter that\n"
-	.string "we are a parent and child.\p"
-	.string "Hm? Wait a second, {PLAYER}.\p"
-	.string "Do you only have one POKéMON that is\n"
-	.string "capable of battle?\p"
-	.string "Sorry, but you’ll have to come back\n"
-	.string "with at least two POKéMON.$"
-
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
deleted file mode 100644
index c2807d50b..000000000
--- a/data/scripts/maps/Route101.inc
+++ /dev/null
@@ -1,301 +0,0 @@
-Route101_MapScripts:: @ 81EBCBA
-	map_script 3, Route101_MapScript1_1EBCC5
-	map_script 2, Route101_MapScript2_1EBCCB
-	.byte 0
-
-Route101_MapScript1_1EBCC5: @ 81EBCC5
-	call Route101_EventScript_2720AD
-	end
-
-Route101_MapScript2_1EBCCB: @ 81EBCCB
-	map_script_2 VAR_0x4060, 0, Route101_EventScript_1EBCD5
-	.2byte 0
-
-Route101_EventScript_1EBCD5:: @ 81EBCD5
-	setflag FLAG_SPECIAL_FLAG_0x4000
-	setvar VAR_0x4060, 1
-	end
-
-Route101_EventScript_1EBCDE:: @ 81EBCDE
-	lockall
-	playbgm MUS_EVENT0, 1
-	msgbox Route101_Text_1EBE8F, 4
-	closemessage
-	setobjectxy 2, 0, 15
-	setobjectxy 4, 0, 16
-	applymovement 255, Route101_Movement_1EBDC2
-	applymovement 2, Route101_Movement_1EBDE7
-	applymovement 4, Route101_Movement_1EBDB5
-	waitmovement 0
-	applymovement 4, Route101_Movement_1EBD96
-	applymovement 2, Route101_Movement_1EBDC8
-	waitmovement 0
-	applymovement 2, Route101_Movement_2725A8
-	waitmovement 0
-	applymovement 4, Route101_Movement_1EBDBD
-	applymovement 2, Route101_Movement_1EBDEF
-	waitmovement 0
-	msgbox Route101_Text_1EBE9A, 4
-	closemessage
-	setvar VAR_0x4060, 2
-	releaseall
-	end
-
-Route101_EventScript_1EBD4E:: @ 81EBD4E
-	lockall
-	msgbox Route101_Text_1EBEDF, 4
-	closemessage
-	applymovement 255, Route101_Movement_1EBD90
-	waitmovement 0
-	releaseall
-	end
-
-Route101_EventScript_1EBD64:: @ 81EBD64
-	lockall
-	msgbox Route101_Text_1EBEDF, 4
-	closemessage
-	applymovement 255, Route101_Movement_1EBD92
-	waitmovement 0
-	releaseall
-	end
-
-Route101_EventScript_1EBD7A:: @ 81EBD7A
-	lockall
-	msgbox Route101_Text_1EBEDF, 4
-	closemessage
-	applymovement 255, Route101_Movement_1EBD94
-	waitmovement 0
-	releaseall
-	end
-
-Route101_Movement_1EBD90: @ 81EBD90
-	walk_up
-	step_end
-
-Route101_Movement_1EBD92: @ 81EBD92
-	walk_right
-	step_end
-
-Route101_Movement_1EBD94: @ 81EBD94
-	walk_down
-	step_end
-
-Route101_Movement_1EBD96: @ 81EBD96
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_left
-	walk_fast_left
-	step_end
-
-Route101_Movement_1EBDB5: @ 81EBDB5
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	step_end
-
-Route101_Movement_1EBDBC: @ 81EBDBC
-	step_end
-
-Route101_Movement_1EBDBD: @ 81EBDBD
-	walk_in_place_fast_left
-	walk_in_place_fast_left
-	walk_in_place_fast_left
-	walk_in_place_fast_left
-	step_end
-
-Route101_Movement_1EBDC2: @ 81EBDC2
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_in_place_fastest_left
-	step_end
-
-Route101_Movement_1EBDC8: @ 81EBDC8
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	step_end
-
-Route101_Movement_1EBDE7: @ 81EBDE7
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	walk_fast_up
-	step_end
-
-Route101_Movement_1EBDEE: @ 81EBDEE
-	step_end
-
-Route101_Movement_1EBDEF: @ 81EBDEF
-	walk_in_place_fast_right
-	walk_in_place_fast_right
-	walk_in_place_fast_right
-	walk_in_place_fast_right
-	step_end
-
-Route101_Movement_1EBDF4: @ 81EBDF4
-	walk_up
-	walk_up
-	step_end
-
-Route101_Movement_1EBDF7: @ 81EBDF7
-	walk_up
-	walk_left
-	walk_up
-	step_end
-
-Route101_EventScript_1EBDFB:: @ 81EBDFB
-	msgbox Route101_Text_1EBFDD, 2
-	end
-
-Route101_EventScript_1EBE04:: @ 81EBE04
-	msgbox Route101_Text_1EC04A, 2
-	end
-
-Route101_EventScript_1EBE0D:: @ 81EBE0D
-	msgbox Route101_Text_1EC0C8, 3
-	end
-
-Route101_EventScript_1EBE16:: @ 81EBE16
-	lock
-	faceplayer
-	setflag FLAG_SYS_POKEMON_GET
-	setflag FLAG_0x052
-	fadescreen 1
-	removeobject 4
-	setobjectxy 255, 6, 13
-	applymovement 255, Route101_Movement_2725A4
-	waitmovement 0
-	special ChooseStarter
-	waitstate
-	applymovement 2, Route101_Movement_1EBE8D
-	waitmovement 0
-	msgbox Route101_Text_1EBF12, 4
-	special HealPlayerParty
-	setflag FLAG_0x2D0
-	clearflag FLAG_0x2D1
-	setflag FLAG_0x2BC
-	setvar VAR_0x4084, 2
-	setvar VAR_0x4060, 3
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, Route101_EventScript_1EBE85
-	compare VAR_RESULT, 1
-	call_if 1, Route101_EventScript_1EBE89
-	warp LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
-	waitstate
-	release
-	end
-
-Route101_EventScript_1EBE85:: @ 81EBE85
-	setflag FLAG_0x2D2
-	return
-
-Route101_EventScript_1EBE89:: @ 81EBE89
-	setflag FLAG_0x2F8
-	return
-
-Route101_Movement_1EBE8D: @ 81EBE8D
-	walk_right
-	step_end
-
-Route101_Text_1EBE8F: @ 81EBE8F
-	.string "H-help me!$"
-
-Route101_Text_1EBE9A: @ 81EBE9A
-	.string "Hello! You over there!\n"
-	.string "Please! Help!\p"
-	.string "In my BAG!\n"
-	.string "There’s a POKé BALL!$"
-
-Route101_Text_1EBEDF: @ 81EBEDF
-	.string "Wh-Where are you going?!\n"
-	.string "Don’t leave me like this!$"
-
-Route101_Text_1EBF12: @ 81EBF12
-	.string "PROF. BIRCH: Whew…\p"
-	.string "I was in the tall grass studying wild\n"
-	.string "POKéMON when I was jumped.\p"
-	.string "You saved me.\n"
-	.string "Thanks a lot!\p"
-	.string "Oh?\p"
-	.string "Hi, you’re {PLAYER}{KUN}!\p"
-	.string "This is not the place to chat, so come\n"
-	.string "by my POKéMON LAB later, okay?$"
-
-Route101_Text_1EBFDD: @ 81EBFDD
-	.string "If POKéMON get tired, take them to\n"
-	.string "a POKéMON CENTER.\p"
-	.string "There’s a POKéMON CENTER in OLDALE\n"
-	.string "TOWN right close by.$"
-
-Route101_Text_1EC04A: @ 81EC04A
-	.string "Wild POKéMON will jump out at you in\n"
-	.string "tall grass.\p"
-	.string "If you want to catch POKéMON, you have\n"
-	.string "to go into the tall grass and search.$"
-
-Route101_Text_1EC0C8: @ 81EC0C8
-	.string "ROUTE 101\n"
-	.string "{0x79} OLDALE TOWN$"
-
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc
deleted file mode 100644
index a432f0d94..000000000
--- a/data/scripts/maps/Route104.inc
+++ /dev/null
@@ -1,1227 +0,0 @@
-Route104_MapScripts:: @ 81ECC32
-	map_script 2, Route104_MapScript2_1ECC3D
-	map_script 3, Route104_MapScript1_1ECC4E
-	.byte 0
-
-Route104_MapScript2_1ECC3D: @ 81ECC3D
-	map_script_2 VAR_0x408E, 1, Route104_EventScript_1ECC47
-	.2byte 0
-
-Route104_EventScript_1ECC47:: @ 81ECC47
-	lockall
-	goto Route104_EventScript_1ED099
-	end
-
-Route104_MapScript1_1ECC4E: @ 81ECC4E
-	call Route104_EventScript_271ED7
-	call Route104_EventScript_1ECC78
-	call Route104_EventScript_1ECC5E
-	end
-
-Route104_EventScript_1ECC5E:: @ 81ECC5E
-	checkflag FLAG_0x07F
-	goto_if 0, Route104_EventScript_1ECC74
-	checkflag FLAG_BADGE03_GET
-	goto_if 0, Route104_EventScript_1ECC74
-	clearflag FLAG_0x38A
-	return
-
-Route104_EventScript_1ECC74:: @ 81ECC74
-	setflag FLAG_0x38A
-	return
-
-Route104_EventScript_1ECC78:: @ 81ECC78
-	compare VAR_0x408E, 1
-	goto_if 4, Route104_EventScript_1ECC9D
-	checkflag FLAG_0x120
-	goto_eq Route104_EventScript_1ECC9D
-	checkflag FLAG_0x07C
-	goto_if 0, Route104_EventScript_1ECC9D
-	setobjectxyperm 34, 17, 52
-	return
-
-Route104_EventScript_1ECC9D:: @ 81ECC9D
-	return
-
-Route104_EventScript_1ECC9E:: @ 81ECC9E
-	lockall
-	setvar VAR_0x8008, 1
-	applymovement 34, Route104_Movement_27259E
-	waitmovement 0
-	goto Route104_EventScript_1ECD33
-
-Route104_EventScript_1ECCB3:: @ 81ECCB3
-	lockall
-	setflag FLAG_0x32E
-	setvar VAR_0x405A, 8
-	setvar VAR_0x4063, 2
-	applymovement 255, Route104_Movement_2725A6
-	waitmovement 0
-	delay 10
-	addobject 34
-	clearflag FLAG_0x2CF
-	applymovement 255, Route104_Movement_1ECF86
-	waitmovement 0
-	applymovement 34, Route104_Movement_1ECF8A
-	waitmovement 0
-	delay 20
-	setvar VAR_0x8008, 0
-	call Route104_EventScript_1E0DD1
-	playse SE_PIN
-	applymovement 34, Route104_Movement_272598
-	waitmovement 0
-	applymovement 34, Route104_Movement_27259A
-	waitmovement 0
-	goto Route104_EventScript_1ECD33
-
-Route104_EventScript_1ECD11:: @ 81ECD11
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq Route104_EventScript_1ECD29
-	compare VAR_RESULT, 1
-	goto_eq Route104_EventScript_1ECD2E
-	return
-
-Route104_EventScript_1ECD29:: @ 81ECD29
-	playbgm MUS_GIRL_SUP, 1
-	return
-
-Route104_EventScript_1ECD2E:: @ 81ECD2E
-	playbgm MUS_BOY_SUP, 1
-	return
-
-Route104_EventScript_1ECD33:: @ 81ECD33
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq Route104_EventScript_1ECD4B
-	compare VAR_RESULT, 1
-	goto_eq Route104_EventScript_1ECE6F
-	end
-
-Route104_EventScript_1ECD4B:: @ 81ECD4B
-	checkflag FLAG_0x07D
-	goto_eq Route104_EventScript_1ECE1C
-	checkflag FLAG_0x07C
-	goto_eq Route104_EventScript_1ECDD0
-	setflag FLAG_0x07C
-	msgbox Route104_Text_1EDBFF, 4
-	closemessage
-	delay 30
-	playfanfare MUS_ME_TORE_EYE
-	msgbox Route104_Text_1EDC8F, 4
-	waitfanfare
-	closemessage
-	delay 30
-	setflag FLAG_0x0FD
-	applymovement 255, Route104_Movement_1ECDCD
-	applymovement 34, Route104_Movement_1ECDC8
-	msgbox Route104_Text_1EDCB1, 4
-	closemessage
-	waitmovement 0
-	applymovement 34, Route104_Movement_1ECDCA
-	waitmovement 0
-	moveobjectoffscreen 34
-	msgbox Route104_Text_1EDCED, 5
-	compare VAR_RESULT, 1
-	goto_eq Route104_EventScript_1ECDED
-	msgbox Route104_Text_1EDD2A, 4
-	call Route104_EventScript_1ECE31
-	releaseall
-	end
-
-Route104_Movement_1ECDC8: @ 81ECDC8
-	walk_slow_left
-	step_end
-
-Route104_Movement_1ECDCA: @ 81ECDCA
-	walk_down
-	face_right
-	step_end
-
-Route104_Movement_1ECDCD: @ 81ECDCD
-	delay_4
-	walk_in_place_fastest_left
-	step_end
-
-Route104_EventScript_1ECDD0:: @ 81ECDD0
-	msgbox Route104_Text_1EDD9F, 5
-	compare VAR_RESULT, 1
-	goto_eq Route104_EventScript_1ECDED
-	msgbox Route104_Text_1EDD2A, 4
-	releaseall
-	end
-
-Route104_EventScript_1ECDED:: @ 81ECDED
-	msgbox Route104_Text_1EDDDB, 4
-	switch VAR_FIRST_POKE
-	case 0, Route104_EventScript_1ECE36
-	case 1, Route104_EventScript_1ECE49
-	case 2, Route104_EventScript_1ECE5C
-	end
-
-Route104_EventScript_1ECE1C:: @ 81ECE1C
-	msgbox Route104_Text_1EDE3E, 4
-	compare VAR_0x8008, 0
-	call_if 1, Route104_EventScript_1ECE31
-	releaseall
-	end
-
-Route104_EventScript_1ECE31:: @ 81ECE31
-	savebgm MUS_DUMMY
-	fadedefaultbgm
-	return
-
-Route104_EventScript_1ECE36:: @ 81ECE36
-	trainerbattle 3, TRAINER_MAY_14, 0, Route104_Text_1EDE18
-	setflag FLAG_0x07D
-	goto Route104_EventScript_1ECE1C
-	end
-
-Route104_EventScript_1ECE49:: @ 81ECE49
-	trainerbattle 3, TRAINER_MAY_15, 0, Route104_Text_1EDE18
-	setflag FLAG_0x07D
-	goto Route104_EventScript_1ECE1C
-	end
-
-Route104_EventScript_1ECE5C:: @ 81ECE5C
-	trainerbattle 3, TRAINER_MAY_10, 0, Route104_Text_1EDE18
-	setflag FLAG_0x07D
-	goto Route104_EventScript_1ECE1C
-	end
-
-Route104_EventScript_1ECE6F:: @ 81ECE6F
-	checkflag FLAG_0x07D
-	goto_eq Route104_EventScript_1ECF38
-	checkflag FLAG_0x07C
-	goto_eq Route104_EventScript_1ECEEC
-	setflag FLAG_0x07C
-	msgbox Route104_Text_1EDF04, 4
-	closemessage
-	delay 30
-	playfanfare MUS_ME_TORE_EYE
-	msgbox Route104_Text_1EDFA0, 4
-	waitfanfare
-	closemessage
-	delay 30
-	setflag FLAG_0x0FD
-	applymovement 255, Route104_Movement_1ECDCD
-	applymovement 34, Route104_Movement_1ECDC8
-	msgbox Route104_Text_1EDFC6, 4
-	closemessage
-	waitmovement 0
-	applymovement 34, Route104_Movement_1ECDCA
-	waitmovement 0
-	moveobjectoffscreen 34
-	msgbox Route104_Text_1EE009, 5
-	compare VAR_RESULT, 1
-	goto_eq Route104_EventScript_1ECF09
-	msgbox Route104_Text_1EE04D, 4
-	call Route104_EventScript_1ECE31
-	releaseall
-	end
-
-Route104_EventScript_1ECEEC:: @ 81ECEEC
-	msgbox Route104_Text_1EE094, 5
-	compare VAR_RESULT, 1
-	goto_eq Route104_EventScript_1ECF09
-	msgbox Route104_Text_1EE04D, 4
-	releaseall
-	end
-
-Route104_EventScript_1ECF09:: @ 81ECF09
-	msgbox Route104_Text_1EE0C7, 4
-	switch VAR_FIRST_POKE
-	case 0, Route104_EventScript_1ECF4D
-	case 1, Route104_EventScript_1ECF60
-	case 2, Route104_EventScript_1ECF73
-	end
-
-Route104_EventScript_1ECF38:: @ 81ECF38
-	msgbox Route104_Text_1EE120, 4
-	compare VAR_0x8008, 0
-	call_if 1, Route104_EventScript_1ECE31
-	releaseall
-	end
-
-Route104_EventScript_1ECF4D:: @ 81ECF4D
-	trainerbattle 3, TRAINER_BRENDAN_10, 0, Route104_Text_1EE107
-	setflag FLAG_0x07D
-	goto Route104_EventScript_1ECF38
-	end
-
-Route104_EventScript_1ECF60:: @ 81ECF60
-	trainerbattle 3, TRAINER_BRENDAN_12, 0, Route104_Text_1EE107
-	setflag FLAG_0x07D
-	goto Route104_EventScript_1ECF38
-	end
-
-Route104_EventScript_1ECF73:: @ 81ECF73
-	trainerbattle 3, TRAINER_BRENDAN_11, 0, Route104_Text_1EE107
-	setflag FLAG_0x07D
-	goto Route104_EventScript_1ECF38
-	end
-
-Route104_Movement_1ECF86: @ 81ECF86
-	lock_facing_direction
-	walk_down
-	unlock_facing_direction
-	step_end
-
-Route104_Movement_1ECF8A: @ 81ECF8A
-	walk_down
-	step_end
-
-Route104_EventScript_1ECF8C:: @ 81ECF8C
-	lock
-	faceplayer
-	checkflag FLAG_0x0F6
-	goto_eq Route104_EventScript_1ECFC3
-	msgbox Route104_Text_2A6D86, 4
-	giveitem_std ITEM_CHESTO_BERRY
-	compare VAR_RESULT, 0
-	goto_eq Route104_EventScript_272054
-	setflag FLAG_0x0F6
-	msgbox Route104_Text_2A6E32, 4
-	release
-	end
-
-Route104_EventScript_1ECFC3:: @ 81ECFC3
-	msgbox Route104_Text_2A6E32, 4
-	release
-	end
-
-Route104_EventScript_1ECFCD:: @ 81ECFCD
-	lock
-	faceplayer
-	checkflag FLAG_0x117
-	goto_eq Route104_EventScript_1ECFFC
-	msgbox Route104_Text_1ED96A, 4
-	giveitem_std ITEM_WHITE_HERB
-	compare VAR_RESULT, 0
-	goto_eq Route104_EventScript_272054
-	setflag FLAG_0x117
-	release
-	end
-
-Route104_EventScript_1ECFFC:: @ 81ECFFC
-	msgbox Route104_Text_1EDA0F, 4
-	release
-	end
-
-Route104_EventScript_1ED006:: @ 81ED006
-	msgbox Route104_Text_1ED5EC, 2
-	end
-
-Route104_EventScript_1ED00F:: @ 81ED00F
-	msgbox Route104_Text_1ED662, 3
-	end
-
-Route104_EventScript_1ED018:: @ 81ED018
-	msgbox Route104_Text_1EDA8C, 3
-	end
-
-Route104_EventScript_1ED021:: @ 81ED021
-	msgbox Route104_Text_1EDAA1, 3
-	end
-
-Route104_EventScript_1ED02A:: @ 81ED02A
-	msgbox Route104_Text_1EDABC, 3
-	end
-
-Route104_EventScript_1ED033:: @ 81ED033
-	msgbox Route104_Text_1EDAD6, 3
-	end
-
-Route104_EventScript_1ED03C:: @ 81ED03C
-	msgbox Route104_Text_1EDAEF, 3
-	end
-
-Route104_EventScript_1ED045:: @ 81ED045
-	msgbox Route104_Text_1ED6A2, 2
-	end
-
-Route104_EventScript_1ED04E:: @ 81ED04E
-	msgbox Route104_Text_1ED735, 2
-	end
-
-Route104_EventScript_1ED057:: @ 81ED057
-	lock
-	faceplayer
-	checkflag FLAG_0x106
-	goto_eq Route104_EventScript_1ED086
-	msgbox Route104_Text_1ED838, 4
-	giveitem_std ITEM_TM09
-	compare VAR_RESULT, 0
-	goto_eq Route104_EventScript_272054
-	setflag FLAG_0x106
-	release
-	end
-
-Route104_EventScript_1ED086:: @ 81ED086
-	msgbox Route104_Text_1ED8E7, 4
-	release
-	end
-
-Route104_EventScript_1ED090:: @ 81ED090
-	msgbox Route104_Text_1ED7A2, 2
-	end
-
-Route104_EventScript_1ED099:: @ 81ED099
-	setobjectpriority 8, ROUTE_104, 0
-	setobjectpriority 255, ROUTE_104, 0
-	applymovement 8, Route104_Movement_1ED359
-	waitmovement 0
-	removeobject 8
-	applymovement 255, Route104_Movement_1ED34F
-	waitmovement 0
-	hideobjectat 255, ROUTE_104
-	call Route104_EventScript_2720A0
-	checkflag FLAG_0x132
-	goto_eq Route104_EventScript_1ED0D9
-	checkflag FLAG_0x132
-	goto_if 0, Route104_EventScript_1ED0EF
-	end
-
-Route104_EventScript_1ED0D9:: @ 81ED0D9
-	applymovement 7, Route104_Movement_1ED28C
-	applymovement 255, Route104_Movement_1ED28C
-	waitmovement 0
-	goto Route104_EventScript_1ED139
-
-Route104_EventScript_1ED0EF:: @ 81ED0EF
-	applymovement 7, Route104_Movement_1ED1C8
-	applymovement 255, Route104_Movement_1ED1C8
-	waitmovement 0
-	pokenavcall Route104_Text_1EE336
-	waitmessage
-	delay 30
-	playfanfare MUS_ME_TORE_EYE
-	msgbox Route104_Text_1EE463, 4
-	waitfanfare
-	closemessage
-	delay 30
-	setflag FLAG_0x132
-	applymovement 255, Route104_Movement_1ED22A
-	applymovement 7, Route104_Movement_1ED22A, ROUTE_104
-	waitmovement 7, ROUTE_104
-	waitmovement 0
-	goto Route104_EventScript_1ED139
-
-Route104_EventScript_1ED139:: @ 81ED139
-	delay 50
-	applymovement 255, Route104_Movement_1ED353
-	waitmovement 0
-	call Route104_EventScript_2720A8
-	showobjectat 255, DEWFORD_TOWN
-	applymovement 255, Route104_Movement_1ED355
-	waitmovement 0
-	setobjectxyperm 2, 12, 8
-	addobject 2
-	setobjectpriority 2, DEWFORD_TOWN, 0
-	clearflag FLAG_0x2E4
-	applymovement 2, Route104_Movement_1ED35C
-	waitmovement 0
-	addobject 4
-	clearflag FLAG_0x2E7
-	call Route104_EventScript_2720A8
-	setflag FLAG_0x2E6
-	hideobjectat 7, ROUTE_104
-	copyvar VAR_0x4096, VAR_0x8008
-	resetobjectpriority 255, ROUTE_104
-	resetobjectpriority 2, DEWFORD_TOWN
-	moveobjectoffscreen 2
-	setvar VAR_0x408E, 0
-	checkflag FLAG_0x0BD
-	goto_if 0, Route104_EventScript_1ED1B4
-	checkflag FLAG_0x0BD
-	goto_eq Route104_EventScript_1ED1BE
-	end
-
-Route104_EventScript_1ED1B4:: @ 81ED1B4
-	msgbox Route104_Text_1E9AAF, 4
-	releaseall
-	end
-
-Route104_EventScript_1ED1BE:: @ 81ED1BE
-	msgbox Route104_Text_1E9C1D, 4
-	releaseall
-	end
-
-Route104_Movement_1ED1C8: @ 81ED1C8
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_right
-	walk_fast_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	step_end
-
-Route104_Movement_1ED22A: @ 81ED22A
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_right
-	walk_right
-	walk_down
-	walk_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_down
-	walk_down
-	step_end
-
-Route104_Movement_1ED28C: @ 81ED28C
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_right
-	walk_fast_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fastest_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_right
-	walk_right
-	walk_down
-	walk_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_down
-	walk_down
-	step_end
-
-Route104_Movement_1ED34F: @ 81ED34F
-	walk_left
-	walk_down
-	walk_down
-	step_end
-
-Route104_Movement_1ED353: @ 81ED353
-	walk_down
-	step_end
-
-Route104_Movement_1ED355: @ 81ED355
-	walk_down
-	walk_left
-	walk_in_place_fastest_right
-	step_end
-
-Route104_Movement_1ED359: @ 81ED359
-	walk_down
-	walk_down
-	step_end
-
-Route104_Movement_1ED35C: @ 81ED35C
-	walk_down
-	walk_in_place_fastest_left
-	step_end
-
-Route104_EventScript_1ED35F:: @ 81ED35F
-	trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_2954BD, Route104_Text_295509
-	msgbox Route104_Text_29554E, 6
-	end
-
-Route104_EventScript_1ED376:: @ 81ED376
-	trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_29558A, Route104_Text_2955B4
-	msgbox Route104_Text_2955E8, 6
-	end
-
-Route104_EventScript_1ED38D:: @ 81ED38D
-	trainerbattle 2, TRAINER_HALEY_1, 0, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route104_EventScript_1ED424
-	setvar VAR_0x8004, 604
-	specialvar VAR_RESULT, sub_813B4E0
-	compare VAR_RESULT, 0
-	goto_eq Route104_EventScript_1ED3F8
-	msgbox Route104_Text_295689, 4
-	release
-	end
-
-Route104_EventScript_1ED3CE:: @ 81ED3CE
-	special sub_80B4808
-	waitmovement 0
-	checkflag FLAG_HAS_MATCH_CALL
-	goto_eq Route104_EventScript_1ED3DF
-	release
-	end
-
-Route104_EventScript_1ED3DF:: @ 81ED3DF
-	msgbox Route104_Text_29576B, 4
-	setvar VAR_0x8004, 604
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 604
-	callstd 8
-	release
-	end
-
-Route104_EventScript_1ED3F8:: @ 81ED3F8
-	checkflag FLAG_HAS_MATCH_CALL
-	goto_eq Route104_EventScript_1ED40B
-	msgbox Route104_Text_295689, 4
-	release
-	end
-
-Route104_EventScript_1ED40B:: @ 81ED40B
-	msgbox Route104_Text_2956FF, 4
-	setvar VAR_0x8004, 604
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 604
-	callstd 8
-	release
-	end
-
-Route104_EventScript_1ED424:: @ 81ED424
-	trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_2957D7, Route104_Text_2957F0
-	msgbox Route104_Text_29580C, 6
-	end
-
-Route104_EventScript_1ED43B:: @ 81ED43B
-	trainerbattle 2, TRAINER_WINSTON_1, 0, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route104_EventScript_1ED4D2
-	setvar VAR_0x8004, 136
-	specialvar VAR_RESULT, sub_813B4E0
-	compare VAR_RESULT, 0
-	goto_eq Route104_EventScript_1ED4A6
-	msgbox Route104_Text_2958C1, 4
-	release
-	end
-
-Route104_EventScript_1ED47C:: @ 81ED47C
-	special sub_80B4808
-	waitmovement 0
-	checkflag FLAG_HAS_MATCH_CALL
-	goto_eq Route104_EventScript_1ED48D
-	release
-	end
-
-Route104_EventScript_1ED48D:: @ 81ED48D
-	msgbox Route104_Text_29595A, 4
-	setvar VAR_0x8004, 136
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 136
-	callstd 8
-	release
-	end
-
-Route104_EventScript_1ED4A6:: @ 81ED4A6
-	checkflag FLAG_HAS_MATCH_CALL
-	goto_eq Route104_EventScript_1ED4B9
-	msgbox Route104_Text_2958C1, 4
-	release
-	end
-
-Route104_EventScript_1ED4B9:: @ 81ED4B9
-	msgbox Route104_Text_2958F8, 4
-	setvar VAR_0x8004, 136
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 136
-	callstd 8
-	release
-	end
-
-Route104_EventScript_1ED4D2:: @ 81ED4D2
-	trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_2959BC, Route104_Text_2959FC
-	msgbox Route104_Text_295A1E, 6
-	end
-
-Route104_EventScript_1ED4E9:: @ 81ED4E9
-	trainerbattle 2, TRAINER_CINDY_1, 0, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route104_EventScript_1ED580
-	setvar VAR_0x8004, 114
-	specialvar VAR_RESULT, sub_813B4E0
-	compare VAR_RESULT, 0
-	goto_eq Route104_EventScript_1ED554
-	msgbox Route104_Text_295AC3, 4
-	release
-	end
-
-Route104_EventScript_1ED52A:: @ 81ED52A
-	special sub_80B4808
-	waitmovement 0
-	checkflag FLAG_HAS_MATCH_CALL
-	goto_eq Route104_EventScript_1ED53B
-	release
-	end
-
-Route104_EventScript_1ED53B:: @ 81ED53B
-	msgbox Route104_Text_295B60, 4
-	setvar VAR_0x8004, 114
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 114
-	callstd 8
-	release
-	end
-
-Route104_EventScript_1ED554:: @ 81ED554
-	checkflag FLAG_HAS_MATCH_CALL
-	goto_eq Route104_EventScript_1ED567
-	msgbox Route104_Text_295AC3, 4
-	release
-	end
-
-Route104_EventScript_1ED567:: @ 81ED567
-	msgbox Route104_Text_295B01, 4
-	setvar VAR_0x8004, 114
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 114
-	callstd 8
-	release
-	end
-
-Route104_EventScript_1ED580:: @ 81ED580
-	trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_295BC8, Route104_Text_295BFA
-	msgbox Route104_Text_295C1F, 6
-	end
-
-Route104_EventScript_1ED597:: @ 81ED597
-	trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330
-	special GetPlayerBigGuyGirlString
-	msgbox Route104_Text_2952FE, 4
-	release
-	end
-
-Route104_EventScript_1ED5B6:: @ 81ED5B6
-	trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449
-	special GetPlayerBigGuyGirlString
-	msgbox Route104_Text_29540D, 4
-	release
-	end
-
-Route104_EventScript_1ED5D5:: @ 81ED5D5
-	trainerbattle 0, TRAINER_DARIAN, 0, Route104_Text_295C5D, Route104_Text_295CC9
-	msgbox Route104_Text_295CD3, 6
-	end
-
-Route104_Text_1ED5EC: @ 81ED5EC
-	.string "That seaside cottage is where\n"
-	.string "MR. BRINEY lives.\p"
-	.string "He was once a mighty sailor who never\n"
-	.string "feared the sea, however stormy.$"
-
-Route104_Text_1ED662: @ 81ED662
-	.string "The sea, huh?\p"
-	.string "I wonder what it’s like at the bottom\n"
-	.string "of the sea?$"
-
-Route104_Text_1ED6A2: @ 81ED6A2
-	.string "If you’re going to throw a POKé BALL,\n"
-	.string "weaken the wild POKéMON first.\p"
-	.string "It will be easier to catch if it’s been\n"
-	.string "poisoned, burned, or lulled to sleep.$"
-
-Route104_Text_1ED735: @ 81ED735
-	.string "You’re a thief if you try to steal\n"
-	.string "someone else’s POKéMON.\p"
-	.string "You should throw POKé BALLS only at\n"
-	.string "wild POKéMON.$"
-
-Route104_Text_1ED7A2: @ 81ED7A2
-	.string "Oh, no, I’m not a TRAINER.\p"
-	.string "But that’s right, if TRAINERS lock eyes,\n"
-	.string "it’s a challenge to battle.\p"
-	.string "If you don’t want to battle, stay out\n"
-	.string "of their sight.$"
-
-Route104_Text_1ED838: @ 81ED838
-	.string "I like filling my mouth with seeds,\n"
-	.string "then spitting them out fast!\p"
-	.string "You can have this, so you try it out!\p"
-	.string "Use it on a POKéMON, and it will learn\n"
-	.string "a move for firing seeds rapidly.$"
-
-Route104_Text_1ED8E7: @ 81ED8E7
-	.string "A word of advice!\p"
-	.string "A TM, TECHNICAL MACHINE, is good only\n"
-	.string "for one-time use.\p"
-	.string "Once you use it, it’s gone.\n"
-	.string "Think twice before using it!$"
-
-Route104_Text_1ED96A: @ 81ED96A
-	.string "This FLOWER SHOP started selling\n"
-	.string "saplings recently.\p"
-	.string "It made me so happy, I went overboard\n"
-	.string "shopping.\p"
-	.string "I don’t need this WHITE HERB anymore.\n"
-	.string "Would you take it, please?$"
-
-Route104_Text_1EDA0F: @ 81EDA0F
-	.string "This FLOWER SHOP started selling\n"
-	.string "saplings recently.\p"
-	.string "It made me so happy, I went overboard\n"
-	.string "shopping. Where should I put them?$"
-
-Route104_Text_1EDA8C: @ 81EDA8C
-	.string "MR. BRINEY’S COTTAGE$"
-
-Route104_Text_1EDAA1: @ 81EDAA1
-	.string "ROUTE 1O4\n"
-	.string "{0x7C} PETALBURG CITY$"
-
-Route104_Text_1EDABC: @ 81EDABC
-	.string "ROUTE 1O4\n"
-	.string "{0x79} RUSTBORO CITY$"
-
-Route104_Text_1EDAD6: @ 81EDAD6
-	.string "PRETTY PETAL FLOWER SHOP$"
-
-Route104_Text_1EDAEF: @ 81EDAEF
-	.string "TRAINER TIPS\p"
-	.string "In the HOENN region there are pairs\n"
-	.string "of TRAINERS who challenge others\l"
-	.string "for 2-on-2 POKéMON battles called\l"
-	.string "DOUBLE BATTLES.\p"
-	.string "In a DOUBLE BATTLE, the TRAINER must\n"
-	.string "send out two POKéMON, the one at the\l"
-	.string "left of the list and the top one.\l"
-	.string "Watch how POKéMON are lined up.$"
-
-Route104_Text_1EDBFF: @ 81EDBFF
-	.string "MAY: Oh, hi, {PLAYER}{KUN}!\p"
-	.string "DEVON upgraded your POKéNAV with\n"
-	.string "the MATCH CALL system, huh?\p"
-	.string "We should register each other so we\n"
-	.string "can get in contact anytime.$"
-
-Route104_Text_1EDC8F: @ 81EDC8F
-	.string "{PLAYER} registered MAY\n"
-	.string "in the POKéNAV.$"
-
-Route104_Text_1EDCB1: @ 81EDCB1
-	.string "MAY: Oh, by the way, {PLAYER}{KUN},\n"
-	.string "how’s your POKéDEX coming along?$"
-
-Route104_Text_1EDCED: @ 81EDCED
-	.string "Mine’s looking pretty decent.\n"
-	.string "So…\l"
-	.string "How about a little battle?$"
-
-Route104_Text_1EDD2A: @ 81EDD2A
-	.string "MAY: Oh, what’s the matter?\p"
-	.string "Haven’t you caught or raised your\n"
-	.string "POKéMON very much?\p"
-	.string "That’s not very good for a TRAINER!$"
-
-Route104_Text_1EDD9F: @ 81EDD9F
-	.string "MAY: So, what do you think?\n"
-	.string "How about a little battle here?$"
-
-Route104_Text_1EDDDB: @ 81EDDDB
-	.string "MAY: You just became a TRAINER,\n"
-	.string "{PLAYER}{KUN}. I’m not going to lose!$"
-
-Route104_Text_1EDE18: @ 81EDE18
-	.string "Yikes!\n"
-	.string "You’re better than I expected!$"
-
-Route104_Text_1EDE3E: @ 81EDE3E
-	.string "MAY: I can tell you’ve gotten pretty\n"
-	.string "good with the way you handle POKéMON.\p"
-	.string "But instead of only making them\n"
-	.string "battle, you should be like MR. BRINEY.\p"
-	.string "It’s important to become friends with\n"
-	.string "POKéMON, too.$"
-
-Route104_Text_1EDF04: @ 81EDF04
-	.string "BRENDAN: Oh, hey, {PLAYER}!\p"
-	.string "Cool, you had DEVON install the MATCH\n"
-	.string "CALL system on your POKéNAV!\p"
-	.string "Let’s register each other in our\n"
-	.string "POKéNAVS so we can keep in touch.$"
-
-Route104_Text_1EDFA0: @ 81EDFA0
-	.string "{PLAYER} registered BRENDAN\n"
-	.string "in the POKéNAV.$"
-
-Route104_Text_1EDFC6: @ 81EDFC6
-	.string "BRENDAN: {PLAYER}, how’s your POKéDEX?\n"
-	.string "Have you filled in any pages yet?$"
-
-Route104_Text_1EE009: @ 81EE009
-	.string "Me, I’m doing great!\p"
-	.string "Want to check out how good I am with\n"
-	.string "a battle?$"
-
-Route104_Text_1EE04D: @ 81EE04D
-	.string "BRENDAN: What’s the matter? Don’t have\n"
-	.string "any confidence in your POKéMON?$"
-
-Route104_Text_1EE094: @ 81EE094
-	.string "BRENDAN: What’s up?\n"
-	.string "Want to have a battle with me?$"
-
-Route104_Text_1EE0C7: @ 81EE0C7
-	.string "BRENDAN: I know you just became\n"
-	.string "a TRAINER, but I won’t go easy!$"
-
-Route104_Text_1EE107: @ 81EE107
-	.string "Hmm…\n"
-	.string "You’re pretty good.$"
-
-Route104_Text_1EE120: @ 81EE120
-	.string "BRENDAN: You’ve gotten pretty decent\n"
-	.string "at handling POKéMON.\p"
-	.string "But, you know, you shouldn’t just be\n"
-	.string "making POKéMON battle.\p"
-	.string "Like MR. BRINEY, it’s important to\n"
-	.string "become friends with your POKéMON.$"
-
diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc
deleted file mode 100644
index c0c3888e1..000000000
--- a/data/scripts/maps/Route104_MrBrineysHouse.inc
+++ /dev/null
@@ -1,166 +0,0 @@
-Route104_MrBrineysHouse_MapScripts:: @ 8229D2E
-	map_script 3, Route104_MrBrineysHouse_MapScript1_229D34
-	.byte 0
-
-Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34
-	setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
-	compare VAR_0x4090, 1
-	call_if 1, Route104_MrBrineysHouse_EventScript_229D50
-	checkflag FLAG_0x0BC
-	call_if 1, Route104_MrBrineysHouse_EventScript_229D4C
-	end
-
-Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C
-	setflag FLAG_0x32E
-	return
-
-Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50
-	setobjectxyperm 1, 9, 3
-	setobjectmovementtype 1, 50
-	setobjectxyperm 2, 9, 6
-	setobjectmovementtype 2, 51
-	return
-
-Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67
-	lock
-	faceplayer
-	checkflag FLAG_0x093
-	call_if 0, Route104_MrBrineysHouse_EventScript_229D8A
-	checkflag FLAG_0x0BD
-	goto_if 0, Route104_MrBrineysHouse_EventScript_229DE1
-	checkflag FLAG_0x095
-	goto_if 0, Route104_MrBrineysHouse_EventScript_229DFA
-	goto Route104_MrBrineysHouse_EventScript_229DAE
-	end
-
-Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A
-	setflag FLAG_0x093
-	msgbox Route104_MrBrineysHouse_Text_229E70, 4
-	msgbox Route104_MrBrineysHouse_Text_229E9B, 5
-	compare VAR_RESULT, 0
-	goto_eq Route104_MrBrineysHouse_EventScript_229E13
-	goto Route104_MrBrineysHouse_EventScript_229E27
-	end
-
-Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE
-	message Route104_MrBrineysHouse_Text_22A268
-	waitmessage
-	multichoicedefault 20, 8, 14, 1, 0
-	switch VAR_RESULT
-	case 0, Route104_MrBrineysHouse_EventScript_229E27
-	case 1, Route104_MrBrineysHouse_EventScript_229E1D
-	case 127, Route104_MrBrineysHouse_EventScript_229E1D
-	end
-
-Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1
-	msgbox Route104_MrBrineysHouse_Text_22A0AD, 5
-	compare VAR_RESULT, 0
-	goto_eq Route104_MrBrineysHouse_EventScript_229E13
-	goto Route104_MrBrineysHouse_EventScript_229E27
-	end
-
-Route104_MrBrineysHouse_EventScript_229DFA:: @ 8229DFA
-	msgbox Route104_MrBrineysHouse_Text_22A18F, 5
-	compare VAR_RESULT, 0
-	goto_eq Route104_MrBrineysHouse_EventScript_229E13
-	goto Route104_MrBrineysHouse_EventScript_229E27
-	end
-
-Route104_MrBrineysHouse_EventScript_229E13:: @ 8229E13
-	msgbox Route104_MrBrineysHouse_Text_22A041, 4
-	release
-	end
-
-Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D
-	msgbox Route104_MrBrineysHouse_Text_22A2C3, 4
-	release
-	end
-
-Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27
-	msgbox Route104_MrBrineysHouse_Text_229FE9, 4
-	call Route104_MrBrineysHouse_EventScript_271E95
-	setvar VAR_0x408E, 1
-	clearflag FLAG_0x2E2
-	setflag FLAG_0x2E3
-	setflag FLAG_0x371
-	setvar VAR_0x405A, 8
-	setvar VAR_0x4063, 2
-	setflag FLAG_0x32E
-	setflag FLAG_0x2CF
-	warp ROUTE_104, 255, 13, 51
-	waitstate
-	releaseall
-	end
-
-Route104_MrBrineysHouse_EventScript_229E5D:: @ 8229E5D
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_WINGULL, 0
-	msgbox Route104_MrBrineysHouse_Text_22A337, 4
-	waitmoncry
-	release
-	end
-
-Route104_MrBrineysHouse_Text_229E70: @ 8229E70
-	.string "MR. BRINEY: Hold on, lass!\n"
-	.string "Wait up, PEEKO!$"
-
-Route104_MrBrineysHouse_Text_229E9B: @ 8229E9B
-	.string "Hm? You’re {PLAYER}{KUN}!\n"
-	.string "You saved my darling PEEKO!\l"
-	.string "We owe so much to you!\p"
-	.string "What’s that?\n"
-	.string "You want to sail with me?\p"
-	.string "Hmhm…\p"
-	.string "You have a LETTER bound for DEWFORD\n"
-	.string "and a package for SLATEPORT, then?\p"
-	.string "Quite the busy life you must lead!\p"
-	.string "But, certainly, what you’re asking is\n"
-	.string "no problem at all.\p"
-	.string "You’ve come to the right man!\n"
-	.string "We’ll set sail for DEWFORD.$"
-
-Route104_MrBrineysHouse_Text_229FE9: @ 8229FE9
-	.string "MR. BRINEY: DEWFORD it is, then!\p"
-	.string "Anchors aweigh!\n"
-	.string "PEEKO, we’re setting sail, my darling!$"
-
-Route104_MrBrineysHouse_Text_22A041: @ 822A041
-	.string "MR. BRINEY: Is that so?\n"
-	.string "Your deliveries can wait?\p"
-	.string "You just go on and tell me whenever\n"
-	.string "you want to set sail!$"
-
-Route104_MrBrineysHouse_Text_22A0AD: @ 822A0AD
-	.string "MR. BRINEY: Ahoy!\n"
-	.string "I know exactly what you want to say!\p"
-	.string "You’re to deliver a LETTER to DEWFORD\n"
-	.string "and a package to SLATEPORT.\p"
-	.string "What you need me to do is no problem\n"
-	.string "at all--I’m the man for the job!\p"
-	.string "First, we’ll set sail for DEWFORD.$"
-
-Route104_MrBrineysHouse_Text_22A18F: @ 822A18F
-	.string "MR. BRINEY: Ahoy!\n"
-	.string "I know exactly what you want to say!\p"
-	.string "You’re to deliver a package to\n"
-	.string "CAPT. STERN in SLATEPORT.\p"
-	.string "What you need me to do is no problem\n"
-	.string "at all--I’m the man for the job!\p"
-	.string "First, we’ll set sail for DEWFORD.$"
-
-Route104_MrBrineysHouse_Text_22A268: @ 822A268
-	.string "MR. BRINEY: Ahoy!\n"
-	.string "For you, I’ll go out to sea anytime!\p"
-	.string "Now, my friend, where are we bound?$"
-
-Route104_MrBrineysHouse_Text_22A2C3: @ 822A2C3
-	.string "MR. BRINEY: Is that so?\n"
-	.string "Well, PEEKO owes her life to you.\p"
-	.string "You just go on and tell me whenever\n"
-	.string "you want to set sail!$"
-
-Route104_MrBrineysHouse_Text_22A337: @ 822A337
-	.string "PEEKO: Pii piihyoro!$"
-
diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc
deleted file mode 100644
index b1ac87e30..000000000
--- a/data/scripts/maps/Route109.inc
+++ /dev/null
@@ -1,573 +0,0 @@
-Route109_MapScripts:: @ 81EE75F
-	.byte 0
-
-Route109_EventScript_1EE760:: @ 81EE760
-	call Route109_EventScript_271E95
-	setobjectpriority 2, ROUTE_109, 0
-	setobjectpriority 255, ROUTE_109, 0
-	applymovement 2, Route109_Movement_1EE90B
-	waitmovement 0
-	removeobject 2
-	switch VAR_FACING
-	case 1, Route109_EventScript_1EE7A5
-	case 3, Route109_EventScript_1EE7C5
-	case 4, Route109_EventScript_1EE7B5
-	end
-
-Route109_EventScript_1EE7A5:: @ 81EE7A5
-	applymovement 255, Route109_Movement_1EE8FD
-	waitmovement 0
-	goto Route109_EventScript_1EE7D5
-	end
-
-Route109_EventScript_1EE7B5:: @ 81EE7B5
-	applymovement 255, Route109_Movement_1EE905
-	waitmovement 0
-	goto Route109_EventScript_1EE7D5
-	end
-
-Route109_EventScript_1EE7C5:: @ 81EE7C5
-	applymovement 255, Route109_Movement_1EE908
-	waitmovement 0
-	goto Route109_EventScript_1EE7D5
-	end
-
-Route109_EventScript_1EE7D5:: @ 81EE7D5
-	hideobjectat 255, ROUTE_109
-	call Route109_EventScript_2720A0
-	applymovement 1, Route109_Movement_1EE84F
-	applymovement 255, Route109_Movement_1EE84F
-	waitmovement 0
-	delay 50
-	call Route109_EventScript_2720A8
-	showobjectat 255, DEWFORD_TOWN
-	applymovement 255, Route109_Movement_1EE900
-	waitmovement 0
-	addobject 4
-	clearflag FLAG_0x2E7
-	setobjectxyperm 2, 12, 8
-	addobject 2
-	setobjectpriority 2, DEWFORD_TOWN, 0
-	applymovement 2, Route109_Movement_1EE90D
-	waitmovement 0
-	clearflag FLAG_0x2E4
-	setflag FLAG_0x2E8
-	hideobjectat 1, ROUTE_109
-	msgbox Route109_Text_1E9C1D, 4
-	closemessage
-	copyvar VAR_0x4096, VAR_0x8008
-	resetobjectpriority 255, ROUTE_109
-	resetobjectpriority 2, DEWFORD_TOWN
-	moveobjectoffscreen 2
-	release
-	end
-
-Route109_Movement_1EE84F: @ 81EE84F
-	walk_in_place_fastest_down
-	walk_down
-	walk_down
-	walk_fast_down
-	walk_fast_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fastest_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_left
-	walk_fast_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fastest_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_left
-	walk_left
-	walk_in_place_fastest_down
-	step_end
-
-Route109_Movement_1EE8FD: @ 81EE8FD
-	walk_down
-	walk_down
-	step_end
-
-Route109_Movement_1EE900: @ 81EE900
-	walk_down
-	walk_down
-	walk_left
-	walk_in_place_fastest_right
-	step_end
-
-Route109_Movement_1EE905: @ 81EE905
-	walk_right
-	walk_down
-	step_end
-
-Route109_Movement_1EE908: @ 81EE908
-	walk_left
-	walk_down
-	step_end
-
-Route109_Movement_1EE90B: @ 81EE90B
-	walk_down
-	step_end
-
-Route109_Movement_1EE90D: @ 81EE90D
-	walk_down
-	walk_in_place_fastest_left
-	step_end
-
-Route109_EventScript_1EE910:: @ 81EE910
-	lock
-	faceplayer
-	checkflag FLAG_0x095
-	goto_if 0, Route109_EventScript_1EE921
-	goto Route109_EventScript_1EE93F
-	end
-
-Route109_EventScript_1EE921:: @ 81EE921
-	message Route109_Text_1EEC96
-	msgbox Route109_Text_1EEC96, 5
-	compare VAR_RESULT, 0
-	goto_eq Route109_EventScript_1EE981
-	goto Route109_EventScript_1EE972
-	end
-
-Route109_EventScript_1EE93F:: @ 81EE93F
-	message Route109_Text_1EEE17
-	waitmessage
-	multichoicedefault 21, 8, 14, 1, 0
-	switch VAR_RESULT
-	case 0, Route109_EventScript_1EE972
-	case 1, Route109_EventScript_1EE98B
-	case 127, Route109_EventScript_1EE98B
-	end
-
-Route109_EventScript_1EE972:: @ 81EE972
-	msgbox Route109_Text_1EED06, 4
-	closemessage
-	goto Route109_EventScript_1EE760
-	end
-
-Route109_EventScript_1EE981:: @ 81EE981
-	msgbox Route109_Text_1EED5E, 4
-	release
-	end
-
-Route109_EventScript_1EE98B:: @ 81EE98B
-	msgbox Route109_Text_1EEE72, 4
-	release
-	end
-
-Route109_EventScript_1EE995:: @ 81EE995
-	msgbox Route109_Text_1EEEB4, 2
-	end
-
-Route109_EventScript_1EE99E:: @ 81EE99E
-	lock
-	faceplayer
-	msgbox Route109_Text_1EEFB0, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, Route109_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-Route109_EventScript_1EE9B5:: @ 81EE9B5
-	lock
-	faceplayer
-	special GetPlayerBigGuyGirlString
-	checkflag FLAG_0x118
-	goto_eq Route109_EventScript_1EE9F2
-	msgbox Route109_Text_1EEFDE, 4
-	giveitem_std ITEM_SOFT_SAND
-	compare VAR_RESULT, 0
-	goto_eq Route109_EventScript_272054
-	closemessage
-	applymovement VAR_LAST_TALKED, Route109_Movement_2725A2
-	waitmovement 0
-	setflag FLAG_0x118
-	release
-	end
-
-Route109_EventScript_1EE9F2:: @ 81EE9F2
-	msgbox Route109_Text_1EEFF1, 4
-	applymovement VAR_LAST_TALKED, Route109_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-Route109_EventScript_1EEA06:: @ 81EEA06
-	msgbox Route109_Text_1EEF08, 2
-	end
-
-Route109_EventScript_1EEA0F:: @ 81EEA0F
-	msgbox Route109_Text_1EF080, 2
-	end
-
-Route109_EventScript_1EEA18:: @ 81EEA18
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox Route109_Text_1EF173, 4
-	waitmoncry
-	release
-	end
-
-Route109_EventScript_1EEA2B:: @ 81EEA2B
-	msgbox Route109_Text_1EF185, 3
-	end
-
-Route109_EventScript_1EEA34:: @ 81EEA34
-	msgbox Route109_Text_1EF1D5, 3
-	end
-
-Route109_EventScript_1EEA3D:: @ 81EEA3D
-	trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_297140, Route109_Text_29717D
-	msgbox Route109_Text_297191, 6
-	end
-
-Route109_EventScript_1EEA54:: @ 81EEA54
-	trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_2971D1, Route109_Text_2971FD
-	msgbox Route109_Text_29720F, 6
-	end
-
-Route109_EventScript_1EEA6B:: @ 81EEA6B
-	trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_297235, Route109_Text_29727B
-	msgbox Route109_Text_29728C, 6
-	end
-
-Route109_EventScript_1EEA82:: @ 81EEA82
-	trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_2972B3, Route109_Text_2972CE
-	msgbox Route109_Text_2972ED, 6
-	end
-
-Route109_EventScript_1EEA99:: @ 81EEA99
-	trainerbattle 2, TRAINER_RICKY_1, 0, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route109_EventScript_1EEAE4
-	msgbox Route109_Text_297380, 4
-	release
-	end
-
-Route109_EventScript_1EEAC5:: @ 81EEAC5
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route109_Text_2973C1, 4
-	setvar VAR_0x8004, 64
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 64
-	callstd 8
-	release
-	end
-
-Route109_EventScript_1EEAE4:: @ 81EEAE4
-	trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_2973FF, Route109_Text_297437
-	msgbox Route109_Text_297458, 6
-	end
-
-Route109_EventScript_1EEAFB:: @ 81EEAFB
-	trainerbattle 2, TRAINER_LOLA_1, 0, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route109_EventScript_1EEB46
-	msgbox Route109_Text_2974D6, 4
-	release
-	end
-
-Route109_EventScript_1EEB27:: @ 81EEB27
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route109_Text_297520, 4
-	setvar VAR_0x8004, 57
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 57
-	callstd 8
-	release
-	end
-
-Route109_EventScript_1EEB46:: @ 81EEB46
-	trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_297538, Route109_Text_297576
-	msgbox Route109_Text_29757D, 6
-	end
-
-Route109_EventScript_1EEB5D:: @ 81EEB5D
-	trainerbattle 0, TRAINER_AUSTINA, 0, Route109_Text_2975C0, Route109_Text_297601
-	msgbox Route109_Text_29762A, 6
-	end
-
-Route109_EventScript_1EEB74:: @ 81EEB74
-	trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_297667, Route109_Text_297691
-	msgbox Route109_Text_2976A4, 6
-	end
-
-Route109_EventScript_1EEB8B:: @ 81EEB8B
-	trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_2976C5, Route109_Text_2976FC
-	msgbox Route109_Text_297715, 6
-	end
-
-Route109_EventScript_1EEBA2:: @ 81EEBA2
-	trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D
-	msgbox Route109_Text_2977C7, 6
-	end
-
-Route109_EventScript_1EEBBD:: @ 81EEBBD
-	trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E
-	msgbox Route109_Text_2978F1, 6
-	end
-
-Route109_EventScript_1EEBD8:: @ 81EEBD8
-	trainerbattle 0, TRAINER_CHANDLER, 0, Route109_Text_29798A, Route109_Text_2979AE
-	msgbox Route109_Text_2979BF, 6
-	end
-
-Route109_EventScript_1EEBEF:: @ 81EEBEF
-	trainerbattle 0, TRAINER_HAILEY, 0, Route109_Text_2979EC, Route109_Text_297A15
-	msgbox Route109_Text_297A40, 6
-	end
-
-Route109_EventScript_1EEC06:: @ 81EEC06
-	trainerbattle 0, TRAINER_ELIJAH, 0, Route109_Text_297A82, Route109_Text_297AC7
-	msgbox Route109_Text_297AE5, 6
-	end
-
-DewfordTown_Text_1EEC1D: @ 81EEC1D
-	.string "MR. BRINEY: Ahoy!\n"
-	.string "We’ve made land in SLATEPORT!\p"
-	.string "I suppose you’re going to visit CAPT.\n"
-	.string "STERN and deliver the DEVON GOODS?$"
-
-Route109_Text_1EEC96: @ 81EEC96
-	.string "MR. BRINEY: I thought you’re supposed\n"
-	.string "to deliver the DEVON GOODS.\p"
-	.string "Would you like to sail back to\n"
-	.string "DEWFORD, then?$"
-
-Route109_Text_1EED06: @ 81EED06
-	.string "MR. BRINEY: DEWFORD it is, then!\p"
-	.string "Anchors aweigh!\n"
-	.string "PEEKO, we’re setting sail, my darling!$"
-
-Route109_Text_1EED5E: @ 81EED5E
-	.string "MR. BRINEY: Then you go on and deliver\n"
-	.string "the DEVON GOODS. I’ll be waiting.$"
-
-DewfordTown_Text_1EEDA7: @ 81EEDA7
-	.string "MR. BRINEY: Ahoy! We’ve made land in\n"
-	.string "SLATEPORT!\p"
-	.string "You just go on and tell me whenever\n"
-	.string "you want to set sail again!$"
-
-Route109_Text_1EEE17: @ 81EEE17
-	.string "MR. BRINEY: Ahoy!\n"
-	.string "For you, I’ll go out to sea anytime!\p"
-	.string "Now, my friend, where are we bound?$"
-
-Route109_Text_1EEE72: @ 81EEE72
-	.string "MR. BRINEY: You just tell me whenever\n"
-	.string "you need to set sail again!$"
-
-Route109_Text_1EEEB4: @ 81EEEB4
-	.string "Yo, TRAINERS!\n"
-	.string "Whether you’re hot to trot,\l"
-	.string "or cool cat not,\l"
-	.string "chill at my papa’s spot!$"
-
-Route109_Text_1EEF08: @ 81EEF08
-	.string "Little kids can dart around so quickly…\p"
-	.string "You don’t dare take your eyes off them\n"
-	.string "for an instant. It’s very taxing.\p"
-	.string "Mine are with my POKéMON, so they\n"
-	.string "should be okay, but…$"
-
-Route109_Text_1EEFB0: @ 81EEFB0
-	.string "Our sand castle’s taking a long time\n"
-	.string "to make.$"
-
-Route109_Text_1EEFDE: @ 81EEFDE
-	.string "You can have this!$"
-
-Route109_Text_1EEFF1: @ 81EEFF1
-	.string "We’re going to get all the sand from\n"
-	.string "the beach and make a big castle!\p"
-	.string "And then we’re going to be a king and\n"
-	.string "queen.\p"
-	.string "We’ll let you be a servant.$"
-
-Route109_Text_1EF080: @ 81EF080
-	.string "The water around these parts is clean.\p"
-	.string "But, I get my ZIGZAGOON to pick up\n"
-	.string "litter from the shoreline at times.\p"
-	.string "Dirty water becomes rain and joins our\n"
-	.string "rivers, which we drink from…\p"
-	.string "If we pollute the sea, it all comes\n"
-	.string "back to haunt us eventually.$"
-
-Route109_Text_1EF173: @ 81EF173
-	.string "ZIGZAGOON: Guguu?$"
-
-Route109_Text_1EF185: @ 81EF185
-	.string "SEASHORE HOUSE\p"
-	.string "“May hot battles rage on hot sands!\n"
-	.string "The place for hot TRAINERS!”$"
-
-Route109_Text_1EF1D5: @ 81EF1D5
-	.string "TRAINER TIPS\p"
-	.string "POKéMON at the same level may not\n"
-	.string "always have identical stats.\p"
-	.string "POKéMON raised by TRAINERS are said\n"
-	.string "to grow stronger than wild POKéMON.$"
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc
deleted file mode 100644
index 9579df56c..000000000
--- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-Route110_SeasideCyclingRoadEntrance1_MapScripts:: @ 826EA77
-	.byte 0
-
-Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78:: @ 826EA78
-	lock
-	faceplayer
-	msgbox Route110_SeasideCyclingRoadEntrance1_Text_26EAC1, 4
-	release
-	end
-
-Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84:: @ 826EA84
-	lockall
-	specialvar VAR_RESULT, GetPlayerAvatarBike
-	compare VAR_RESULT, 0
-	goto_eq Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F
-	setflag FLAG_SYS_CYCLING_ROAD
-	setvar VAR_TEMP_1, 1
-	releaseall
-	end
-
-Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F:: @ 826EA9F
-	msgbox Route110_SeasideCyclingRoadEntrance1_Text_26EB48, 4
-	closemessage
-	applymovement 255, Route110_SeasideCyclingRoadEntrance1_Movement_26EAB4
-	waitmovement 0
-	releaseall
-	end
-
-Route110_SeasideCyclingRoadEntrance1_Movement_26EAB4: @ 826EAB4
-	walk_left
-	step_end
-
-Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6:: @ 826EAB6
-	lockall
-	clearflag FLAG_SYS_CYCLING_ROAD
-	setvar VAR_TEMP_1, 0
-	releaseall
-	end
-
-Route110_SeasideCyclingRoadEntrance1_Text_26EAC1: @ 826EAC1
-	.string "On CYCLING ROAD, you can go all out\n"
-	.string "and cycle as fast as you’d like.\p"
-	.string "It feels great to go that fast, but try\n"
-	.string "not to crash into anyone!$"
-
-Route110_SeasideCyclingRoadEntrance1_Text_26EB48: @ 826EB48
-	.string "Sorry, you can’t walk on CYCLING\n"
-	.string "ROAD. It’s too dangerous.\p"
-	.string "Please come back with a BIKE.$"
-
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc
deleted file mode 100644
index 499969d6e..000000000
--- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc
+++ /dev/null
@@ -1,69 +0,0 @@
-Route110_SeasideCyclingRoadEntrance2_MapScripts:: @ 826EBA1
-	map_script 3, Route110_SeasideCyclingRoadEntrance2_MapScript1_26EBA7
-	.byte 0
-
-Route110_SeasideCyclingRoadEntrance2_MapScript1_26EBA7: @ 826EBA7
-	compare VAR_0x40A9, 3
-	call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE
-	compare VAR_0x40A9, 2
-	call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE
-	end
-
-Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE:: @ 826EBBE
-	setvar VAR_0x40A9, 1
-	return
-
-Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4:: @ 826EBC4
-	lock
-	faceplayer
-	msgbox Route110_SeasideCyclingRoadEntrance2_Text_26EC23, 4
-	release
-	end
-
-Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0:: @ 826EBD0
-	lockall
-	specialvar VAR_RESULT, GetPlayerAvatarBike
-	compare VAR_RESULT, 2
-	call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6
-	compare VAR_RESULT, 0
-	goto_eq Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC
-	setflag FLAG_SYS_CYCLING_ROAD
-	setvar VAR_TEMP_1, 1
-	releaseall
-	end
-
-Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6:: @ 826EBF6
-	setvar VAR_0x40A9, 1
-	return
-
-Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC:: @ 826EBFC
-	msgbox Route110_SeasideCyclingRoadEntrance2_Text_26ECAA, 4
-	closemessage
-	applymovement 255, Route110_SeasideCyclingRoadEntrance2_Movement_26EC11
-	waitmovement 0
-	releaseall
-	end
-
-Route110_SeasideCyclingRoadEntrance2_Movement_26EC11: @ 826EC11
-	walk_left
-	step_end
-
-Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13:: @ 826EC13
-	lockall
-	setvar VAR_0x40A9, 0
-	clearflag FLAG_SYS_CYCLING_ROAD
-	setvar VAR_TEMP_1, 0
-	releaseall
-	end
-
-Route110_SeasideCyclingRoadEntrance2_Text_26EC23: @ 826EC23
-	.string "On CYCLING ROAD, you can go all out\n"
-	.string "and cycle as fast as you’d like.\p"
-	.string "It feels great to go that fast, but try\n"
-	.string "not to crash into anyone!$"
-
-Route110_SeasideCyclingRoadEntrance2_Text_26ECAA: @ 826ECAA
-	.string "Sorry, you can’t walk on CYCLING\n"
-	.string "ROAD. It’s too dangerous.\p"
-	.string "Please come back with a BIKE.$"
-
diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc
deleted file mode 100644
index a2997a49b..000000000
--- a/data/scripts/maps/Route110_TrickHouseEnd.inc
+++ /dev/null
@@ -1,369 +0,0 @@
-Route110_TrickHouseEnd_MapScripts:: @ 826ACAF
-	map_script 5, Route110_TrickHouseEnd_MapScript1_26ACC4
-	map_script 3, Route110_TrickHouseEnd_MapScript1_26ACD0
-	map_script 2, Route110_TrickHouseEnd_MapScript2_26ACF5
-	map_script 4, Route110_TrickHouseEnd_MapScript2_26ACDE
-	.byte 0
-
-Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4
-	compare VAR_TEMP_1, 1
-	call_if 1, Route110_TrickHouseEnd_EventScript_26AD0D
-	end
-
-Route110_TrickHouseEnd_MapScript1_26ACD0: @ 826ACD0
-	setvar VAR_TEMP_1, 0
-	setvar VAR_TEMP_2, 0
-	special SetTrickHouseEndRoomFlag
-	end
-
-Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE
-	map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26ACE8
-	.2byte 0
-
-Route110_TrickHouseEnd_EventScript_26ACE8:: @ 826ACE8
-	addobject 1
-	showobjectat 1, ROUTE_110_TRICK_HOUSE_END
-	turnobject 1, 4
-	end
-
-Route110_TrickHouseEnd_MapScript2_26ACF5: @ 826ACF5
-	map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_26ACFF
-	.2byte 0
-
-Route110_TrickHouseEnd_EventScript_26ACFF:: @ 826ACFF
-	setvar VAR_TEMP_1, 1
-	call Route110_TrickHouseEnd_EventScript_26AD0D
-	special DrawWholeMapView
-	end
-
-Route110_TrickHouseEnd_EventScript_26AD0D:: @ 826AD0D
-	setmetatile 10, 1, 539, 1
-	return
-
-Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17
-	lock
-	faceplayer
-	msgbox Route110_TrickHouseEnd_Text_26B08D, 4
-	setvar VAR_TEMP_2, 1
-	switch VAR_0x4044
-	case 0, Route110_TrickHouseEnd_EventScript_26AD84
-	case 1, Route110_TrickHouseEnd_EventScript_26ADC0
-	case 2, Route110_TrickHouseEnd_EventScript_26ADFC
-	case 3, Route110_TrickHouseEnd_EventScript_26AE38
-	case 4, Route110_TrickHouseEnd_EventScript_26AE74
-	case 5, Route110_TrickHouseEnd_EventScript_26AEB0
-	case 6, Route110_TrickHouseEnd_EventScript_26AEEC
-	case 7, Route110_TrickHouseEnd_EventScript_26AF28
-	end
-
-Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84
-	msgbox Route110_TrickHouseEnd_Text_26B0BC, 4
-	msgbox Route110_TrickHouseEnd_Text_26B73D, 4
-	setvar VAR_0x40C1, 0
-	giveitem_std ITEM_RARE_CANDY
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
-	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0
-	msgbox Route110_TrickHouseEnd_Text_26B13B, 4
-	msgbox Route110_TrickHouseEnd_Text_26B73D, 4
-	setvar VAR_0x40C1, 0
-	giveitem_std ITEM_TIMER_BALL
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
-	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC
-	msgbox Route110_TrickHouseEnd_Text_26B1AD, 4
-	msgbox Route110_TrickHouseEnd_Text_26B73D, 4
-	setvar VAR_0x40C1, 0
-	giveitem_std ITEM_HARD_STONE
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
-	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38
-	msgbox Route110_TrickHouseEnd_Text_26B223, 4
-	msgbox Route110_TrickHouseEnd_Text_26B73D, 4
-	setvar VAR_0x40C1, 0
-	giveitem_std ITEM_SMOKE_BALL
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
-	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74
-	msgbox Route110_TrickHouseEnd_Text_26B293, 4
-	msgbox Route110_TrickHouseEnd_Text_26B73D, 4
-	setvar VAR_0x40C1, 0
-	giveitem_std ITEM_TM12
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
-	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0
-	msgbox Route110_TrickHouseEnd_Text_26B315, 4
-	msgbox Route110_TrickHouseEnd_Text_26B73D, 4
-	setvar VAR_0x40C1, 0
-	giveitem_std ITEM_MAGNET
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
-	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC
-	msgbox Route110_TrickHouseEnd_Text_26B365, 4
-	msgbox Route110_TrickHouseEnd_Text_26B73D, 4
-	setvar VAR_0x40C1, 0
-	giveitem_std ITEM_PP_MAX
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
-	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28
-	msgbox Route110_TrickHouseEnd_Text_26B3AB, 4
-	closemessage
-	compare VAR_FACING, 1
-	call_if 1, Route110_TrickHouseEnd_EventScript_26B015
-	compare VAR_FACING, 2
-	call_if 1, Route110_TrickHouseEnd_EventScript_26B020
-	compare VAR_FACING, 3
-	call_if 1, Route110_TrickHouseEnd_EventScript_26B02B
-	compare VAR_FACING, 4
-	call_if 1, Route110_TrickHouseEnd_EventScript_26B036
-	delay 30
-	msgbox Route110_TrickHouseEnd_Text_26B3FA, 4
-	closemessage
-	applymovement 1, Route110_TrickHouseEnd_Movement_27259E
-	waitmovement 0
-	delay 30
-	msgbox Route110_TrickHouseEnd_Text_26B485, 4
-	setvar VAR_0x40C1, 0
-	call Route110_TrickHouseEnd_EventScript_26AFA5
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEnd_EventScript_26B002
-	msgbox Route110_TrickHouseEnd_Text_26B69A, 4
-	call Route110_TrickHouseEnd_EventScript_26AFCF
-	special ResetTrickHouseEndRoomFlag
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_26AFA5:: @ 826AFA5
-	multichoice 0, 0, 88, 1
-	switch VAR_RESULT
-	case 0, Route110_TrickHouseEnd_EventScript_26AFBF
-	goto Route110_TrickHouseEnd_EventScript_26AFC7
-
-Route110_TrickHouseEnd_EventScript_26AFBF:: @ 826AFBF
-	givedecoration_std 31
-	return
-
-Route110_TrickHouseEnd_EventScript_26AFC7:: @ 826AFC7
-	givedecoration_std 32
-	return
-
-Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF
-	applymovement 1, Route110_TrickHouseEnd_Movement_269E36
-	waitmovement 0
-	playse SE_W153
-	applymovement 1, Route110_TrickHouseEnd_Movement_269E3F
-	waitmovement 0
-	removeobject 1
-	addvar VAR_0x4044, 1
-	return
-
-Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF
-	call Route110_TrickHouseEnd_EventScript_27205E
-	msgbox Route110_TrickHouseEnd_Text_26B760, 4
-	setvar VAR_0x40C1, 1
-	return
-
-Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002
-	call Route110_TrickHouseEnd_EventScript_272071
-	msgbox Route110_TrickHouseEnd_Text_26B615, 4
-	setvar VAR_0x40C1, 1
-	return
-
-Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015
-	applymovement 1, Route110_TrickHouseEnd_Movement_2725AA
-	waitmovement 0
-	return
-
-Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020
-	applymovement 1, Route110_TrickHouseEnd_Movement_2725A6
-	waitmovement 0
-	return
-
-Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B
-	applymovement 1, Route110_TrickHouseEnd_Movement_2725A4
-	waitmovement 0
-	return
-
-Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036
-	applymovement 1, Route110_TrickHouseEnd_Movement_2725A8
-	waitmovement 0
-	return
-
-Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041
-	lockall
-	turnobject 1, 3
-	playse SE_PIN
-	applymovement 1, Route110_TrickHouseEnd_Movement_272598
-	waitmovement 0
-	delay 20
-	applymovement 1, Route110_TrickHouseEnd_Movement_26B08B
-	waitmovement 0
-	playse SE_W153
-	applymovement 255, Route110_TrickHouseEnd_Movement_2725AA
-	waitmovement 0
-	msgbox Route110_TrickHouseEnd_Text_26B8BD, 4
-	closemessage
-	applymovement 255, Route110_TrickHouseEnd_Movement_26B089
-	waitmovement 0
-	delay 4
-	turnobject 1, 4
-	releaseall
-	end
-
-Route110_TrickHouseEnd_Movement_26B089: @ 826B089
-	walk_down
-	step_end
-
-Route110_TrickHouseEnd_Movement_26B08B: @ 826B08B
-	jump_in_place_left
-	step_end
-
-Route110_TrickHouseEnd_Text_26B08D: @ 826B08D
-	.string "Aak!\n"
-	.string "You’ve made it to me?\l"
-	.string "Hmmm… You’re sharp!$"
-
-Route110_TrickHouseEnd_Text_26B0BC: @ 826B0BC
-	.string "It took me all night to plant all those\n"
-	.string "trees…\p"
-	.string "You’re almost my equal in greatness by\n"
-	.string "one, two, three, four, five, six places!$"
-
-Route110_TrickHouseEnd_Text_26B13B: @ 826B13B
-	.string "It took me all night to make the maze…\p"
-	.string "You’re almost my equal in greatness by\n"
-	.string "one, two, three, four, five places!$"
-
-Route110_TrickHouseEnd_Text_26B1AD: @ 826B1AD
-	.string "It took me all night to prepare\n"
-	.string "the wall panels…\p"
-	.string "You’re almost my equal in greatness by\n"
-	.string "one, two, three, four places!$"
-
-Route110_TrickHouseEnd_Text_26B223: @ 826B223
-	.string "It took me all night to shove in those\n"
-	.string "boulders…\p"
-	.string "You’re almost my equal in greatness by\n"
-	.string "one, two, three places!$"
-
-Route110_TrickHouseEnd_Text_26B293: @ 826B293
-	.string "It took me all night to make MECHADOLLS\n"
-	.string "and another to think up the quiz…\p"
-	.string "You’re almost my equal in greatness by\n"
-	.string "one, two places!$"
-
-Route110_TrickHouseEnd_Text_26B315: @ 826B315
-	.string "It took me all night to install\n"
-	.string "the doors…\p"
-	.string "You’re almost my equal in greatness!$"
-
-Route110_TrickHouseEnd_Text_26B365: @ 826B365
-	.string "It took me all night setting up arrows…\p"
-	.string "You’re my equal in greatness!$"
-
-Route110_TrickHouseEnd_Text_26B3AB: @ 826B3AB
-	.string "It took me all night polishing floors…\p"
-	.string "You’re above me in greatness!\n"
-	.string "Possibly…$"
-
-Route110_TrickHouseEnd_Text_26B3FA: @ 826B3FA
-	.string "Wh-what should I do?\n"
-	.string "My fountain of ideas for tricks has\l"
-	.string "run dry…\p"
-	.string "Perhaps it is time I toured the country\n"
-	.string "on a quest to devise new tricks…$"
-
-Route110_TrickHouseEnd_Text_26B485: @ 826B485
-	.string "I hate to admit defeat, but you have\n"
-	.string "bested me!\p"
-	.string "Still, you must have been reeled in by\n"
-	.string "my charisma for you to visit me again\l"
-	.string "and again. Yes, you must have!\p"
-	.string "But that has nothing to do with my\n"
-	.string "losing!\p"
-	.string "In recognition of the friendship\n"
-	.string "between you, the driven, and the genius\l"
-	.string "that is myself, I demand that you take\l"
-	.string "this keepsake!\p"
-	.string "Actually there are two--\n"
-	.string "a RED TENT and a BLUE TENT.\l"
-	.string "Which do you prefer?$"
-
-Route110_TrickHouseEnd_Text_26B615: @ 826B615
-	.string "What? No room in your PC?\n"
-	.string "What am I to make of that?\p"
-	.string "I wish I could say that, but I am much\n"
-	.string "too kind and caring, so come back later!$"
-
-Route110_TrickHouseEnd_Text_26B69A: @ 826B69A
-	.string "… … … … … …\p"
-	.string "I am leaving on a journey of discovery.\n"
-	.string "A quest in search of new tricks.\p"
-	.string "I wish that you will one day visit and\n"
-	.string "entertain me again.\p"
-	.string "And now, farewell!$"
-
-Route110_TrickHouseEnd_Text_26B73D: @ 826B73D
-	.string "Fine!\n"
-	.string "You have earned this reward!$"
-
-Route110_TrickHouseEnd_Text_26B760: @ 826B760
-	.string "What? Have you no room for this?\n"
-	.string "What manner of items do you carry?\p"
-	.string "But fine, since you’ve reached me,\n"
-	.string "your reward will be with me till later.$"
-
-Route110_TrickHouseEnd_Text_26B7EF: @ 826B7EF
-	.string "Scrub that smug smirk from your face!\n"
-	.string "It’s much too early to think you’ve won!\p"
-	.string "I’ll make new tricks to stump you, I will.\n"
-	.string "You may mock me only when you’re done.\p"
-	.string "Come back for the next exciting\n"
-	.string "installment!$"
-
-Route110_TrickHouseEnd_Text_26B8BD: @ 826B8BD
-	.string "Now, now! You’re ignoring me now?\n"
-	.string "Now that, I consider heartbreaking!$"
-
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc
deleted file mode 100644
index 5e03fa165..000000000
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ /dev/null
@@ -1,901 +0,0 @@
-Route110_TrickHouseEntrance_MapScripts:: @ 8269A50
-	map_script 3, Route110_TrickHouseEntrance_MapScript1_269A60
-	map_script 2, Route110_TrickHouseEntrance_MapScript2_269CEE
-	map_script 4, Route110_TrickHouseEntrance_MapScript2_269BD3
-	.byte 0
-
-Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60
-	setflag FLAG_LANDMARK_TRICK_HOUSE
-	compare VAR_0x40B5, 1
-	goto_eq Route110_TrickHouseEntrance_EventScript_269AF3
-	compare VAR_0x40C1, 1
-	goto_eq Route110_TrickHouseEntrance_EventScript_269AD7
-	compare VAR_0x40A6, 1
-	goto_eq Route110_TrickHouseEntrance_EventScript_269BB3
-	compare VAR_0x40A7, 5
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269B03
-	compare VAR_0x40A7, 3
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269B03
-	compare VAR_0x40A7, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269B03
-	switch VAR_0x40A7
-	case 0, Route110_TrickHouseEntrance_EventScript_269BBB
-	case 1, Route110_TrickHouseEntrance_EventScript_269BC1
-	case 3, Route110_TrickHouseEntrance_EventScript_269BC7
-	case 4, Route110_TrickHouseEntrance_EventScript_269BCD
-	end
-
-Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7
-	setvar VAR_0x40A5, 1
-	compare VAR_0x4044, 8
-	goto_eq Route110_TrickHouseEntrance_EventScript_269AED
-	setvar VAR_0x40A7, 2
-	end
-
-Route110_TrickHouseEntrance_EventScript_269AED:: @ 8269AED
-	setvar VAR_0x40A7, 6
-	end
-
-Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3
-	setvar VAR_0x40B5, 0
-	setvar VAR_0x40A7, 5
-	setvar VAR_0x40A5, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03
-	setvar VAR_0x40A7, 0
-	compare VAR_0x4044, 1
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269B61
-	compare VAR_0x4044, 2
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269B6B
-	compare VAR_0x4044, 3
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269B75
-	compare VAR_0x4044, 4
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269B7F
-	compare VAR_0x4044, 5
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269B89
-	compare VAR_0x4044, 6
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269B93
-	compare VAR_0x4044, 7
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269B9D
-	compare VAR_0x4044, 8
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269BA7
-	return
-
-Route110_TrickHouseEntrance_EventScript_269B61:: @ 8269B61
-	checkflag FLAG_BADGE03_GET
-	call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD
-	return
-
-Route110_TrickHouseEntrance_EventScript_269B6B:: @ 8269B6B
-	checkflag FLAG_BADGE04_GET
-	call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD
-	return
-
-Route110_TrickHouseEntrance_EventScript_269B75:: @ 8269B75
-	checkflag FLAG_BADGE05_GET
-	call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD
-	return
-
-Route110_TrickHouseEntrance_EventScript_269B7F:: @ 8269B7F
-	checkflag FLAG_BADGE06_GET
-	call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD
-	return
-
-Route110_TrickHouseEntrance_EventScript_269B89:: @ 8269B89
-	checkflag FLAG_BADGE07_GET
-	call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD
-	return
-
-Route110_TrickHouseEntrance_EventScript_269B93:: @ 8269B93
-	checkflag FLAG_BADGE08_GET
-	call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD
-	return
-
-Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D
-	checkflag FLAG_SYS_GAME_CLEAR
-	call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD
-	return
-
-Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7
-	setvar VAR_0x40A7, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_269BAD:: @ 8269BAD
-	setvar VAR_0x40A7, 3
-	return
-
-Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3
-	setobjectxyperm 1, 5, 2
-	end
-
-Route110_TrickHouseEntrance_EventScript_269BBB:: @ 8269BBB
-	setvar VAR_0x40A5, 0
-	end
-
-Route110_TrickHouseEntrance_EventScript_269BC1:: @ 8269BC1
-	setvar VAR_0x40A5, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_269BC7:: @ 8269BC7
-	setvar VAR_0x40A5, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_269BCD:: @ 8269BCD
-	setvar VAR_0x40A5, 1
-	end
-
-Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3
-	map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269C15
-	map_script_2 VAR_0x40A7, 0, Route110_TrickHouseEntrance_EventScript_269C26
-	map_script_2 VAR_0x40A7, 1, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_0x40A7, 2, Route110_TrickHouseEntrance_EventScript_269CD0
-	map_script_2 VAR_0x40A7, 3, Route110_TrickHouseEntrance_EventScript_269CD0
-	map_script_2 VAR_0x40A7, 4, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_0x40A7, 5, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_0x40A7, 6, Route110_TrickHouseEntrance_EventScript_269CDF
-	.2byte 0
-
-Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15
-	addobject 1
-	showobjectat 1, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	turnobject 1, 4
-	turnobject 255, 3
-	end
-
-Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26
-	addobject 1
-	hideobjectat 1, ROUTE_110_TRICK_HOUSE_ENTRANCE
-	switch VAR_0x4044
-	case 0, Route110_TrickHouseEntrance_EventScript_269C8C
-	case 1, Route110_TrickHouseEntrance_EventScript_269C94
-	case 2, Route110_TrickHouseEntrance_EventScript_269C9C
-	case 3, Route110_TrickHouseEntrance_EventScript_269CA4
-	case 4, Route110_TrickHouseEntrance_EventScript_269CAC
-	case 5, Route110_TrickHouseEntrance_EventScript_269CB4
-	case 6, Route110_TrickHouseEntrance_EventScript_269CBC
-	case 7, Route110_TrickHouseEntrance_EventScript_269CC4
-	end
-
-Route110_TrickHouseEntrance_EventScript_269C8C:: @ 8269C8C
-	setobjectxy 1, 6, 3
-	end
-
-Route110_TrickHouseEntrance_EventScript_269C94:: @ 8269C94
-	setobjectxy 1, 11, 5
-	end
-
-Route110_TrickHouseEntrance_EventScript_269C9C:: @ 8269C9C
-	setobjectxy 1, 9, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_269CA4:: @ 8269CA4
-	setobjectxy 1, 3, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_269CAC:: @ 8269CAC
-	setobjectxy 1, 0, 5
-	end
-
-Route110_TrickHouseEntrance_EventScript_269CB4:: @ 8269CB4
-	setobjectxy 1, 11, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_269CBC:: @ 8269CBC
-	setobjectxy 1, 8, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_269CC4:: @ 8269CC4
-	setobjectxy 1, 4, 4
-	end
-
-Route110_TrickHouseEntrance_EventScript_269CCC:: @ 8269CCC
-	removeobject 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_269CD0:: @ 8269CD0
-	addobject 1
-	setobjectxy 1, 5, 2
-	turnobject 1, 2
-	end
-
-Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF
-	addobject 1
-	setobjectxy 1, 5, 2
-	turnobject 1, 1
-	end
-
-Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE
-	map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269CF8
-	.2byte 0
-
-Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8
-	lockall
-	delay 20
-	compare VAR_0x4044, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269E48
-	msgbox Route110_TrickHouseEntrance_Text_26A78C, 4
-	closemessage
-	delay 20
-	applymovement 1, Route110_TrickHouseEntrance_Movement_269E36
-	waitmovement 0
-	playse SE_W153
-	applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
-	waitmovement 0
-	removeobject 1
-	setvar VAR_0x40A7, 1
-	setvar VAR_0x40A6, 0
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_269D39:: @ 8269D39
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B
-	lockall
-	switch VAR_0x40A7
-	case 0, Route110_TrickHouseEntrance_EventScript_269D6E
-	case 2, Route110_TrickHouseEntrance_EventScript_269E8F
-	case 3, Route110_TrickHouseEntrance_EventScript_269E51
-	case 6, Route110_TrickHouseEntrance_EventScript_26A039
-	end
-
-Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E
-	playse SE_PIN
-	applymovement 255, Route110_TrickHouseEntrance_Movement_272598
-	waitmovement 0
-	applymovement 255, Route110_TrickHouseEntrance_Movement_27259A
-	waitmovement 0
-	compare VAR_0x4044, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269DEE
-	compare VAR_0x4044, 1
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269DF7
-	compare VAR_0x4044, 2
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269E00
-	compare VAR_0x4044, 3
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269E09
-	compare VAR_0x4044, 4
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269E12
-	compare VAR_0x4044, 5
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269E1B
-	compare VAR_0x4044, 6
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269E24
-	compare VAR_0x4044, 7
-	call_if 1, Route110_TrickHouseEntrance_EventScript_269E2D
-	closemessage
-	setvar VAR_0x40A6, 1
-	warpsilent ROUTE_110_TRICK_HOUSE_ENTRANCE, 255, 6, 2
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_269DEE:: @ 8269DEE
-	msgbox Route110_TrickHouseEntrance_Text_26A48A, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_269DF7:: @ 8269DF7
-	msgbox Route110_TrickHouseEntrance_Text_26A4DA, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_269E00:: @ 8269E00
-	msgbox Route110_TrickHouseEntrance_Text_26A529, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_269E09:: @ 8269E09
-	msgbox Route110_TrickHouseEntrance_Text_26A577, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_269E12:: @ 8269E12
-	msgbox Route110_TrickHouseEntrance_Text_26A5C8, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_269E1B:: @ 8269E1B
-	msgbox Route110_TrickHouseEntrance_Text_26A616, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_269E24:: @ 8269E24
-	msgbox Route110_TrickHouseEntrance_Text_26A665, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D
-	msgbox Route110_TrickHouseEntrance_Text_26A6B6, 4
-	return
-
-Route110_TrickHouseEnd_Movement_269E36: @ 8269E36
-Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36
-	face_up
-	delay_4
-	face_left
-	delay_4
-	face_down
-	delay_4
-	face_right
-	delay_4
-	step_end
-
-Route110_TrickHouseEnd_Movement_269E3F: @ 8269E3F
-Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F
-	face_up
-	disable_anim
-	slide_up
-	slide_up
-	slide_up
-	slide_up
-	slide_up
-	slide_up
-	step_end
-
-Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48
-	msgbox Route110_TrickHouseEntrance_Text_26A709, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51
-	msgbox Route110_TrickHouseEntrance_Text_26A921, 4
-	closemessage
-	applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
-	waitmovement 0
-	playse SE_PIN
-	applymovement 1, Route110_TrickHouseEntrance_Movement_272598
-	waitmovement 0
-	applymovement 1, Route110_TrickHouseEntrance_Movement_27259A
-	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_26A9AF, 4
-	applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6
-	waitmovement 0
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F
-	applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
-	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_26AA82, 4
-	compare VAR_0x4044, 1
-	goto_eq Route110_TrickHouseEntrance_EventScript_269EEF
-	compare VAR_0x4044, 2
-	goto_eq Route110_TrickHouseEntrance_EventScript_269F1B
-	compare VAR_0x4044, 3
-	goto_eq Route110_TrickHouseEntrance_EventScript_269F47
-	compare VAR_0x4044, 4
-	goto_eq Route110_TrickHouseEntrance_EventScript_269F73
-	compare VAR_0x4044, 5
-	goto_eq Route110_TrickHouseEntrance_EventScript_269F9F
-	compare VAR_0x4044, 6
-	goto_eq Route110_TrickHouseEntrance_EventScript_269FCB
-	compare VAR_0x4044, 7
-	goto_eq Route110_TrickHouseEntrance_EventScript_269FF7
-	end
-
-Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF
-	giveitem_std ITEM_RARE_CANDY
-	compare VAR_RESULT, 1
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B
-	giveitem_std ITEM_TIMER_BALL
-	compare VAR_RESULT, 1
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47
-	giveitem_std ITEM_HARD_STONE
-	compare VAR_RESULT, 1
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73
-	giveitem_std ITEM_SMOKE_BALL
-	compare VAR_RESULT, 1
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F
-	giveitem_std ITEM_TM12
-	compare VAR_RESULT, 1
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB
-	giveitem_std ITEM_MAGNET
-	compare VAR_RESULT, 1
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7
-	giveitem_std ITEM_PP_MAX
-	compare VAR_RESULT, 1
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023
-	setvar VAR_0x40C1, 0
-	setvar VAR_0x40A7, 3
-	applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6
-	waitmovement 0
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039
-	applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
-	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_26AB2C, 4
-	call Route110_TrickHouseEntrance_EventScript_26A070
-	compare VAR_RESULT, 1
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A09A
-	compare VAR_RESULT, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_272071
-	msgbox Route110_TrickHouseEntrance_Text_26ABBD, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A070:: @ 826A070
-	multichoice 0, 0, 88, 1
-	switch VAR_RESULT
-	case 0, Route110_TrickHouseEntrance_EventScript_26A08A
-	goto Route110_TrickHouseEntrance_EventScript_26A092
-
-Route110_TrickHouseEntrance_EventScript_26A08A:: @ 826A08A
-	givedecoration_std 31
-	return
-
-Route110_TrickHouseEntrance_EventScript_26A092:: @ 826A092
-	givedecoration_std 32
-	return
-
-Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A
-	msgbox Route110_TrickHouseEntrance_Text_26ABAE, 4
-	closemessage
-	applymovement 1, Route110_TrickHouseEntrance_Movement_26D632
-	waitmovement 0
-	applymovement 1, Route110_TrickHouseEntrance_Movement_269E36
-	waitmovement 0
-	playse SE_W153
-	applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
-	waitmovement 0
-	removeobject 1
-	setvar VAR_0x40C1, 0
-	setvar VAR_0x40A7, 5
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3
-	lockall
-	switch VAR_0x40A7
-	case 0, Route110_TrickHouseEntrance_EventScript_26A106
-	case 1, Route110_TrickHouseEntrance_EventScript_26A110
-	case 4, Route110_TrickHouseEntrance_EventScript_26A201
-	case 5, Route110_TrickHouseEntrance_EventScript_26A20B
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A106:: @ 826A106
-	msgbox Route110_TrickHouseEntrance_Text_26A878, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110
-	msgbox Route110_TrickHouseEntrance_Text_26A887, 5
-	closemessage
-	compare VAR_RESULT, 1
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A126
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126
-	setmetatile 5, 1, 537, 0
-	special DrawWholeMapView
-	delay 20
-	applymovement 255, Route110_TrickHouseEntrance_Movement_2725C9
-	waitmovement 0
-	applymovement 255, Route110_TrickHouseEntrance_Movement_26A1A7
-	waitmovement 0
-	switch VAR_0x4044
-	case 0, Route110_TrickHouseEntrance_EventScript_26A1A9
-	case 1, Route110_TrickHouseEntrance_EventScript_26A1B4
-	case 2, Route110_TrickHouseEntrance_EventScript_26A1BF
-	case 3, Route110_TrickHouseEntrance_EventScript_26A1CA
-	case 4, Route110_TrickHouseEntrance_EventScript_26A1D5
-	case 5, Route110_TrickHouseEntrance_EventScript_26A1E0
-	case 6, Route110_TrickHouseEntrance_EventScript_26A1EB
-	case 7, Route110_TrickHouseEntrance_EventScript_26A1F6
-	end
-
-Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7
-	set_invisible
-	step_end
-
-Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9
-	warp ROUTE_110_TRICK_HOUSE_PUZZLE_1, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A1B4:: @ 826A1B4
-	warp ROUTE_110_TRICK_HOUSE_PUZZLE_2, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A1BF:: @ 826A1BF
-	warp ROUTE_110_TRICK_HOUSE_PUZZLE_3, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A1CA:: @ 826A1CA
-	warp ROUTE_110_TRICK_HOUSE_PUZZLE_4, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A1D5:: @ 826A1D5
-	warp ROUTE_110_TRICK_HOUSE_PUZZLE_5, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A1E0:: @ 826A1E0
-	warp ROUTE_110_TRICK_HOUSE_PUZZLE_6, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A1EB:: @ 826A1EB
-	warp ROUTE_110_TRICK_HOUSE_PUZZLE_7, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A1F6:: @ 826A1F6
-	warp ROUTE_110_TRICK_HOUSE_PUZZLE_8, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201
-	msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B
-	compare VAR_0x4044, 8
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A220
-	msgbox Route110_TrickHouseEntrance_Text_26A878, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220
-	msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A
-	lockall
-	switch VAR_0x4044
-	case 0, Route110_TrickHouseEntrance_EventScript_26A289
-	case 1, Route110_TrickHouseEntrance_EventScript_26A2B2
-	case 2, Route110_TrickHouseEntrance_EventScript_26A2DB
-	case 3, Route110_TrickHouseEntrance_EventScript_26A304
-	case 4, Route110_TrickHouseEntrance_EventScript_26A32D
-	case 5, Route110_TrickHouseEntrance_EventScript_26A356
-	case 6, Route110_TrickHouseEntrance_EventScript_26A37F
-	case 7, Route110_TrickHouseEntrance_EventScript_26A3A8
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289
-	compare VAR_0x40AB, 0
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle1_Text_26B98D, 4
-	playse SE_PIN
-	setvar VAR_0x40AB, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2
-	compare VAR_0x40AC, 0
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle2_Text_26BCBA, 4
-	playse SE_PIN
-	setvar VAR_0x40AC, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB
-	compare VAR_0x40AD, 0
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle3_Text_26C609, 4
-	playse SE_PIN
-	setvar VAR_0x40AD, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304
-	compare VAR_0x40AE, 0
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle4_Text_26C8C3, 4
-	playse SE_PIN
-	setvar VAR_0x40AE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D
-	compare VAR_0x40AF, 0
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle5_Text_26D660, 4
-	playse SE_PIN
-	setvar VAR_0x40AF, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356
-	compare VAR_0x40B0, 0
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle6_Text_26DE26, 4
-	playse SE_PIN
-	setvar VAR_0x40B0, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F
-	compare VAR_0x40B1, 0
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle7_EventScript_26E413, 4
-	playse SE_PIN
-	setvar VAR_0x40B1, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8
-	compare VAR_0x40B2, 0
-	goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle8_EventScript_26E864, 4
-	playse SE_PIN
-	setvar VAR_0x40B2, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A3D1:: @ 826A3D1
-	msgbox Route110_TrickHouseEntrance_Text_26AC4F, 4
-	releaseall
-	end
-
-Route110_TrickHousePuzzle1_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle2_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle3_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle4_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle5_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle6_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle7_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle8_EventScript_26A3DB:: @ 826A3DB
-	msgbox Route110_TrickHousePuzzle1_Text_26AC2F, 4
-	releaseall
-	end
-
-Route110_TrickHousePuzzle1_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle2_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle3_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle4_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle5_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle6_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle7_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle8_EventScript_26A3E5:: @ 826A3E5
-	playfanfare MUS_FANFA4
-	message Route110_TrickHousePuzzle1_Text_26ABE8
-	waitfanfare
-	msgbox Route110_TrickHousePuzzle1_Text_26ABFB, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8
-	lockall
-	msgbox Route110_TrickHouseEntrance_Text_26A474, 4
-	releaseall
-	compare VAR_0x4044, 0
-	call_if 1, Route110_TrickHouseEntrance_EventScript_26A429
-	compare VAR_0x4044, 1
-	call_if 1, Route110_TrickHouseEntrance_EventScript_26A439
-	compare VAR_0x4044, 2
-	call_if 1, Route110_TrickHouseEntrance_EventScript_26A449
-	setvar VAR_0x40A5, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_26A429:: @ 826A429
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 3
-	call Route110_TrickHouseEntrance_EventScript_26A459
-	return
-
-Route110_TrickHouseEntrance_EventScript_26A439:: @ 826A439
-	setvar VAR_0x8004, 11
-	setvar VAR_0x8005, 5
-	call Route110_TrickHouseEntrance_EventScript_26A459
-	return
-
-Route110_TrickHouseEntrance_EventScript_26A449:: @ 826A449
-	setvar VAR_0x8004, 9
-	setvar VAR_0x8005, 2
-	call Route110_TrickHouseEntrance_EventScript_26A459
-	return
-
-Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459
-	setvar VAR_0x8006, 0
-	setfieldeffectargument 0, VAR_0x8004
-	setfieldeffectargument 1, VAR_0x8005
-	setfieldeffectargument 2, VAR_0x8006
-	dofieldeffect 54
-	waitfieldeffect 54
-	delay 10
-	return
-
-Route110_TrickHouseEntrance_Text_26A474: @ 826A474
-	.string "You’re being watched…$"
-
-Route110_TrickHouseEntrance_Text_26A48A: @ 826A48A
-	.string "Hah? Grrr…\p"
-	.string "How did you know I concealed myself\n"
-	.string "beneath this desk? You’re sharp!$"
-
-Route110_TrickHouseEntrance_Text_26A4DA: @ 826A4DA
-	.string "Hah? Grrr…\p"
-	.string "How did you know I concealed myself\n"
-	.string "behind this tree? You’re sharp!$"
-
-Route110_TrickHouseEntrance_Text_26A529: @ 826A529
-	.string "Hah? Grrr…\p"
-	.string "How did you know I concealed myself\n"
-	.string "in this dresser? You’re sharp!$"
-
-Route110_TrickHouseEntrance_Text_26A577: @ 826A577
-	.string "Hah? Grrr…\p"
-	.string "How did you know I concealed myself\n"
-	.string "beyond this window? You’re sharp!$"
-
-Route110_TrickHouseEntrance_Text_26A5C8: @ 826A5C8
-	.string "Hah? Grrr…\p"
-	.string "How did you know I concealed myself\n"
-	.string "in this planter? You’re sharp!$"
-
-Route110_TrickHouseEntrance_Text_26A616: @ 826A616
-	.string "Hah? Grrr…\p"
-	.string "How did you know I concealed myself\n"
-	.string "in this cupboard? You’re sharp!$"
-
-Route110_TrickHouseEntrance_Text_26A665: @ 826A665
-	.string "Hah? Grrr…\p"
-	.string "How did you know I concealed myself\n"
-	.string "behind this window? You’re sharp!$"
-
-Route110_TrickHouseEntrance_Text_26A6B6: @ 826A6B6
-	.string "Hah? Grrr…\p"
-	.string "How did you know I concealed myself\n"
-	.string "beneath this cushion? You’re sharp!$"
-
-Route110_TrickHouseEntrance_Text_26A709: @ 826A709
-	.string "Behold!\p"
-	.string "For I am the greatest living mystery\n"
-	.string "of a man in all of HOENN!\l"
-	.string "They call me…\p"
-	.string "The TRICK MASTER!\n"
-	.string "Wahahaha! Glad to meet you!$"
-
-Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C
-	.string "You, you’ve come to challenge\n"
-	.string "my TRICK HOUSE, haven’t you?\p"
-	.string "That’s why you’re here, isn’t it?\n"
-	.string "Yes, it is!\p"
-	.string "Consider your challenge accepted!\p"
-	.string "Enter through the scroll there,\n"
-	.string "and let your challenge commence!\p"
-	.string "I shall be waiting in the back!$"
-
-Route110_TrickHouseEntrance_Text_26A878: @ 826A878
-	.string "It’s a scroll.$"
-
-Route110_TrickHouseEntrance_Text_26A887: @ 826A887
-	.string "There is a big hole behind the scroll!\p"
-	.string "Want to go in?$"
-
-Route110_TrickHouseEntrance_Text_26A8BD: @ 826A8BD
-	.string "There is a note affixed to the scroll…\p"
-	.string "“I am leaving on a journey.\n"
-	.string "Don’t look for me. TRICK MASTER”$"
-
-Route110_TrickHouseEntrance_Text_26A921: @ 826A921
-	.string "For the next time, I’ll use this trick,\n"
-	.string "and that scheme, and those ruses…\p"
-	.string "Mufufufu… If I may say so, it’s\n"
-	.string "brilliantly difficult, even for me!$"
-
-Route110_TrickHouseEntrance_Text_26A9AF: @ 826A9AF
-	.string "Hah? What?!\n"
-	.string "Oh, it’s you!\p"
-	.string "I’m in the midst of devising new tricky\n"
-	.string "challenges!\p"
-	.string "It’s not too much to ask for a bit more\n"
-	.string "time for me to think, is it now?\l"
-	.string "You wouldn’t begrudge me that?\l"
-	.string "Come back in a little while!$"
-
-Route110_TrickHouseEntrance_Text_26AA82: @ 826AA82
-	.string "Ah, it’s you! You’re here to accept the\n"
-	.string "reward from before, isn’t that right?\l"
-	.string "Yes, right I am!\p"
-	.string "Here!\n"
-	.string "I’ll give it to you now!$"
-
-Route110_TrickHouseEntrance_Text_26AB00: @ 826AB00
-	.string "Hah?\n"
-	.string "Did you not come to claim your reward?$"
-
-Route110_TrickHouseEntrance_Text_26AB2C: @ 826AB2C
-	.string "MECHADOLL 5 I AM!\n"
-	.string "IF REWARD IS NOT TAKEN BY YOU,\l"
-	.string "THEN TRICK MASTER YOU CANNOT FOLLOW.\p"
-	.string "RED TENT OR BLUE TENT,\n"
-	.string "WHICH DO YOU PREFER?$"
-
-Route110_TrickHouseEntrance_Text_26ABAE: @ 826ABAE
-	.string "THEN FAREWELL.$"
-
-Route110_TrickHouseEntrance_Text_26ABBD: @ 826ABBD
-	.string "YOUR PC STATUS: FULL AGAIN.\n"
-	.string "MEAN, YOU ARE.$"
-
-Route110_TrickHousePuzzle1_Text_26ABE8: @ 826ABE8
-	.string "{PLAYER} found a scroll.$"
-
-Route110_TrickHousePuzzle1_Text_26ABFB: @ 826ABFB
-	.string "{PLAYER} memorized the secret code\n"
-	.string "written on the scroll.$"
-
-Route110_TrickHousePuzzle1_Text_26AC2F: @ 826AC2F
-	.string "A secret code is written on it.$"
-
-Route110_TrickHouseEntrance_Text_26AC4F: @ 826AC4F
-	.string "The door is locked.\p"
-	.string "…On closer inspection, this is written\n"
-	.string "on it: “Write the secret code here.”$"
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc
deleted file mode 100644
index 3bdf93b12..000000000
--- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc
+++ /dev/null
@@ -1,1091 +0,0 @@
-Route110_TrickHousePuzzle5_MapScripts:: @ 826CAF0
-	map_script 3, Route110_TrickHousePuzzle5_MapScript1_26CAF6
-	.byte 0
-
-Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6
-	setvar VAR_TEMP_1, 0
-	setvar VAR_TEMP_2, 0
-	setvar VAR_TEMP_3, 0
-	setvar VAR_TEMP_4, 0
-	setvar VAR_TEMP_5, 0
-	setvar VAR_TEMP_8, 0
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15
-	lockall
-	compare VAR_0x40AF, 0
-	goto_eq Route110_TrickHousePuzzle5_EventScript_26CB27
-	goto Route110_TrickHousePuzzle5_EventScript_26A3DB
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27
-	setvar VAR_0x40AF, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26A3E5
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32
-	lockall
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E
-	waitmovement 0
-	compare VAR_TEMP_1, 1
-	goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53
-	lockall
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E
-	waitmovement 0
-	compare VAR_TEMP_2, 1
-	goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74
-	lockall
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E
-	waitmovement 0
-	compare VAR_TEMP_3, 1
-	goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95
-	lockall
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E
-	waitmovement 0
-	compare VAR_TEMP_4, 1
-	goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6
-	lockall
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E
-	waitmovement 0
-	compare VAR_TEMP_5, 1
-	goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CEF2
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CBD7:: @ 826CBD7
-	lockall
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CBE3:: @ 826CBE3
-	lockall
-	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CBEF:: @ 826CBEF
-	lockall
-	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CBFB:: @ 826CBFB
-	lockall
-	setvar VAR_TEMP_9, 3
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CC07:: @ 826CC07
-	lockall
-	setvar VAR_TEMP_9, 4
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CC13:: @ 826CC13
-	lockall
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CC1F:: @ 826CC1F
-	lockall
-	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CC2B:: @ 826CC2B
-	lockall
-	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CC37:: @ 826CC37
-	lockall
-	setvar VAR_TEMP_9, 3
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CC43:: @ 826CC43
-	lockall
-	setvar VAR_TEMP_9, 4
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CC4F:: @ 826CC4F
-	lockall
-	setvar VAR_TEMP_9, 5
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CC5B:: @ 826CC5B
-	lockall
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CC67:: @ 826CC67
-	lockall
-	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CC73:: @ 826CC73
-	lockall
-	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CC7F:: @ 826CC7F
-	lockall
-	setvar VAR_TEMP_9, 3
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CC8B:: @ 826CC8B
-	lockall
-	setvar VAR_TEMP_9, 4
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CC97:: @ 826CC97
-	lockall
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CCA3:: @ 826CCA3
-	lockall
-	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CCAF:: @ 826CCAF
-	lockall
-	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CCBB:: @ 826CCBB
-	lockall
-	setvar VAR_TEMP_9, 3
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CCC7:: @ 826CCC7
-	lockall
-	setvar VAR_TEMP_9, 4
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CCD3:: @ 826CCD3
-	lockall
-	setvar VAR_TEMP_9, 5
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CCDF:: @ 826CCDF
-	lockall
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CEF2
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB
-	setvar VAR_TEMP_1, 1
-	setvar VAR_TEMP_8, 1
-	playse SE_PIN
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_272598
-	waitmovement 0
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A
-	waitmovement 0
-	compare VAR_TEMP_9, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4
-	compare VAR_TEMP_9, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC
-	compare VAR_TEMP_9, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224
-	compare VAR_TEMP_9, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C
-	msgbox Route110_TrickHousePuzzle5_Text_26D6CE, 4
-	random 3
-	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26CF45
-	case 1, Route110_TrickHousePuzzle5_EventScript_26CF68
-	case 2, Route110_TrickHousePuzzle5_EventScript_26CF8B
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A
-	setvar VAR_TEMP_2, 1
-	setvar VAR_TEMP_8, 2
-	playse SE_PIN
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_272598
-	waitmovement 0
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A
-	waitmovement 0
-	compare VAR_TEMP_9, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D2CC
-	compare VAR_TEMP_9, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D304
-	compare VAR_TEMP_9, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D33C
-	compare VAR_TEMP_9, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D374
-	compare VAR_TEMP_9, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3AC
-	msgbox Route110_TrickHousePuzzle5_Text_26D8EA, 4
-	random 3
-	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26CFAE
-	case 1, Route110_TrickHousePuzzle5_EventScript_26CFD1
-	case 2, Route110_TrickHousePuzzle5_EventScript_26CFF4
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4
-	setvar VAR_TEMP_3, 1
-	setvar VAR_TEMP_8, 3
-	playse SE_PIN
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_272598
-	waitmovement 0
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A
-	waitmovement 0
-	compare VAR_TEMP_9, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4
-	compare VAR_TEMP_9, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC
-	compare VAR_TEMP_9, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224
-	compare VAR_TEMP_9, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C
-	msgbox Route110_TrickHousePuzzle5_Text_26DA1E, 4
-	random 3
-	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D017
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D03A
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D05D
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73
-	setvar VAR_TEMP_4, 1
-	setvar VAR_TEMP_8, 4
-	playse SE_PIN
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_272598
-	waitmovement 0
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A
-	waitmovement 0
-	compare VAR_TEMP_9, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4
-	compare VAR_TEMP_9, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC
-	compare VAR_TEMP_9, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224
-	compare VAR_TEMP_9, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C
-	msgbox Route110_TrickHousePuzzle5_Text_26DB4C, 4
-	random 3
-	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D080
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D0A3
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D0C6
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2
-	setvar VAR_TEMP_5, 1
-	setvar VAR_TEMP_8, 5
-	playse SE_PIN
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_272598
-	waitmovement 0
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_27259A
-	waitmovement 0
-	msgbox Route110_TrickHousePuzzle5_Text_26DC78, 4
-	random 3
-	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D0E9
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D10C
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D12F
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45
-	msgbox Route110_TrickHousePuzzle5_Text_26D757, 4
-	multichoice 0, 0, 25, 1
-	switch VAR_RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68
-	msgbox Route110_TrickHousePuzzle5_Text_26D7AA, 4
-	multichoice 0, 0, 26, 1
-	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B
-	msgbox Route110_TrickHousePuzzle5_Text_26D7FC, 4
-	multichoice 0, 0, 27, 1
-	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE
-	msgbox Route110_TrickHousePuzzle5_Text_26D940, 4
-	multichoice 0, 0, 28, 1
-	switch VAR_RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1
-	msgbox Route110_TrickHousePuzzle5_Text_26D98C, 4
-	multichoice 0, 0, 29, 1
-	switch VAR_RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4
-	msgbox Route110_TrickHousePuzzle5_Text_26D9CE, 4
-	multichoice 0, 0, 30, 1
-	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017
-	msgbox Route110_TrickHousePuzzle5_Text_26DA64, 4
-	multichoice 0, 0, 31, 1
-	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A
-	msgbox Route110_TrickHousePuzzle5_Text_26DAAD, 4
-	multichoice 0, 0, 32, 1
-	switch VAR_RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D
-	msgbox Route110_TrickHousePuzzle5_Text_26DAFF, 4
-	multichoice 0, 0, 33, 1
-	switch VAR_RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080
-	msgbox Route110_TrickHousePuzzle5_Text_26DB94, 4
-	multichoice 0, 0, 34, 1
-	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3
-	msgbox Route110_TrickHousePuzzle5_Text_26DBD7, 4
-	multichoice 0, 0, 35, 1
-	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6
-	msgbox Route110_TrickHousePuzzle5_Text_26DC2A, 4
-	multichoice 0, 0, 36, 1
-	switch VAR_RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9
-	msgbox Route110_TrickHousePuzzle5_Text_26DCCB, 4
-	multichoice 0, 0, 37, 1
-	switch VAR_RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C
-	msgbox Route110_TrickHousePuzzle5_Text_26DD1B, 4
-	multichoice 0, 0, 38, 1
-	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F
-	msgbox Route110_TrickHousePuzzle5_Text_26DD5F, 4
-	multichoice 0, 0, 39, 1
-	switch VAR_RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26D152:: @ 826D152
-	waitse
-	playse SE_HAZURE
-	msgbox Route110_TrickHousePuzzle5_Text_26D883, 4
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D632
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D632
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D632
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D632
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D632
-	msgbox Route110_TrickHousePuzzle5_Text_26D8A1, 4
-	waitmovement 0
-	msgbox Route110_TrickHousePuzzle5_Text_26D8C9, 4
-	closemessage
-	warp ROUTE_110_TRICK_HOUSE_PUZZLE_5, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26D1A0:: @ 826D1A0
-	waitse
-	playse SE_SEIKAI
-	goto Route110_TrickHousePuzzle5_EventScript_26D1AA
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA
-	msgbox Route110_TrickHousePuzzle5_Text_26D84D, 4
-	releaseall
-	end
-
-Route110_TrickHousePuzzle5_EventScript_26D1B4:: @ 826D1B4
-	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3E4
-	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3EF
-	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3FA
-	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D405
-	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D410
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D1EC:: @ 826D1EC
-	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D41B
-	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D426
-	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D431
-	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D43C
-	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D447
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D224:: @ 826D224
-	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D452
-	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D45D
-	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D468
-	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D473
-	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D47E
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D25C:: @ 826D25C
-	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D489
-	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D494
-	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D49F
-	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4AA
-	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4B5
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D294:: @ 826D294
-	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4C0
-	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4CB
-	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4D6
-	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4E1
-	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4EC
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D2CC:: @ 826D2CC
-	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4F7
-	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D502
-	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D50D
-	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D518
-	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D523
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D304:: @ 826D304
-	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D52E
-	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D539
-	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D544
-	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D54F
-	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D55A
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D33C:: @ 826D33C
-	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D565
-	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D570
-	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D57B
-	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D586
-	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D591
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D374:: @ 826D374
-	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D59C
-	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5A7
-	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5B2
-	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5BD
-	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5C8
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D3AC:: @ 826D3AC
-	compare VAR_TEMP_8, 1
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5D3
-	compare VAR_TEMP_8, 2
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5DE
-	compare VAR_TEMP_8, 3
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5E9
-	compare VAR_TEMP_8, 4
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5F4
-	compare VAR_TEMP_8, 5
-	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5FF
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D3E4:: @ 826D3E4
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60A
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D3EF:: @ 826D3EF
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60A
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D3FA:: @ 826D3FA
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60A
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D405:: @ 826D405
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60A
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D410:: @ 826D410
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60A
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D41B:: @ 826D41B
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60C
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D426:: @ 826D426
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60C
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D431:: @ 826D431
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60C
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D43C:: @ 826D43C
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60C
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D447:: @ 826D447
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60C
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D452:: @ 826D452
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60F
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D45D:: @ 826D45D
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60F
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D468:: @ 826D468
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60F
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D473:: @ 826D473
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60F
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D47E:: @ 826D47E
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60F
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D489:: @ 826D489
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D613
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D494:: @ 826D494
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D613
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D49F:: @ 826D49F
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D613
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D4AA:: @ 826D4AA
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D613
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D4B5:: @ 826D4B5
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D613
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D4C0:: @ 826D4C0
-	applymovement 1, Movement_26D618
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D4CB:: @ 826D4CB
-	applymovement 2, Movement_26D618
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D4D6:: @ 826D4D6
-	applymovement 3, Movement_26D618
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D4E1:: @ 826D4E1
-	applymovement 4, Movement_26D618
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D4EC:: @ 826D4EC
-	applymovement 5, Movement_26D618
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D4F7:: @ 826D4F7
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D61E
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D502:: @ 826D502
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D61E
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D50D:: @ 826D50D
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D61E
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D518:: @ 826D518
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D61E
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D523:: @ 826D523
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D61E
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D52E:: @ 826D52E
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D620
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D539:: @ 826D539
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D620
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D544:: @ 826D544
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D620
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D54F:: @ 826D54F
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D620
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D55A:: @ 826D55A
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D620
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D565:: @ 826D565
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D623
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D570:: @ 826D570
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D623
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D57B:: @ 826D57B
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D623
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D586:: @ 826D586
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D623
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D591:: @ 826D591
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D623
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D59C:: @ 826D59C
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D627
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D5A7:: @ 826D5A7
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D627
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D5B2:: @ 826D5B2
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D627
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D5BD:: @ 826D5BD
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D627
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D5C8:: @ 826D5C8
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D627
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D5D3:: @ 826D5D3
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D62C
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D5DE:: @ 826D5DE
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D62C
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D5E9:: @ 826D5E9
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D62C
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D5F4:: @ 826D5F4
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D62C
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_26D5FF:: @ 826D5FF
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D62C
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_Movement_26D60A: @ 826D60A
-	walk_left
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D60C: @ 826D60C
-	walk_left
-	walk_left
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D60F: @ 826D60F
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D613: @ 826D613
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-
-Movement_26D618: @ 826D618
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D61E: @ 826D61E
-	walk_right
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D620: @ 826D620
-	walk_right
-	walk_right
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D623: @ 826D623
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D627: @ 826D627
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-Route110_TrickHouseEntrance_Movement_26D632: @ 826D632
-Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632
-	face_left
-	delay_2
-	face_right
-	delay_2
-	face_left
-	delay_2
-	face_right
-	delay_2
-	face_left
-	delay_2
-	face_right
-	delay_2
-	face_left
-	delay_2
-	face_right
-	delay_2
-	face_left
-	delay_2
-	face_right
-	delay_2
-	face_left
-	delay_2
-	face_right
-	delay_2
-	face_left
-	delay_2
-	face_right
-	delay_2
-	face_left
-	delay_2
-	face_right
-	delay_2
-	face_left
-	delay_2
-	face_right
-	delay_2
-	face_left
-	delay_2
-	face_right
-	delay_2
-	face_left
-	delay_2
-	face_right
-	delay_2
-	face_down
-	step_end
-
-Route110_TrickHousePuzzle5_Text_26D660: @ 826D660
-	.string "{PLAYER} wrote down the secret code\n"
-	.string "on the door.\p"
-	.string "“TRICK MASTER is a genius.”\n"
-	.string "… … … … … … … …\p"
-	.string "The lock clicked open!$"
-
-Route110_TrickHousePuzzle5_Text_26D6CE: @ 826D6CE
-	.string "CLICKETY-CLACK…\n"
-	.string "MECHADOLL 1 AM I!\p"
-	.string "IF YOU ANSWER QUIZZES CORRECTLY,\n"
-	.string "THEN YOU WILL GO TO MECHADOLL 5.\l"
-	.string "THEN YOU CAN OBTAIN THE SECRET CODE.$"
-
-Route110_TrickHousePuzzle5_Text_26D757: @ 826D757
-	.string "MECHADOLL 1 QUIZ.\p"
-	.string "One of these POKéMON is not found\n"
-	.string "on ROUTE 110. Which one is it?$"
-
-Route110_TrickHousePuzzle5_Text_26D7AA: @ 826D7AA
-	.string "MECHADOLL 1 QUIZ.\p"
-	.string "One of these POKéMON is not of the\n"
-	.string "WATER type. Which one is it?$"
-
-Route110_TrickHousePuzzle5_Text_26D7FC: @ 826D7FC
-	.string "MECHADOLL 1 QUIZ.\p"
-	.string "One of these POKéMON does not use\n"
-	.string "LEECH LIFE. Which one is it?$"
-
-Route110_TrickHousePuzzle5_Text_26D84D: @ 826D84D
-	.string "CONGRATULATIONS. CORRECT YOU ARE.\n"
-	.string "GO THROUGH. PLEASE.$"
-
-Route110_TrickHousePuzzle5_Text_26D883: @ 826D883
-	.string "BZZZT. DISAPPOINTMENT.\n"
-	.string "ERROR.$"
-
-Route110_TrickHousePuzzle5_Text_26D8A1: @ 826D8A1
-	.string "WAHAHAHAHA! WAHAHAHAHA!\n"
-	.string "CLICKETY-CLACK!$"
-
-Route110_TrickHousePuzzle5_Text_26D8C9: @ 826D8C9
-	.string "YOUR NEXT CHALLENGE WE WAIT FOR.$"
-
-Route110_TrickHousePuzzle5_Text_26D8EA: @ 826D8EA
-	.string "CLICKETY-CLACK…\n"
-	.string "MECHADOLL 2 AM I!\p"
-	.string "MECHADOLL 1’S QUIZ DIFFICULTY LEVEL\n"
-	.string "IS SET TOO LOW.$"
-
-Route110_TrickHousePuzzle5_Text_26D940: @ 826D940
-	.string "MECHADOLL 2 QUIZ.\p"
-	.string "Which of these POKéMON did WALLY\n"
-	.string "borrow from your father?$"
-
-Route110_TrickHousePuzzle5_Text_26D98C: @ 826D98C
-	.string "MECHADOLL 2 QUIZ.\p"
-	.string "Which of these POKéMON was chasing\n"
-	.string "PROF. BIRCH?$"
-
-Route110_TrickHousePuzzle5_Text_26D9CE: @ 826D9CE
-	.string "MECHADOLL 2 QUIZ.\p"
-	.string "Which of these POKéMON did TEAM AQUA\n"
-	.string "use in PETALBURG FOREST?$"
-
-Route110_TrickHousePuzzle5_Text_26DA1E: @ 826DA1E
-	.string "CLICKETY-CLACK…\n"
-	.string "MECHADOLL 3 AM I!\p"
-	.string "MATTERS OF MONEY ARE MY SOLE FOCUS.$"
-
-Route110_TrickHousePuzzle5_Text_26DA64: @ 826DA64
-	.string "MECHADOLL 3 QUIZ.\p"
-	.string "Which costs more?\n"
-	.string "Three HARBOR MAILS or one BURN HEAL?$"
-
-Route110_TrickHousePuzzle5_Text_26DAAD: @ 826DAAD
-	.string "MECHADOLL 3 QUIZ.\p"
-	.string "Sell one GREAT BALL and buy\n"
-	.string "one POTION. How much money remains?$"
-
-Route110_TrickHousePuzzle5_Text_26DAFF: @ 826DAFF
-	.string "MECHADOLL 3 QUIZ.\p"
-	.string "Do one REPEL and SODA POP cost\n"
-	.string "more than one SUPER POTION?$"
-
-Route110_TrickHousePuzzle5_Text_26DB4C: @ 826DB4C
-	.string "CLICKETY-CLACK…\n"
-	.string "MECHADOLL 4 THAT IS ME!\p"
-	.string "MY QUIZ IS AN OBJECT OF BEAUTY.$"
-
-Route110_TrickHousePuzzle5_Text_26DB94: @ 826DB94
-	.string "MECHADOLL 4 QUIZ.\p"
-	.string "In SEASHORE HOUSE, were there more men\n"
-	.string "or women?$"
-
-Route110_TrickHousePuzzle5_Text_26DBD7: @ 826DBD7
-	.string "MECHADOLL 4 QUIZ.\p"
-	.string "In LAVARIDGE TOWN, were there more\n"
-	.string "elderly men or elderly women?$"
-
-Route110_TrickHousePuzzle5_Text_26DC2A: @ 826DC2A
-	.string "MECHADOLL 4 QUIZ.\p"
-	.string "In the TRAINER’S SCHOOL, how many\n"
-	.string "girl students were there?$"
-
-Route110_TrickHousePuzzle5_Text_26DC78: @ 826DC78
-	.string "CLICKETY-CLACK…\n"
-	.string "MECHADOLL 5 AM I!\p"
-	.string "THE MASTER’S BEST AND PROUDEST\n"
-	.string "ACHIEVEMENT AM I.$"
-
-Route110_TrickHousePuzzle5_Text_26DCCB: @ 826DCCB
-	.string "MECHADOLL 5 QUIZ.\p"
-	.string "In SLATEPORT’s POKéMON FAN CLUB,\n"
-	.string "how many POKéMON were there?$"
-
-Route110_TrickHousePuzzle5_Text_26DD1B: @ 826DD1B
-	.string "MECHADOLL 5 QUIZ.\p"
-	.string "In FORTREE CITY, how many\n"
-	.string "tree houses were there?$"
-
-Route110_TrickHousePuzzle5_Text_26DD5F: @ 826DD5F
-	.string "MECHADOLL 5 QUIZ.\p"
-	.string "On the CYCLING ROAD, how many\n"
-	.string "TRIATHLETES were there?$"
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc
deleted file mode 100644
index 35e5e1522..000000000
--- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc
+++ /dev/null
@@ -1,411 +0,0 @@
-Route110_TrickHousePuzzle7_MapScripts:: @ 826E091
-	map_script 5, Route110_TrickHousePuzzle7_MapScript1_26E0A6
-	map_script 3, Route110_TrickHousePuzzle7_MapScript1_26E198
-	map_script 1, Route110_TrickHousePuzzle7_MapScript1_26E1B4
-	map_script 2, Route110_TrickHousePuzzle7_MapScript2_26E1C0
-	.byte 0
-
-Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6
-	call Route110_TrickHousePuzzle7_EventScript_26E0AC
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E0AC:: @ 826E0AC
-	checkflag FLAG_0x0C2
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0DA
-	checkflag FLAG_0x0C3
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0ED
-	checkflag FLAG_0x0C4
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E100
-	checkflag FLAG_0x0C5
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E113
-	checkflag FLAG_0x0C6
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E126
-	return
-
-Route110_TrickHousePuzzle7_EventScript_26E0DA:: @ 826E0DA
-	setmetatile 13, 17, 610, 0
-	setmetatile 12, 16, 575, 1
-	return
-
-Route110_TrickHousePuzzle7_EventScript_26E0ED:: @ 826E0ED
-	setmetatile 12, 13, 610, 0
-	setmetatile 12, 11, 575, 1
-	return
-
-Route110_TrickHousePuzzle7_EventScript_26E100:: @ 826E100
-	setmetatile 7, 12, 610, 0
-	setmetatile 5, 10, 575, 1
-	return
-
-Route110_TrickHousePuzzle7_EventScript_26E113:: @ 826E113
-	setmetatile 6, 6, 636, 0
-	setmetatile 4, 4, 575, 1
-	return
-
-Route110_TrickHousePuzzle7_EventScript_26E126:: @ 826E126
-	setmetatile 8, 4, 609, 0
-	setmetatile 7, 5, 575, 1
-	return
-
-Route110_TrickHousePuzzle7_EventScript_26E139:: @ 826E139
-	setmetatile 13, 17, 611, 0
-	setmetatile 12, 16, 574, 1
-	return
-
-Route110_TrickHousePuzzle7_EventScript_26E14C:: @ 826E14C
-	setmetatile 12, 13, 609, 0
-	setmetatile 12, 11, 574, 1
-	return
-
-Route110_TrickHousePuzzle7_EventScript_26E15F:: @ 826E15F
-	setmetatile 7, 12, 611, 0
-	setmetatile 5, 10, 574, 1
-	return
-
-Route110_TrickHousePuzzle7_EventScript_26E172:: @ 826E172
-	setmetatile 6, 6, 635, 0
-	setmetatile 4, 4, 574, 1
-	return
-
-Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185
-	setmetatile 8, 4, 608, 0
-	setmetatile 7, 5, 574, 1
-	return
-
-Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198
-	compare VAR_0x40B6, 1
-	goto_eq Route110_TrickHousePuzzle7_EventScript_26E1B3
-	clearflag FLAG_0x0C2
-	clearflag FLAG_0x0C3
-	clearflag FLAG_0x0C4
-	clearflag FLAG_0x0C5
-	clearflag FLAG_0x0C6
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3
-	end
-
-Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4
-	compare VAR_0x40B6, 1
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0AC
-	end
-
-Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0
-	map_script_2 VAR_0x40B6, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA
-	.2byte 0
-
-Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA
-	setvar VAR_0x40B6, 0
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0
-	lockall
-	compare VAR_0x40B1, 0
-	goto_eq Route110_TrickHousePuzzle7_EventScript_26E1E2
-	goto Route110_TrickHousePuzzle7_EventScript_26A3DB
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2
-	setvar VAR_0x40B1, 1
-	goto Route110_TrickHousePuzzle7_EventScript_26A3E5
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED
-	lockall
-	setvar VAR_0x40B6, 1
-	warpteleport ROUTE_110_TRICK_HOUSE_PUZZLE_7, 255, 3, 19
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E1FE:: @ 826E1FE
-	lockall
-	delay 32
-	checkflag FLAG_0x0C2
-	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E0DA
-	checkflag FLAG_0x0C2
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E139
-	special DrawWholeMapView
-	playse SE_TK_KASYA
-	checkflag FLAG_0x0C2
-	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2E9
-	checkflag FLAG_0x0C2
-	goto_eq Route110_TrickHousePuzzle7_EventScript_26E2EE
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D
-	lockall
-	delay 32
-	checkflag FLAG_0x0C3
-	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E0ED
-	checkflag FLAG_0x0C3
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E14C
-	special DrawWholeMapView
-	playse SE_TK_KASYA
-	checkflag FLAG_0x0C3
-	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2F3
-	checkflag FLAG_0x0C3
-	goto_eq Route110_TrickHousePuzzle7_EventScript_26E2F8
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C
-	lockall
-	delay 32
-	checkflag FLAG_0x0C4
-	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E100
-	checkflag FLAG_0x0C4
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E15F
-	special DrawWholeMapView
-	playse SE_TK_KASYA
-	checkflag FLAG_0x0C4
-	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2FD
-	checkflag FLAG_0x0C4
-	goto_eq Route110_TrickHousePuzzle7_EventScript_26E302
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B
-	lockall
-	delay 32
-	checkflag FLAG_0x0C5
-	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E113
-	checkflag FLAG_0x0C5
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E172
-	special DrawWholeMapView
-	playse SE_TK_KASYA
-	checkflag FLAG_0x0C5
-	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E307
-	checkflag FLAG_0x0C5
-	goto_eq Route110_TrickHousePuzzle7_EventScript_26E30C
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA
-	lockall
-	delay 32
-	checkflag FLAG_0x0C6
-	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E126
-	checkflag FLAG_0x0C6
-	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E185
-	special DrawWholeMapView
-	playse SE_TK_KASYA
-	checkflag FLAG_0x0C6
-	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E311
-	checkflag FLAG_0x0C6
-	goto_eq Route110_TrickHousePuzzle7_EventScript_26E316
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E2E9:: @ 826E2E9
-	setflag FLAG_0x0C2
-	releaseall
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E2EE:: @ 826E2EE
-	clearflag FLAG_0x0C2
-	releaseall
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E2F3:: @ 826E2F3
-	setflag FLAG_0x0C3
-	releaseall
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E2F8:: @ 826E2F8
-	clearflag FLAG_0x0C3
-	releaseall
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E2FD:: @ 826E2FD
-	setflag FLAG_0x0C4
-	releaseall
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E302:: @ 826E302
-	clearflag FLAG_0x0C4
-	releaseall
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E307:: @ 826E307
-	setflag FLAG_0x0C5
-	releaseall
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E30C:: @ 826E30C
-	clearflag FLAG_0x0C5
-	releaseall
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E311:: @ 826E311
-	setflag FLAG_0x0C6
-	releaseall
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E316:: @ 826E316
-	clearflag FLAG_0x0C6
-	releaseall
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B
-	playse SE_MU_PACHI
-	waitse
-	playse SE_TU_SAA
-	mossdeepgym3 1
-	mossdeepgym1 0
-	waitmovement 0
-	mossdeepgym2
-	waitmovement 0
-	mossdeepgym4
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331
-	playse SE_MU_PACHI
-	waitse
-	playse SE_TU_SAA
-	mossdeepgym3 1
-	mossdeepgym1 1
-	waitmovement 0
-	mossdeepgym2
-	waitmovement 0
-	mossdeepgym4
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347
-	playse SE_MU_PACHI
-	waitse
-	playse SE_TU_SAA
-	mossdeepgym3 1
-	mossdeepgym1 2
-	waitmovement 0
-	mossdeepgym2
-	waitmovement 0
-	mossdeepgym4
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D
-	playse SE_MU_PACHI
-	waitse
-	playse SE_TU_SAA
-	mossdeepgym3 1
-	mossdeepgym1 3
-	waitmovement 0
-	mossdeepgym2
-	waitmovement 0
-	mossdeepgym4
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373
-	playse SE_MU_PACHI
-	waitse
-	playse SE_TU_SAA
-	mossdeepgym3 1
-	mossdeepgym1 4
-	waitmovement 0
-	mossdeepgym2
-	waitmovement 0
-	mossdeepgym4
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389
-	trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1
-	msgbox Route110_TrickHousePuzzle7_Text_26E4F4, 6
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E3A0:: @ 826E3A0
-	trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564
-	msgbox Route110_TrickHousePuzzle7_Text_26E57F, 6
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E3B7:: @ 826E3B7
-	trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604
-	msgbox Route110_TrickHousePuzzle7_Text_26E61E, 6
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E3CE:: @ 826E3CE
-	trainerbattle 0, TRAINER_MARIELA, 0, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C
-	msgbox Route110_TrickHousePuzzle7_Text_26E6BC, 6
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E3E5:: @ 826E3E5
-	trainerbattle 0, TRAINER_ALVARO, 0, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700
-	msgbox Route110_TrickHousePuzzle7_Text_26E722, 6
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E3FC:: @ 826E3FC
-	trainerbattle 0, TRAINER_EVERETT, 0, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB
-	msgbox Route110_TrickHousePuzzle7_Text_26E7C4, 6
-	end
-
-Route110_TrickHousePuzzle7_EventScript_26E413:: @ 826E413
-	.string "{PLAYER} wrote down the secret code\n"
-	.string "on the door.\p"
-	.string "“TRICK MASTER is huggable.”\n"
-	.string "… … … … … … … …\p"
-	.string "The lock clicked open!$"
-
-Route110_TrickHousePuzzle7_Text_26E481: @ 826E481
-	.string "The TRICK MASTER always vanishes\n"
-	.string "like smoke. How does he do it?$"
-
-Route110_TrickHousePuzzle7_Text_26E4C1: @ 826E4C1
-	.string "Aiyeeeh! You’re much too strong!\n"
-	.string "How do you do it?$"
-
-Route110_TrickHousePuzzle7_Text_26E4F4: @ 826E4F4
-	.string "I wish I could appear and disappear as\n"
-	.string "if I were smoke, too.$"
-
-Route110_TrickHousePuzzle7_Text_26E531: @ 826E531
-	.string "Going around the same spot…\n"
-	.string "It begets ill fortune…$"
-
-Route110_TrickHousePuzzle7_Text_26E564: @ 826E564
-	.string "Defeated!\n"
-	.string "It’s a bad sign…$"
-
-Route110_TrickHousePuzzle7_Text_26E57F: @ 826E57F
-	.string "I’ve circled the same spot over ten\n"
-	.string "times now… It’s ill fortune…$"
-
-Route110_TrickHousePuzzle7_Text_26E5C0: @ 826E5C0
-	.string "Whoever wins will get through here\n"
-	.string "first. That’s the feeling I get.$"
-
-Route110_TrickHousePuzzle7_Text_26E604: @ 826E604
-	.string "Oh!\n"
-	.string "Well, go ahead, then!$"
-
-Route110_TrickHousePuzzle7_Text_26E61E: @ 826E61E
-	.string "You’re solving all the puzzles in the\n"
-	.string "TRICK HOUSE. That’s the feeling I get.$"
-
-Route110_TrickHousePuzzle7_Text_26E66B: @ 826E66B
-	.string "Nufufufu, here at last!\n"
-	.string "Let’s get right with it!$"
-
-Route110_TrickHousePuzzle7_Text_26E69C: @ 826E69C
-	.string "You’re so casual about winning!$"
-
-Route110_TrickHousePuzzle7_Text_26E6BC: @ 826E6BC
-	.string "Humph! I’m not upset!\n"
-	.string "Not me!$"
-
-Route110_TrickHousePuzzle7_Text_26E6DA: @ 826E6DA
-	.string "I ever so closely watched you coming!$"
-
-Route110_TrickHousePuzzle7_Text_26E700: @ 826E700
-	.string "This outcome I didn’t see coming…$"
-
-Route110_TrickHousePuzzle7_Text_26E722: @ 826E722
-	.string "Well, anyway, we both picked a weird\n"
-	.string "place to get acquainted.\p"
-	.string "As one weirdo to another,\n"
-	.string "let’s do our best!$"
-
-Route110_TrickHousePuzzle7_Text_26E78D: @ 826E78D
-	.string "It’s awfully cramped in here…$"
-
-Route110_TrickHousePuzzle7_Text_26E7AB: @ 826E7AB
-	.string "Oh, yes, strong you are.$"
-
-Route110_TrickHousePuzzle7_Text_26E7C4: @ 826E7C4
-	.string "I was hoping to switch places with you\n"
-	.string "when I beat you, but…$"
-
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
deleted file mode 100644
index 094a52895..000000000
--- a/data/scripts/maps/Route111.inc
+++ /dev/null
@@ -1,756 +0,0 @@
-Route111_MapScripts:: @ 81F0CA7
-	map_script 1, Route111_MapScript1_1F0CBC
-	map_script 3, Route111_MapScript1_1F0D87
-	map_script 4, Route111_MapScript2_1F0E46
-	map_script 2, Route111_MapScript2_1F0E56
-	.byte 0
-
-Route111_MapScript1_1F0CBC: @ 81F0CBC
-	checkflag FLAG_0x0E4
-	call_if 0, Route111_EventScript_1F0CD1
-	compare VAR_0x40CB, 1
-	call_if 1, Route111_EventScript_1F0CE4
-	end
-
-Route111_EventScript_1F0CD1:: @ 81F0CD1
-	setmetatile 29, 86, 124, 1
-	setmetatile 29, 87, 145, 1
-	return
-
-Route111_EventScript_1F0CE4:: @ 81F0CE4
-	setmetatile 18, 53, 984, 0
-	setmetatile 19, 53, 985, 0
-	setmetatile 20, 53, 986, 0
-	setmetatile 18, 54, 992, 0
-	setmetatile 19, 54, 993, 0
-	setmetatile 20, 54, 994, 0
-	setmetatile 18, 55, 1000, 0
-	setmetatile 19, 55, 1001, 0
-	setmetatile 20, 55, 1002, 0
-	setmetatile 18, 56, 1008, 0
-	setmetatile 19, 56, 1009, 0
-	setmetatile 20, 56, 1010, 0
-	setmetatile 18, 57, 987, 0
-	setmetatile 19, 57, 988, 0
-	setmetatile 20, 57, 989, 0
-	setmetatile 18, 58, 995, 0
-	setmetatile 19, 58, 996, 0
-	setmetatile 20, 58, 997, 0
-	return
-
-Route111_MapScript1_1F0D87: @ 81F0D87
-	setvar VAR_0x40D6, 0
-	special sub_81BE79C
-	checkflag FLAG_0x14E
-	call_if 0, Route111_EventScript_1F0E3C
-	compare VAR_0x40CB, 1
-	call_if 1, Route111_EventScript_1F0DC2
-	compare VAR_0x40CB, 2
-	call_if 1, Route111_EventScript_1F0E40
-	call Route111_EventScript_1F0DE6
-	call Route111_EventScript_28CCC7
-	checktrainerflag TRAINER_VICKY
-	goto_if 0, Route111_EventScript_1F0E26
-	end
-
-Route111_EventScript_1F0DC2:: @ 81F0DC2
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq Route111_EventScript_1F0DDA
-	compare VAR_RESULT, 1
-	goto_eq Route111_EventScript_1F0DE0
-	return
-
-Route111_EventScript_1F0DDA:: @ 81F0DDA
-	setvar VAR_OBJ_GFX_ID_0, 100
-	return
-
-Route111_EventScript_1F0DE0:: @ 81F0DE0
-	setvar VAR_OBJ_GFX_ID_0, 105
-	return
-
-Route111_EventScript_1F0DE6:: @ 81F0DE6
-	getplayerxy VAR_TEMP_0, VAR_TEMP_1
-	compare VAR_TEMP_1, 34
-	goto_if 0, Route111_EventScript_1F0E25
-	compare VAR_TEMP_1, 107
-	goto_if 2, Route111_EventScript_1F0E25
-	compare VAR_TEMP_1, 72
-	goto_if 2, Route111_EventScript_1F0E22
-	compare VAR_TEMP_0, 2000
-	goto_if 2, Route111_EventScript_1F0E25
-	compare VAR_TEMP_0, 8
-	goto_if 0, Route111_EventScript_1F0E25
-
-Route111_EventScript_1F0E22:: @ 81F0E22
-	setweather 8
-
-Route111_EventScript_1F0E25:: @ 81F0E25
-	return
-
-Route111_EventScript_1F0E26:: @ 81F0E26
-	clearflag FLAG_0x300
-	setflag FLAG_0x301
-	setflag FLAG_0x302
-	setflag FLAG_0x303
-	cleartrainerflag TRAINER_VICTOR
-	cleartrainerflag TRAINER_VICTORIA
-	cleartrainerflag TRAINER_VIVI
-	end
-
-Route111_EventScript_1F0E3C:: @ 81F0E3C
-	setmaplayoutindex 392
-	return
-
-Route111_EventScript_1F0E40:: @ 81F0E40
-	setvar VAR_0x40CB, 3
-	return
-
-Route111_MapScript2_1F0E46: @ 81F0E46
-	map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E50
-	.2byte 0
-
-Route111_EventScript_1F0E50:: @ 81F0E50
-	hideobjectat 255, LITTLEROOT_TOWN
-	end
-
-Route111_MapScript2_1F0E56: @ 81F0E56
-	map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E60
-	.2byte 0
-
-Route111_EventScript_1F0E60:: @ 81F0E60
-	lockall
-	special sub_81BEB68
-	waitstate
-	delay 24
-	playse SE_RU_HYUU
-	addobject 45
-	special sub_81BE7F4
-	waitstate
-	showobjectat 255, LITTLEROOT_TOWN
-	removeobject 45
-	delay 16
-	turnobject 255, 2
-	delay 16
-	special sub_81BEB54
-	waitstate
-	special sub_81BEB7C
-	waitstate
-	setvar VAR_0x40CB, 2
-	clearflag FLAG_0x36A
-	checkflag FLAG_0x150
-	goto_eq Route111_EventScript_1F0EA7
-	msgbox Route111_Text_1F1C74, 4
-	releaseall
-	end
-
-Route111_EventScript_1F0EA7:: @ 81F0EA7
-	msgbox Route111_Text_1F1C9F, 4
-	releaseall
-	end
-
-Route111_Movement_1F0EB1:: @ 81F0EB1
-	store_lock_anim
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	step_end
-
-Route111_EventScript_1F0EB9:: @ 81F0EB9
-	lock
-	faceplayer
-	dodailyevents
-	checkflag FLAG_0x92C
-	goto_eq Route111_EventScript_1F0EF4
-	msgbox Route111_Text_2A6EBD, 4
-	giveitem_std ITEM_RAZZ_BERRY
-	compare VAR_RESULT, 0
-	goto_eq Route111_EventScript_272054
-	setflag FLAG_0x92C
-	special GetPlayerBigGuyGirlString
-	msgbox Route111_Text_2A6F3D, 4
-	release
-	end
-
-Route111_EventScript_1F0EF4:: @ 81F0EF4
-	msgbox Route111_Text_2A6F9A, 4
-	release
-	end
-
-Route111_EventScript_1F0EFE:: @ 81F0EFE
-	lockall
-	setvar VAR_0x8004, 0
-	goto Route111_EventScript_1F0F2E
-	end
-
-Route111_EventScript_1F0F0A:: @ 81F0F0A
-	lockall
-	setvar VAR_0x8004, 1
-	goto Route111_EventScript_1F0F2E
-	end
-
-Route111_EventScript_1F0F16:: @ 81F0F16
-	lockall
-	setvar VAR_0x8004, 2
-	goto Route111_EventScript_1F0F2E
-	end
-
-Route111_EventScript_1F0F22:: @ 81F0F22
-	lockall
-	setvar VAR_0x8004, 3
-	goto Route111_EventScript_1F0F2E
-	end
-
-Route111_EventScript_1F0F2E:: @ 81F0F2E
-	checkitem ITEM_GO_GOGGLES, 1
-	compare VAR_RESULT, 0
-	goto_eq Route111_EventScript_1F0F45
-	setvar VAR_TEMP_3, 1
-	releaseall
-	end
-
-Route111_EventScript_1F0F45:: @ 81F0F45
-	msgbox gUnknown_08272C5F, 4
-	closemessage
-	compare VAR_0x8004, 0
-	call_if 1, Route111_EventScript_1F0F7C
-	compare VAR_0x8004, 1
-	call_if 1, Route111_EventScript_1F0F87
-	compare VAR_0x8004, 2
-	call_if 1, Route111_EventScript_1F0F92
-	compare VAR_0x8004, 3
-	call_if 1, Route111_EventScript_1F0F9D
-	releaseall
-	end
-
-Route111_EventScript_1F0F7C:: @ 81F0F7C
-	applymovement 255, Route111_Movement_1F0FA8
-	waitmovement 0
-	return
-
-Route111_EventScript_1F0F87:: @ 81F0F87
-	applymovement 255, Route111_Movement_1F0FAA
-	waitmovement 0
-	return
-
-Route111_EventScript_1F0F92:: @ 81F0F92
-	applymovement 255, Route111_Movement_1F0FAC
-	waitmovement 0
-	return
-
-Route111_EventScript_1F0F9D:: @ 81F0F9D
-	applymovement 255, Route111_Movement_1F0FAE
-	waitmovement 0
-	return
-
-Route111_Movement_1F0FA8: @ 81F0FA8
-	walk_up
-	step_end
-
-Route111_Movement_1F0FAA: @ 81F0FAA
-	walk_down
-	step_end
-
-Route111_Movement_1F0FAC: @ 81F0FAC
-	walk_left
-	step_end
-
-Route111_Movement_1F0FAE: @ 81F0FAE
-	walk_right
-	step_end
-
-Route111_EventScript_1F0FB0:: @ 81F0FB0
-	setweather 2
-	fadenewbgm MUS_DOORO_X1
-	doweather
-	setvar VAR_TEMP_3, 0
-	end
-
-Route111_EventScript_1F0FBD:: @ 81F0FBD
-	setweather 8
-	fadenewbgm MUS_ASHROAD
-	doweather
-	end
-
-Route111_EventScript_1F0FC5:: @ 81F0FC5
-	lock
-	faceplayer
-	setflag FLAG_LANDMARK_WINSTRATE_FAMILY
-	msgbox Route111_Text_1F1475, 5
-	compare VAR_RESULT, 1
-	goto_eq Route111_EventScript_1F0FE7
-	msgbox Route111_Text_1F14F5, 4
-	release
-	end
-
-Route111_EventScript_1F0FE7:: @ 81F0FE7
-	msgbox Route111_Text_1F1523, 4
-	trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_1F1542
-	applymovement 1, Route111_Movement_2725A6
-	waitmovement 0
-	call Route111_EventScript_1F113C
-	msgbox Route111_Text_1F156F, 4
-	closemessage
-	applymovement 1, Route111_Movement_1F114A
-	waitmovement 0
-	removeobject 1
-	call Route111_EventScript_1F1143
-	applymovement 255, Route111_Movement_1F114F
-	waitmovement 0
-	call Route111_EventScript_1F113C
-	addobject 2
-	applymovement 2, Route111_Movement_1F114D
-	waitmovement 0
-	call Route111_EventScript_1F1143
-	msgbox Route111_Text_1F159D, 4
-	trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_1F1616
-	applymovement 2, Route111_Movement_2725A6
-	waitmovement 0
-	call Route111_EventScript_1F113C
-	msgbox Route111_Text_1F1645, 4
-	closemessage
-	applymovement 2, Route111_Movement_1F114A
-	waitmovement 0
-	removeobject 2
-	call Route111_EventScript_1F1143
-	applymovement 255, Route111_Movement_1F114F
-	waitmovement 0
-	call Route111_EventScript_1F113C
-	addobject 3
-	applymovement 3, Route111_Movement_1F114D
-	waitmovement 0
-	call Route111_EventScript_1F1143
-	msgbox Route111_Text_1F167E, 4
-	trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_1F16C6
-	applymovement 3, Route111_Movement_2725A6
-	waitmovement 0
-	call Route111_EventScript_1F113C
-	msgbox Route111_Text_1F16DC, 4
-	closemessage
-	applymovement 3, Route111_Movement_1F114A
-	waitmovement 0
-	removeobject 3
-	call Route111_EventScript_1F1143
-	applymovement 255, Route111_Movement_1F114F
-	waitmovement 0
-	call Route111_EventScript_1F113C
-	addobject 4
-	applymovement 4, Route111_Movement_1F114D
-	waitmovement 0
-	call Route111_EventScript_1F1143
-	msgbox Route111_Text_1F16FB, 4
-	trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_1F1756
-	msgbox Route111_Text_1F1788, 4
-	closemessage
-	applymovement 4, Route111_Movement_2725A6
-	waitmovement 0
-	call Route111_EventScript_1F113C
-	applymovement 4, Route111_Movement_1F114A
-	waitmovement 0
-	removeobject 4
-	call Route111_EventScript_1F1143
-	release
-	end
-
-Route111_EventScript_1F113C:: @ 81F113C
-	opendoor 13, 113
-	waitdooranim
-	return
-
-Route111_EventScript_1F1143:: @ 81F1143
-	closedoor 13, 113
-	waitdooranim
-	return
-
-Route111_Movement_1F114A: @ 81F114A
-	walk_in_place_fastest_up
-	walk_up
-	step_end
-
-Route111_Movement_1F114D: @ 81F114D
-	walk_down
-	step_end
-
-Route111_Movement_1F114F: @ 81F114F
-	delay_16
-	delay_16
-	delay_16
-	step_end
-
-Route111_EventScript_1F1153:: @ 81F1153
-	msgbox Route111_Text_1F18CE, 3
-	end
-
-Route111_EventScript_1F115C:: @ 81F115C
-	msgbox Route111_Text_1F18E8, 3
-	end
-
-Route111_EventScript_1F1165:: @ 81F1165
-	msgbox Route111_Text_1F1921, 3
-	end
-
-Route111_EventScript_1F116E:: @ 81F116E
-	msgbox Route111_Text_1F1937, 3
-	end
-
-Route111_EventScript_1F1177:: @ 81F1177
-	msgbox Route111_Text_1F194D, 3
-	end
-
-Route111_EventScript_1F1180:: @ 81F1180
-	msgbox Route111_Text_1F1987, 3
-	end
-
-Route111_EventScript_1F1189:: @ 81F1189
-	msgbox Route111_Text_1F17BA, 2
-	end
-
-Route111_EventScript_1F1192:: @ 81F1192
-	msgbox Route111_Text_1F186E, 2
-	end
-
-Route111_EventScript_1F119B:: @ 81F119B
-	lock
-	faceplayer
-	compare VAR_0x40CB, 3
-	goto_eq Route111_EventScript_1F11C6
-	compare VAR_0x40CB, 2
-	goto_eq Route111_EventScript_1F11D0
-	checkflag FLAG_0x14E
-	goto_eq Route111_EventScript_1F11DA
-	msgbox Route111_Text_1F1A22, 4
-	release
-	end
-
-Route111_EventScript_1F11C6:: @ 81F11C6
-	msgbox Route111_Text_1F1C12, 4
-	release
-	end
-
-Route111_EventScript_1F11D0:: @ 81F11D0
-	msgbox Route111_Text_1F1B92, 4
-	release
-	end
-
-Route111_EventScript_1F11DA:: @ 81F11DA
-	msgbox Route111_Text_1F1AC7, 4
-	release
-	end
-
-Route111_EventScript_1F11E4:: @ 81F11E4
-	lockall
-	applymovement 46, Route111_Movement_27259E
-	waitmovement 0
-	msgbox Route111_Text_1F1CCA, 4
-	closemessage
-	applymovement 46, Route111_Movement_2725A2
-	waitmovement 0
-	releaseall
-	end
-
-Route111_EventScript_1F1204:: @ 81F1204
-	trainerbattle 0, TRAINER_DREW, 0, Route111_Text_29878E, Route111_Text_29880A
-	msgbox Route111_Text_298853, 6
-	end
-
-Route111_EventScript_1F121B:: @ 81F121B
-	trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_2988A3, Route111_Text_298908
-	msgbox Route111_Text_29891B, 6
-	end
-
-Route111_EventScript_1F1232:: @ 81F1232
-	trainerbattle 0, TRAINER_BEAU, 0, Route111_Text_29898E, Route111_Text_2989E6
-	msgbox Route111_Text_298A03, 6
-	end
-
-Route111_EventScript_1F1249:: @ 81F1249
-	trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_298A65, Route111_Text_298AAF
-	msgbox Route111_Text_298AC0, 6
-	end
-
-Route111_EventScript_1F1260:: @ 81F1260
-	trainerbattle 2, TRAINER_DUSTY_1, 0, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route111_EventScript_1F12AB
-	msgbox Route111_Text_298B9A, 4
-	release
-	end
-
-Route111_EventScript_1F128C:: @ 81F128C
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route111_Text_298C00, 4
-	setvar VAR_0x8004, 44
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 44
-	callstd 8
-	release
-	end
-
-Route111_EventScript_1F12AB:: @ 81F12AB
-	trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_298C5F, Route111_Text_298CD2
-	msgbox Route111_Text_298D0C, 6
-	end
-
-Route111_EventScript_1F12C2:: @ 81F12C2
-	trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_298DA9, Route111_Text_298DD8
-	msgbox Route111_Text_298DF1, 6
-	end
-
-Route111_EventScript_1F12D9:: @ 81F12D9
-	trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_298E2F, Route111_Text_298E6E
-	msgbox Route111_Text_298E8C, 6
-	end
-
-Route111_EventScript_1F12F0:: @ 81F12F0
-	trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_298EE6, Route111_Text_298F14
-	msgbox Route111_Text_298F26, 6
-	end
-
-Route111_EventScript_1F1307:: @ 81F1307
-	trainerbattle 2, TRAINER_WILTON_1, 0, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route111_EventScript_1F1352
-	msgbox Route111_Text_298FD4, 4
-	release
-	end
-
-Route111_EventScript_1F1333:: @ 81F1333
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route111_Text_29903D, 4
-	setvar VAR_0x8004, 78
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 78
-	callstd 8
-	release
-	end
-
-Route111_EventScript_1F1352:: @ 81F1352
-	trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_29909B, Route111_Text_2990EE
-	msgbox Route111_Text_299102, 6
-	end
-
-Route111_EventScript_1F1369:: @ 81F1369
-	trainerbattle 2, TRAINER_BROOKE_1, 0, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route111_EventScript_1F13B4
-	msgbox Route111_Text_2991C2, 4
-	release
-	end
-
-Route111_EventScript_1F1395:: @ 81F1395
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route111_Text_29921D, 4
-	setvar VAR_0x8004, 94
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 94
-	callstd 8
-	release
-	end
-
-Route111_EventScript_1F13B4:: @ 81F13B4
-	trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_29925D, Route111_Text_2992D6
-	msgbox Route111_Text_2992F5, 6
-	end
-
-Route111_EventScript_1F13CB:: @ 81F13CB
-	trainerbattle 0, TRAINER_HAYDEN, 0, Route111_Text_299682, Route111_Text_2996BE
-	msgbox Route111_Text_2996C5, 6
-	end
-
-Route111_EventScript_1F13E2:: @ 81F13E2
-	trainerbattle 0, TRAINER_BIANCA, 0, Route111_Text_2996FE, Route111_Text_29973D
-	msgbox Route111_Text_29975D, 6
-	end
-
-Route111_EventScript_1F13F9:: @ 81F13F9
-	trainerbattle 0, TRAINER_TYRON, 0, Route111_Text_299524, Route111_Text_299549
-	msgbox Route111_Text_299576, 6
-	end
-
-Route111_EventScript_1F1410:: @ 81F1410
-	trainerbattle 0, TRAINER_CELINA, 0, Route111_Text_2995F0, Route111_Text_299625
-	msgbox Route111_Text_29964B, 6
-	end
-
-Route111_EventScript_1F1427:: @ 81F1427
-	trainerbattle 0, TRAINER_CELIA, 0, Route111_Text_29934B, Route111_Text_299384
-	msgbox Route111_Text_2993A7, 6
-	end
-
-Route111_EventScript_1F143E:: @ 81F143E
-	trainerbattle 0, TRAINER_BRYAN, 0, Route111_Text_299401, Route111_Text_299431
-	msgbox Route111_Text_29945F, 6
-	end
-
-Route111_EventScript_1F1455:: @ 81F1455
-	trainerbattle 0, TRAINER_BRANDEN, 0, Route111_Text_299493, Route111_Text_2994C5
-	msgbox Route111_Text_2994FB, 6
-	end
-
-Route111_EventScript_1F146C:: @ 81F146C
-	msgbox Route111_Text_1F1D61, 3
-	end
-
-Route111_Text_1F1475: @ 81F1475
-	.string "Hello! I take it you’re a traveler.\p"
-	.string "How’s this? What do you say to taking\n"
-	.string "on our family of four in a series of\l"
-	.string "POKéMON battles?$"
-
-Route111_Text_1F14F5: @ 81F14F5
-	.string "Is that so?\n"
-	.string "Drop in, if you change your mind!$"
-
-Route111_Text_1F1523: @ 81F1523
-	.string "That’s the spirit! I like you!$"
-
-Route111_Text_1F1542: @ 81F1542
-	.string "Aiyah!\n"
-	.string "You’re a lot tougher than I expected!$"
-
-Route111_Text_1F156F: @ 81F156F
-	.string "Hey, all!\n"
-	.string "I’ve found a pretty strong TRAINER!$"
-
-Route111_Text_1F159D: @ 81F159D
-	.string "Oh, my goodness! Aren’t you young?\p"
-	.string "You must be quite the TRAINER to beat\n"
-	.string "my husband, though.\p"
-	.string "It’s my turn to battle now!$"
-
-Route111_Text_1F1616: @ 81F1616
-	.string "Oh, gosh!\n"
-	.string "I can’t get over how strong you are!$"
-
-Route111_Text_1F1645: @ 81F1645
-	.string "There’s a strong TRAINER here!\n"
-	.string "This one’s really strong!$"
-
-Route111_Text_1F167E: @ 81F167E
-	.string "You’re stronger than Mommy? Wow!\p"
-	.string "But I’m strong, too!\n"
-	.string "Really! Honestly!$"
-
-Route111_Text_1F16C6: @ 81F16C6
-	.string "Huh? Did I just lose?$"
-
-Route111_Text_1F16DC: @ 81F16DC
-	.string "This stinks…\p"
-	.string "…Snivel… Grandma!$"
-
-Route111_Text_1F16FB: @ 81F16FB
-	.string "How dare you make my granddaughter\n"
-	.string "cry!\p"
-	.string "For that, I’m going to smack you!\n"
-	.string "Prepare to lose!$"
-
-Route111_Text_1F1756: @ 81F1756
-	.string "Kwah! You are strong…\n"
-	.string "My granddaughter was right…$"
-
-Route111_Text_1F1788: @ 81F1788
-	.string "If you’re not in any hurry,\n"
-	.string "visit with us awhile.$"
-
-Route111_Text_1F17BA: @ 81F17BA
-	.string "If you don’t raise your POKéMON some\n"
-	.string "more, it could be tough to keep winning\l"
-	.string "up through the ranks.\p"
-	.string "I’ve heard the POKéMON LEAGUE’s\n"
-	.string "ELITE FOUR are far stronger than\l"
-	.string "any GYM LEADER.$"
-
-Route111_Text_1F186E: @ 81F186E
-	.string "I challenged the WINSTRATE family,\n"
-	.string "but four matches in a row is tough\l"
-	.string "going… They destroyed me.$"
-
-Route111_Text_1F18CE: @ 81F18CE
-	.string "ROUTE 111\n"
-	.string "{0x7A} MAUVILLE CITY$"
-
-Route111_Text_1F18E8: @ 81F18E8
-	.string "“Our family’s hearts beat as one!”\n"
-	.string "THE WINSTRATE’S HOUSE$"
-
-Route111_Text_1F1921: @ 81F1921
-	.string "ROUTE 111\n"
-	.string "{0x7B} ROUTE 112$"
-
-Route111_Text_1F1937: @ 81F1937
-	.string "ROUTE 111\n"
-	.string "{0x7B} ROUTE 113$"
-
-Route111_Text_1F194D: @ 81F194D
-	.string "OLD LADY’S REST STOP\n"
-	.string "“Come in and rest your tired bones.”$"
-
-Route111_Text_1F1987: @ 81F1987
-	.string "TRAINER TIPS\p"
-	.string "One of the indicators of a POKéMON’s\n"
-	.string "powerfulness is SP. ATK. It stands for\l"
-	.string "“SPECIAL ATTACK.”\p"
-	.string "Likewise, SP. DEF stands for “SPECIAL\n"
-	.string "DEFENSE.”$"
-
-Route111_Text_1F1A22: @ 81F1A22
-	.string "There should be a tower made of sand\n"
-	.string "around here somewhere.\p"
-	.string "But for some reason, it can be seen\n"
-	.string "sometimes, and sometimes not.\p"
-	.string "That’s why I call it the MIRAGE TOWER.$"
-
-Route111_Text_1F1AC7: @ 81F1AC7
-	.string "I see it!\n"
-	.string "The tower of sand!\p"
-	.string "The sand tower they called a mirage\n"
-	.string "is clearly visible!\p"
-	.string "But it looks so fragile…\n"
-	.string "It could crumble away anytime…\p"
-	.string "I want to go inside it, but I can’t\n"
-	.string "get my courage up for it…$"
-
-Route111_Text_1F1B92: @ 81F1B92
-	.string "Whoa…\n"
-	.string "That was shocking.\p"
-	.string "Sand rained down in chunks all of\n"
-	.string "a sudden.\p"
-	.string "What was it like inside?\n"
-	.string "Were there sandy ghosts and such?$"
-
-Route111_Text_1F1C12: @ 81F1C12
-	.string "Since I spoke to you, the tower of sand\n"
-	.string "hasn’t been seen.\p"
-	.string "Perhaps it really was\n"
-	.string "the MIRAGE TOWER…$"
-
-Route111_Text_1F1C74: @ 81F1C74
-	.string "The CLAW FOSSIL disappeared into\n"
-	.string "the sand…$"
-
-Route111_Text_1F1C9F: @ 81F1C9F
-	.string "The ROOT FOSSIL disappeared into\n"
-	.string "the sand…$"
-
-Route111_Text_1F1CCA: @ 81F1CCA
-	.string "Oh, no!\p"
-	.string "My uncle in MAUVILLE told me to take\n"
-	.string "ROCK SMASH with me if I was going to\l"
-	.string "ROUTE 111!\p"
-	.string "My uncle? He lives across from\n"
-	.string "the bike shop in MAUVILLE.$"
-
-Route111_Text_1F1D61: @ 81F1D61
-	.string "{0x7C} TRAINER HILL ENTRANCE\p"
-	.string "“Scale the heights, you hot-blooded\n"
-	.string "TRAINERS!”$"
-
diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc
deleted file mode 100644
index 94e442a48..000000000
--- a/data/scripts/maps/Route112_CableCarStation.inc
+++ /dev/null
@@ -1,99 +0,0 @@
-Route112_CableCarStation_MapScripts:: @ 822AABE
-	map_script 3, Route112_CableCarStation_MapScript1_22AAC9
-	map_script 2, Route112_CableCarStation_MapScript2_22AAE9
-	.byte 0
-
-Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9
-	setescapewarp ROUTE_112, 255, 28, 28
-	compare VAR_0x40A3, 2
-	call_if 1, Route112_CableCarStation_EventScript_22AADD
-	end
-
-Route112_CableCarStation_EventScript_22AADD:: @ 822AADD
-	setobjectxyperm 1, 7, 4
-	setobjectmovementtype 1, 9
-	return
-
-Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9
-	map_script_2 VAR_0x40A3, 2, Route112_CableCarStation_EventScript_22AAF3
-	.2byte 0
-
-Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3
-	lockall
-	applymovement 255, Route112_CableCarStation_Movement_22AB80
-	applymovement 1, Route112_CableCarStation_Movement_22AB76
-	waitmovement 0
-	setvar VAR_0x40A3, 0
-	setobjectxyperm 1, 6, 7
-	setobjectmovementtype 1, 8
-	releaseall
-	end
-
-Route112_CableCarStation_EventScript_22AB17:: @ 822AB17
-	lock
-	faceplayer
-	msgbox Route112_CableCarStation_Text_22AB85, 5
-	compare VAR_RESULT, 1
-	goto_eq Route112_CableCarStation_EventScript_22AB38
-	compare VAR_RESULT, 0
-	goto_eq Route112_CableCarStation_EventScript_22AB67
-	end
-
-Route112_CableCarStation_EventScript_22AB38:: @ 822AB38
-	msgbox Route112_CableCarStation_Text_22ABC2, 4
-	closemessage
-	applymovement 1, Route112_CableCarStation_Movement_22AB71
-	applymovement 255, Route112_CableCarStation_Movement_22AB7B
-	waitmovement 0
-	setvar VAR_0x8004, 0
-	setvar VAR_0x40A3, 1
-	incrementgamestat 48
-	special CableCarWarp
-	special sub_814FC9C
-	waitstate
-	release
-	end
-
-Route112_CableCarStation_EventScript_22AB67:: @ 822AB67
-	msgbox Route112_CableCarStation_Text_22ABD8, 4
-	release
-	end
-
-Route112_CableCarStation_Movement_22AB71: @ 822AB71
-	walk_up
-	walk_up
-	walk_right
-	walk_in_place_fastest_left
-	step_end
-
-Route112_CableCarStation_Movement_22AB76: @ 822AB76
-	delay_16
-	walk_left
-	walk_down
-	walk_down
-	step_end
-
-Route112_CableCarStation_Movement_22AB7B: @ 822AB7B
-	walk_up
-	walk_up
-	walk_up
-	delay_16
-	step_end
-
-Route112_CableCarStation_Movement_22AB80: @ 822AB80
-	walk_down
-	walk_down
-	walk_down
-	delay_16
-	step_end
-
-Route112_CableCarStation_Text_22AB85: @ 822AB85
-	.string "The CABLE CAR is ready to go up.\n"
-	.string "Would you like to be on it?$"
-
-Route112_CableCarStation_Text_22ABC2: @ 822ABC2
-	.string "Please step this way.$"
-
-Route112_CableCarStation_Text_22ABD8: @ 822ABD8
-	.string "Please ride with us another time.$"
-
diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc
deleted file mode 100644
index 0e9cf9636..000000000
--- a/data/scripts/maps/Route121_SafariZoneEntrance.inc
+++ /dev/null
@@ -1,142 +0,0 @@
-Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB
-	map_script 2, Route121_SafariZoneEntrance_MapScript2_22BBC1
-	.byte 0
-
-Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1
-	map_script_2 VAR_0x40A4, 1, Route121_SafariZoneEntrance_EventScript_22BBCB
-	.2byte 0
-
-Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB
-	lockall
-	applymovement 255, Route121_SafariZoneEntrance_Movement_22BBDD
-	waitmovement 0
-	setvar VAR_0x40A4, 0
-	releaseall
-	end
-
-Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-Route121_SafariZoneEntrance_EventScript_22BBE6:: @ 822BBE6
-	msgbox Route121_SafariZoneEntrance_Text_2A4D12, 2
-	end
-
-Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF
-	lock
-	faceplayer
-	msgbox Route121_SafariZoneEntrance_Text_2A4E46, 5
-	compare VAR_RESULT, 1
-	goto_eq Route121_SafariZoneEntrance_EventScript_22BC0E
-	msgbox Route121_SafariZoneEntrance_Text_2A4E7E, 4
-	release
-	end
-
-Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E
-	msgbox Route121_SafariZoneEntrance_Text_2A4EA1, 4
-	release
-	end
-
-Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18
-	lockall
-	applymovement 255, Route121_SafariZoneEntrance_Movement_2725A6
-	waitmovement 0
-	showmoneybox 0, 0, 0
-	msgbox Route121_SafariZoneEntrance_Text_2A4F74, 5
-	compare VAR_RESULT, 1
-	goto_eq Route121_SafariZoneEntrance_EventScript_22BC48
-	msgbox Route121_SafariZoneEntrance_Text_2A4FD7, 4
-	goto Route121_SafariZoneEntrance_EventScript_22BD06
-	end
-
-Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare VAR_RESULT, 0
-	goto_eq Route121_SafariZoneEntrance_EventScript_22BCEA
-	call Route121_SafariZoneEntrance_EventScript_22BCBF
-	checkmoney 0x1f4, 0
-	compare VAR_RESULT, 0
-	goto_eq Route121_SafariZoneEntrance_EventScript_22BCF8
-	playse SE_REGI
-	msgbox Route121_SafariZoneEntrance_Text_2A501B, 4
-	takemoney 0x1f4, 0
-	updatemoneybox 0, 0
-	nop
-	msgbox Route121_SafariZoneEntrance_Text_2A5036, 4
-	playfanfare MUS_FANFA4
-	message Route121_SafariZoneEntrance_Text_2A5052
-	waitfanfare
-	msgbox Route121_SafariZoneEntrance_Text_2A506F, 4
-	closemessage
-	hidemoneybox
-	nop
-	nop
-	applymovement 255, Route121_SafariZoneEntrance_Movement_22BD18
-	waitmovement 0
-	special EnterSafariMode
-	setvar VAR_0x40A4, 2
-	clearflag FLAG_0x05D
-	warp SAFARI_ZONE_SOUTH, 255, 32, 33
-	waitstate
-	end
-
-Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF
-	getpartysize
-	compare VAR_RESULT, 6
-	goto_if 5, Route121_SafariZoneEntrance_EventScript_22BCE9
-	specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace
-	compare VAR_RESULT, 1
-	goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9
-	msgbox Route121_SafariZoneEntrance_Text_2A50E5, 4
-	goto Route121_SafariZoneEntrance_EventScript_22BD06
-	end
-
-Route121_SafariZoneEntrance_EventScript_22BCE9:: @ 822BCE9
-	return
-
-Route121_SafariZoneEntrance_EventScript_22BCEA:: @ 822BCEA
-	msgbox Route121_SafariZoneEntrance_Text_2A5105, 4
-	goto Route121_SafariZoneEntrance_EventScript_22BD06
-	end
-
-Route121_SafariZoneEntrance_EventScript_22BCF8:: @ 822BCF8
-	msgbox Route121_SafariZoneEntrance_Text_2A4FF7, 4
-	goto Route121_SafariZoneEntrance_EventScript_22BD06
-	end
-
-Route121_SafariZoneEntrance_EventScript_22BD06:: @ 822BD06
-	closemessage
-	hidemoneybox
-	nop
-	nop
-	applymovement 255, Route121_SafariZoneEntrance_Movement_22BD16
-	waitmovement 0
-	releaseall
-	end
-
-Route121_SafariZoneEntrance_Movement_22BD16: @ 822BD16
-	walk_right
-	step_end
-
-Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_down
-	delay_16
-	step_end
-
-Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21
-	msgbox Route121_SafariZoneEntrance_Text_2A55BB, 3
-	end
-
diff --git a/data/scripts/maps/Route134.inc b/data/scripts/maps/Route134.inc
deleted file mode 100644
index 8ee5b781a..000000000
--- a/data/scripts/maps/Route134.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-Route134_MapScripts:: @ 81F7644
-	map_script 5, Route134_MapScript1_1F764A
-	.byte 0
-
-Route134_MapScript1_1F764A: @ 81F764A
-	setdivewarp UNDERWATER_ROUTE_134, 255, 8, 6
-	end
-
-Route134_EventScript_1F7653:: @ 81F7653
-	trainerbattle 0, TRAINER_JACK, 0, Route134_Text_2A4571, Route134_Text_2A45BB
-	msgbox Route134_Text_2A45C5, 6
-	end
-
-Route134_EventScript_1F766A:: @ 81F766A
-	trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_2A4609, Route134_Text_2A4643
-	msgbox Route134_Text_2A464B, 6
-	end
-
-Route134_EventScript_1F7681:: @ 81F7681
-	trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_2A4682, Route134_Text_2A46BE
-	msgbox Route134_Text_2A46D2, 6
-	end
-
-Route134_EventScript_1F7698:: @ 81F7698
-	trainerbattle 0, TRAINER_AARON, 0, Route134_Text_2A479E, Route134_Text_2A47E1
-	msgbox Route134_Text_2A47FD, 6
-	end
-
-Route134_EventScript_1F76AF:: @ 81F76AF
-	trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_2A4709, Route134_Text_2A4745
-	msgbox Route134_Text_2A475D, 6
-	end
-
-Route134_EventScript_1F76C6:: @ 81F76C6
-	trainerbattle 0, TRAINER_HUDSON, 0, Route134_Text_2A4A8F, Route134_Text_2A4AC1
-	msgbox Route134_Text_2A4AD8, 6
-	end
-
-Route134_EventScript_1F76DD:: @ 81F76DD
-	trainerbattle 0, TRAINER_REYNA, 0, Route134_Text_2A49E9, Route134_Text_2A4A10
-	msgbox Route134_Text_2A4A34, 6
-	end
-
-Route134_EventScript_1F76F4:: @ 81F76F4
-	trainerbattle 0, TRAINER_MARLEY, 0, Route134_Text_2A4937, Route134_Text_2A496B
-	msgbox Route134_Text_2A49B1, 6
-	end
-
-Route134_EventScript_1F770B:: @ 81F770B
-	trainerbattle 0, TRAINER_KELVIN, 0, Route134_Text_2A4875, Route134_Text_2A489B
-	msgbox Route134_Text_2A48BD, 6
-	end
-
diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc
deleted file mode 100644
index 5e323211a..000000000
--- a/data/scripts/maps/RustboroCity.inc
+++ /dev/null
@@ -1,1310 +0,0 @@
-RustboroCity_MapScripts:: @ 81E06BD
-	map_script 3, RustboroCity_MapScript1_1E06C8
-	map_script 2, RustboroCity_MapScript2_1E070B
-	.byte 0
-
-RustboroCity_MapScript1_1E06C8: @ 81E06C8
-	setflag FLAG_VISITED_RUSTBORO_CITY
-	call RustboroCity_EventScript_271ED7
-	compare VAR_0x405A, 6
-	call_if 1, RustboroCity_EventScript_1E0707
-	getplayerxy VAR_TEMP_0, VAR_TEMP_1
-	compare VAR_0x405A, 6
-	goto_eq RustboroCity_EventScript_1E06EC
-	end
-
-RustboroCity_EventScript_1E06EC:: @ 81E06EC
-	compare VAR_TEMP_0, 11
-	goto_eq RustboroCity_EventScript_1E06FF
-	setobjectxyperm 15, 12, 15
-	end
-
-RustboroCity_EventScript_1E06FF:: @ 81E06FF
-	setobjectxyperm 15, 11, 15
-	end
-
-RustboroCity_EventScript_1E0707:: @ 81E0707
-	setflag FLAG_SPECIAL_FLAG_0x4000
-	return
-
-RustboroCity_MapScript2_1E070B: @ 81E070B
-	map_script_2 VAR_0x405A, 6, RustboroCity_EventScript_1E0715
-	.2byte 0
-
-RustboroCity_EventScript_1E0715:: @ 81E0715
-	lockall
-	setvar VAR_0x4063, 1
-	applymovement 255, RustboroCity_Movement_1E0850
-	waitmovement 0
-	playse SE_KAIDAN
-	delay 10
-	addobject 15
-	applymovement 15, RustboroCity_Movement_1E0852
-	waitmovement 0
-	playse SE_PIN
-	applymovement 15, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 15, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725A6
-	waitmovement 0
-	applymovement 15, RustboroCity_Movement_1E084E
-	waitmovement 0
-	msgbox RustboroCity_Text_1E22A5, 4
-	closemessage
-	setflag FLAG_HAS_MATCH_CALL
-	applymovement 15, RustboroCity_Movement_2725A4
-	waitmovement 0
-	playse SE_TK_KASYA
-	delay 10
-	playse SE_TK_KASYA
-	delay 10
-	playse SE_TK_KASYA
-	delay 10
-	playse SE_TK_KASYA
-	delay 20
-	applymovement 15, RustboroCity_Movement_2725AA
-	waitmovement 0
-	msgbox RustboroCity_Text_1E2331, 4
-	closemessage
-	delay 20
-	goto RustboroCity_EventScript_1E07BD
-
-RustboroCity_EventScript_1E07AC:: @ 81E07AC
-	msgbox RustboroCity_Text_1E2449, 4
-	closemessage
-	delay 10
-	goto RustboroCity_EventScript_1E07BD
-
-RustboroCity_EventScript_1E07BD:: @ 81E07BD
-	setflag FLAG_0x130
-	special sp106_CreateStartMenu
-	waitstate
-	switch VAR_RESULT
-	case 0, RustboroCity_EventScript_1E07AC
-	case 1, RustboroCity_EventScript_1E07AC
-	case 2, RustboroCity_EventScript_1E07AC
-	case 4, RustboroCity_EventScript_1E07AC
-	case 5, RustboroCity_EventScript_1E07AC
-	case 6, RustboroCity_EventScript_1E07AC
-	case 7, RustboroCity_EventScript_1E07AC
-	case 127, RustboroCity_EventScript_1E07AC
-	special sub_81C72A4
-	waitstate
-	delay 20
-	msgbox RustboroCity_Text_1E2464, 4
-	closemessage
-	applymovement 15, RustboroCity_Movement_1E085D
-	waitmovement 0
-	playse SE_KAIDAN
-	removeobject 15
-	setflag FLAG_0x34C
-	setvar VAR_0x405A, 7
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	releaseall
-	end
-
-RustboroCity_Movement_1E084E: @ 81E084E
-	walk_in_place_down
-	step_end
-
-RustboroCity_Movement_1E0850: @ 81E0850
-	walk_down
-	step_end
-
-RustboroCity_Movement_1E0852: @ 81E0852
-	walk_down
-	delay_16
-	step_end
-
-RustboroCity_Movement_1E0855: @ 81E0855
-	delay_16
-	walk_left
-	walk_down
-	walk_down
-	walk_right
-	walk_in_place_fastest_up
-	delay_16
-	step_end
-
-RustboroCity_Movement_1E085D: @ 81E085D
-	walk_up
-	step_end
-
-RustboroCity_EventScript_1E085F:: @ 81E085F
-	lock
-	faceplayer
-	checkflag FLAG_0x08E
-	goto_eq RustboroCity_EventScript_1E0874
-	msgbox RustboroCity_Text_1E123F, 4
-	release
-	end
-
-RustboroCity_EventScript_1E0874:: @ 81E0874
-	msgbox RustboroCity_Text_1E12AC, 4
-	release
-	end
-
-RustboroCity_EventScript_1E087E:: @ 81E087E
-	lock
-	faceplayer
-	msgbox RustboroCity_Text_1E1407, 4
-	release
-	end
-
-RustboroCity_EventScript_1E088A:: @ 81E088A
-	msgbox RustboroCity_Text_1E1480, 2
-	end
-
-RustboroCity_EventScript_1E0893:: @ 81E0893
-	lock
-	faceplayer
-	checkflag FLAG_BADGE01_GET
-	goto_eq RustboroCity_EventScript_1E08A8
-	msgbox RustboroCity_Text_1E130D, 4
-	release
-	end
-
-RustboroCity_EventScript_1E08A8:: @ 81E08A8
-	msgbox RustboroCity_Text_1E139E, 4
-	release
-	end
-
-RustboroCity_EventScript_1E08B2:: @ 81E08B2
-	lock
-	faceplayer
-	checkflag FLAG_0x0BC
-	goto_eq RustboroCity_EventScript_1E08C7
-	msgbox RustboroCity_Text_1E1520, 4
-	release
-	end
-
-RustboroCity_EventScript_1E08C7:: @ 81E08C7
-	msgbox RustboroCity_Text_1E1589, 4
-	release
-	end
-
-RustboroCity_EventScript_1E08D1:: @ 81E08D1
-	msgbox RustboroCity_Text_1E1633, 2
-	end
-
-RustboroCity_EventScript_1E08DA:: @ 81E08DA
-	msgbox RustboroCity_Text_1E1695, 3
-	end
-
-RustboroCity_EventScript_1E08E3:: @ 81E08E3
-	msgbox RustboroCity_Text_1E20A6, 3
-	end
-
-RustboroCity_EventScript_1E08EC:: @ 81E08EC
-	msgbox RustboroCity_Text_1E2128, 3
-	end
-
-RustboroCity_EventScript_1E08F5:: @ 81E08F5
-	msgbox RustboroCity_Text_1E2167, 3
-	end
-
-RustboroCity_EventScript_1E08FE:: @ 81E08FE
-	msgbox RustboroCity_Text_1E21B3, 3
-	end
-
-RustboroCity_EventScript_1E0907:: @ 81E0907
-	msgbox RustboroCity_Text_1E220B, 3
-	end
-
-RustboroCity_EventScript_1E0910:: @ 81E0910
-	msgbox RustboroCity_Text_1E2253, 3
-	end
-
-RustboroCity_EventScript_1E0919:: @ 81E0919
-	msgbox RustboroCity_Text_1E2296, 3
-	end
-
-RustboroCity_EventScript_1E0922:: @ 81E0922
-	lock
-	faceplayer
-	msgbox RustboroCity_Text_1E16F4, 4
-	applymovement 7, RustboroCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-RustboroCity_EventScript_1E0938:: @ 81E0938
-	lock
-	faceplayer
-	msgbox RustboroCity_Text_1E174B, 4
-	applymovement 8, RustboroCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-RustboroCity_EventScript_1E094E:: @ 81E094E
-	lock
-	faceplayer
-	msgbox RustboroCity_Text_1E1789, 4
-	release
-	end
-
-RustboroCity_EventScript_1E095A:: @ 81E095A
-	lockall
-	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
-	setvar VAR_0x8004, 0
-	goto RustboroCity_EventScript_1E09CD
-	end
-
-RustboroCity_EventScript_1E0971:: @ 81E0971
-	lockall
-	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
-	setvar VAR_0x8004, 1
-	goto RustboroCity_EventScript_1E09CD
-	end
-
-RustboroCity_EventScript_1E0988:: @ 81E0988
-	lockall
-	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
-	setvar VAR_0x8004, 2
-	goto RustboroCity_EventScript_1E09CD
-	end
-
-RustboroCity_EventScript_1E099F:: @ 81E099F
-	lockall
-	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
-	setvar VAR_0x8004, 3
-	goto RustboroCity_EventScript_1E09CD
-	end
-
-RustboroCity_EventScript_1E09B6:: @ 81E09B6
-	lockall
-	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
-	setvar VAR_0x8004, 4
-	goto RustboroCity_EventScript_1E09CD
-	end
-
-RustboroCity_EventScript_1E09CD:: @ 81E09CD
-	msgbox RustboroCity_Text_1E17FE, 4
-	closemessage
-	playbgm MUS_AQA_0, 0
-	addobject 10
-	addobject 9
-	applymovement 10, RustboroCity_Movement_1E0AA0
-	waitmovement 0
-	removeobject 10
-	applymovement 9, RustboroCity_Movement_1E0AB1
-	waitmovement 0
-	msgbox RustboroCity_Text_1E1817, 4
-	closemessage
-	applymovement 9, RustboroCity_Movement_1E0AB9
-	waitmovement 0
-	fadedefaultbgm
-	removeobject 9
-	setobjectxyperm 9, 30, 10
-	clearflag FLAG_0x2DC
-	setflag FLAG_0x08E
-	setvar VAR_0x405A, 2
-	setvar VAR_0x409A, 2
-	setvar VAR_0x406F, 1
-	clearflag FLAG_0x37B
-	clearflag FLAG_0x370
-	clearflag FLAG_0x36E
-	setflag FLAG_0x2E3
-	setflag FLAG_0x371
-	releaseall
-	end
-
-RustboroCity_EventScript_1E0A3B:: @ 81E0A3B
-	msgbox RustboroCity_Text_1E1904, 4
-	return
-
-RustboroCity_EventScript_1E0A44:: @ 81E0A44
-	msgbox RustboroCity_Text_1E194D, 4
-	return
-
-RustboroCity_EventScript_1E0A4D:: @ 81E0A4D
-	applymovement 9, RustboroCity_Movement_1E0AC1
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_1E0A58:: @ 81E0A58
-	applymovement 9, RustboroCity_Movement_1E0AC5
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_1E0A63:: @ 81E0A63
-	applymovement 9, RustboroCity_Movement_1E0ACA
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_1E0A6E:: @ 81E0A6E
-	applymovement 9, RustboroCity_Movement_1E0ACF
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_1E0A79:: @ 81E0A79
-	applymovement 9, RustboroCity_Movement_1E0AD5
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725A6
-	waitmovement 0
-	return
-
-RustboroCity_Movement_1E0A8E: @ 81E0A8E
-	walk_fastest_right
-	walk_fastest_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	step_end
-
-RustboroCity_Movement_1E0AA0: @ 81E0AA0
-	walk_fastest_right
-	walk_fastest_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	step_end
-
-RustboroCity_Movement_1E0AB1: @ 81E0AB1
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-RustboroCity_Movement_1E0AB9: @ 81E0AB9
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-RustboroCity_Movement_1E0AC1: @ 81E0AC1
-	walk_down
-	walk_right
-	walk_right
-	step_end
-
-RustboroCity_Movement_1E0AC5: @ 81E0AC5
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	step_end
-
-RustboroCity_Movement_1E0ACA: @ 81E0ACA
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	step_end
-
-RustboroCity_Movement_1E0ACF: @ 81E0ACF
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	step_end
-
-RustboroCity_Movement_1E0AD5: @ 81E0AD5
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_down
-	step_end
-
-RustboroCity_EventScript_1E0ADD:: @ 81E0ADD
-	lock
-	faceplayer
-	checkflag FLAG_0x08F
-	goto_eq RustboroCity_EventScript_1E0AF2
-	msgbox RustboroCity_Text_1E1904, 4
-	release
-	end
-
-RustboroCity_EventScript_1E0AF2:: @ 81E0AF2
-	waitse
-	setvar VAR_TEMP_1, 4
-	goto RustboroCity_EventScript_1E0C5B
-	end
-
-RustboroCity_EventScript_1E0AFE:: @ 81E0AFE
-	lockall
-	setvar VAR_TEMP_1, 0
-	goto RustboroCity_EventScript_1E0B2E
-	end
-
-RustboroCity_EventScript_1E0B0A:: @ 81E0B0A
-	lockall
-	setvar VAR_TEMP_1, 1
-	goto RustboroCity_EventScript_1E0B2E
-	end
-
-RustboroCity_EventScript_1E0B16:: @ 81E0B16
-	lockall
-	setvar VAR_TEMP_1, 2
-	goto RustboroCity_EventScript_1E0B2E
-	end
-
-RustboroCity_EventScript_1E0B22:: @ 81E0B22
-	lockall
-	setvar VAR_TEMP_1, 3
-	goto RustboroCity_EventScript_1E0B2E
-	end
-
-RustboroCity_EventScript_1E0B2E:: @ 81E0B2E
-	compare VAR_TEMP_1, 0
-	call_if 1, RustboroCity_EventScript_1E0B6F
-	compare VAR_TEMP_1, 1
-	call_if 1, RustboroCity_EventScript_1E0B9B
-	compare VAR_TEMP_1, 2
-	call_if 1, RustboroCity_EventScript_1E0BC7
-	compare VAR_TEMP_1, 3
-	call_if 1, RustboroCity_EventScript_1E0BF3
-	setflag FLAG_0x09F
-	setvar VAR_0x405A, 3
-	moveobjectoffscreen 9
-	msgbox RustboroCity_Text_1E183E, 4
-	releaseall
-	end
-
-RustboroCity_EventScript_1E0B6F:: @ 81E0B6F
-	applymovement 9, RustboroCity_Movement_2725A6
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725AA
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_1E0B9B:: @ 81E0B9B
-	applymovement 9, RustboroCity_Movement_2725A4
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725AC
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_1E0BC7:: @ 81E0BC7
-	applymovement 9, RustboroCity_Movement_2725AA
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725A6
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_1E0BF3:: @ 81E0BF3
-	applymovement 9, RustboroCity_Movement_2725AA
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1E0C29
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725A6
-	waitmovement 0
-	return
-
-RustboroCity_Movement_1E0C29: @ 81E0C29
-	walk_down
-	step_end
-
-RustboroCity_EventScript_1E0C2B:: @ 81E0C2B
-	lockall
-	setvar VAR_TEMP_1, 0
-	goto RustboroCity_EventScript_1E0C5B
-	end
-
-RustboroCity_EventScript_1E0C37:: @ 81E0C37
-	lockall
-	setvar VAR_TEMP_1, 1
-	goto RustboroCity_EventScript_1E0C5B
-	end
-
-RustboroCity_EventScript_1E0C43:: @ 81E0C43
-	lockall
-	setvar VAR_TEMP_1, 2
-	goto RustboroCity_EventScript_1E0C5B
-	end
-
-RustboroCity_EventScript_1E0C4F:: @ 81E0C4F
-	lockall
-	setvar VAR_TEMP_1, 3
-	goto RustboroCity_EventScript_1E0C5B
-	end
-
-RustboroCity_EventScript_1E0C5B:: @ 81E0C5B
-	compare VAR_TEMP_1, 0
-	call_if 1, RustboroCity_EventScript_1E0CDC
-	compare VAR_TEMP_1, 1
-	call_if 1, RustboroCity_EventScript_1E0D08
-	compare VAR_TEMP_1, 2
-	call_if 1, RustboroCity_EventScript_1E0D34
-	compare VAR_TEMP_1, 3
-	call_if 1, RustboroCity_EventScript_1E0D60
-	compare VAR_TEMP_1, 4
-	call_if 1, RustboroCity_EventScript_1E0D96
-	msgbox RustboroCity_Text_1E194D, 4
-	giveitem_std ITEM_GREAT_BALL
-	compare VAR_RESULT, 0
-	call_if 1, RustboroCity_EventScript_1E0CD3
-	msgbox RustboroCity_Text_1E1A21, 4
-	closemessage
-	setflag FLAG_0x090
-	setflag FLAG_0x2DC
-	setvar VAR_0x405A, 5
-	delay 30
-	warp RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2
-	waitstate
-	releaseall
-	end
-
-RustboroCity_EventScript_1E0CD3:: @ 81E0CD3
-	msgbox RustboroCity_Text_1E19E5, 4
-	return
-
-RustboroCity_EventScript_1E0CDC:: @ 81E0CDC
-	applymovement 9, RustboroCity_Movement_2725A6
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725AA
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_1E0D08:: @ 81E0D08
-	applymovement 9, RustboroCity_Movement_2725A8
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725AE
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_1E0D34:: @ 81E0D34
-	applymovement 9, RustboroCity_Movement_2725AA
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725A6
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_1E0D60:: @ 81E0D60
-	applymovement 9, RustboroCity_Movement_2725AA
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1E0C29
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725A6
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_1E0D96:: @ 81E0D96
-	applymovement 9, RustboroCity_Movement_2725A4
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_27259A
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_1E0DB8:: @ 81E0DB8
-	lockall
-	checkflag FLAG_0x120
-	call_if 0, RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_27259E
-	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
-
-Route104_EventScript_1E0DD1:: @ 81E0DD1
-RustboroCity_EventScript_1E0DD1:: @ 81E0DD1
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq RustboroCity_EventScript_1E0DE9
-	compare VAR_RESULT, 1
-	goto_eq RustboroCity_EventScript_1E0DEE
-	return
-
-RustboroCity_EventScript_1E0DE9:: @ 81E0DE9
-	playbgm MUS_GIRL_SUP, 1
-	return
-
-RustboroCity_EventScript_1E0DEE:: @ 81E0DEE
-	playbgm MUS_BOY_SUP, 1
-	return
-
-RustboroCity_EventScript_1E0DF3:: @ 81E0DF3
-	lockall
-	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
-	waitmovement 0
-	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E120E
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725A6
-	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
-
-RustboroCity_EventScript_1E0E33:: @ 81E0E33
-	lockall
-	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
-	waitmovement 0
-	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E1215
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725A6
-	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
-
-RustboroCity_EventScript_1E0E73:: @ 81E0E73
-	lockall
-	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
-	waitmovement 0
-	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E121B
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725A6
-	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
-
-RustboroCity_EventScript_1E0EB3:: @ 81E0EB3
-	lockall
-	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
-	waitmovement 0
-	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E1220
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725A6
-	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
-
-RustboroCity_EventScript_1E0EF3:: @ 81E0EF3
-	lockall
-	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
-	waitmovement 0
-	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E1224
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725A6
-	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
-
-RustboroCity_EventScript_1E0F33:: @ 81E0F33
-	lockall
-	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
-	waitmovement 0
-	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E1227
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725A6
-	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
-
-RustboroCity_EventScript_1E0F73:: @ 81E0F73
-	lockall
-	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
-	waitmovement 0
-	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E122B
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725A6
-	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
-
-RustboroCity_EventScript_1E0FB3:: @ 81E0FB3
-	lockall
-	call RustboroCity_EventScript_1E0DD1
-	applymovement 14, RustboroCity_Movement_2725AA
-	waitmovement 0
-	playse SE_PIN
-	applymovement 14, RustboroCity_Movement_272598
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_27259A
-	waitmovement 0
-	applymovement 14, RustboroCity_Movement_1E1230
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_2725A6
-	waitmovement 0
-	goto RustboroCity_EventScript_1E0FF3
-
-RustboroCity_EventScript_1E0FF3:: @ 81E0FF3
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq RustboroCity_EventScript_1E100B
-	compare VAR_RESULT, 1
-	goto_eq RustboroCity_EventScript_1E1114
-	end
-
-RustboroCity_EventScript_1E100B:: @ 81E100B
-	checkflag FLAG_0x0D3
-	goto_eq RustboroCity_EventScript_1E10C1
-	checkflag FLAG_0x120
-	goto_eq RustboroCity_EventScript_1E1070
-	setflag FLAG_0x120
-	msgbox RustboroCity_Text_1E1A49, 4
-	closemessage
-	delay 30
-	playfanfare MUS_ME_TORE_EYE
-	msgbox RustboroCity_Text_1E1ADB, 4
-	waitfanfare
-	closemessage
-	delay 30
-	setflag FLAG_0x0FD
-	setvar VAR_0x405A, 8
-	setvar VAR_0x4063, 2
-	setvar VAR_0x8008, 0
-	msgbox RustboroCity_Text_1E1AFA, 5
-	compare VAR_RESULT, 1
-	goto_eq RustboroCity_EventScript_1E1092
-	msgbox RustboroCity_Text_1E1BD3, 4
-	call RustboroCity_EventScript_1E10D6
-	releaseall
-	end
-
-RustboroCity_EventScript_1E1070:: @ 81E1070
-	setvar VAR_0x8008, 1
-	msgbox RustboroCity_Text_1E1C48, 5
-	compare VAR_RESULT, 1
-	goto_eq RustboroCity_EventScript_1E1092
-	msgbox RustboroCity_Text_1E1BD3, 4
-	releaseall
-	end
-
-RustboroCity_EventScript_1E1092:: @ 81E1092
-	msgbox RustboroCity_Text_1E1C84, 4
-	switch VAR_FIRST_POKE
-	case 0, RustboroCity_EventScript_1E10DB
-	case 1, RustboroCity_EventScript_1E10EE
-	case 2, RustboroCity_EventScript_1E1101
-	end
-
-RustboroCity_EventScript_1E10C1:: @ 81E10C1
-	msgbox RustboroCity_Text_1E1CE7, 4
-	compare VAR_0x8008, 0
-	call_if 1, RustboroCity_EventScript_1E10D6
-	releaseall
-	end
-
-RustboroCity_EventScript_1E10D6:: @ 81E10D6
-	savebgm MUS_DUMMY
-	fadedefaultbgm
-	return
-
-RustboroCity_EventScript_1E10DB:: @ 81E10DB
-	trainerbattle 3, TRAINER_MAY_14, 0, RustboroCity_Text_1E1CC1
-	setflag FLAG_0x0D3
-	goto RustboroCity_EventScript_1E10C1
-	end
-
-RustboroCity_EventScript_1E10EE:: @ 81E10EE
-	trainerbattle 3, TRAINER_MAY_15, 0, RustboroCity_Text_1E1CC1
-	setflag FLAG_0x0D3
-	goto RustboroCity_EventScript_1E10C1
-	end
-
-RustboroCity_EventScript_1E1101:: @ 81E1101
-	trainerbattle 3, TRAINER_MAY_10, 0, RustboroCity_Text_1E1CC1
-	setflag FLAG_0x0D3
-	goto RustboroCity_EventScript_1E10C1
-	end
-
-RustboroCity_EventScript_1E1114:: @ 81E1114
-	checkflag FLAG_0x0D3
-	goto_eq RustboroCity_EventScript_1E11C0
-	checkflag FLAG_0x120
-	goto_eq RustboroCity_EventScript_1E1174
-	setflag FLAG_0x120
-	msgbox RustboroCity_Text_1E1D7D, 4
-	closemessage
-	delay 30
-	playfanfare MUS_ME_TORE_EYE
-	msgbox RustboroCity_Text_1E1E11, 4
-	waitfanfare
-	closemessage
-	delay 30
-	setflag FLAG_0x0FD
-	setvar VAR_0x405A, 8
-	setvar VAR_0x4063, 2
-	msgbox RustboroCity_Text_1E1E34, 5
-	compare VAR_RESULT, 1
-	goto_eq RustboroCity_EventScript_1E1191
-	msgbox RustboroCity_Text_1E1F2F, 4
-	call RustboroCity_EventScript_1E10D6
-	releaseall
-	end
-
-RustboroCity_EventScript_1E1174:: @ 81E1174
-	msgbox RustboroCity_Text_1E1F76, 5
-	compare VAR_RESULT, 1
-	goto_eq RustboroCity_EventScript_1E1191
-	msgbox RustboroCity_Text_1E1F2F, 4
-	releaseall
-	end
-
-RustboroCity_EventScript_1E1191:: @ 81E1191
-	msgbox RustboroCity_Text_1E1FA9, 4
-	switch VAR_FIRST_POKE
-	case 0, RustboroCity_EventScript_1E11D5
-	case 1, RustboroCity_EventScript_1E11E8
-	case 2, RustboroCity_EventScript_1E11FB
-	end
-
-RustboroCity_EventScript_1E11C0:: @ 81E11C0
-	msgbox RustboroCity_Text_1E2002, 4
-	compare VAR_0x8008, 0
-	call_if 1, RustboroCity_EventScript_1E10D6
-	releaseall
-	end
-
-RustboroCity_EventScript_1E11D5:: @ 81E11D5
-	trainerbattle 3, TRAINER_BRENDAN_10, 0, RustboroCity_Text_1E1FE9
-	setflag FLAG_0x0D3
-	goto RustboroCity_EventScript_1E11C0
-	end
-
-RustboroCity_EventScript_1E11E8:: @ 81E11E8
-	trainerbattle 3, TRAINER_BRENDAN_12, 0, RustboroCity_Text_1E1FE9
-	setflag FLAG_0x0D3
-	goto RustboroCity_EventScript_1E11C0
-	end
-
-RustboroCity_EventScript_1E11FB:: @ 81E11FB
-	trainerbattle 3, TRAINER_BRENDAN_11, 0, RustboroCity_Text_1E1FE9
-	setflag FLAG_0x0D3
-	goto RustboroCity_EventScript_1E11C0
-	end
-
-RustboroCity_Movement_1E120E: @ 81E120E
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_down
-	step_end
-
-RustboroCity_Movement_1E1215: @ 81E1215
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_down
-	step_end
-
-RustboroCity_Movement_1E121B: @ 81E121B
-	walk_down
-	walk_left
-	walk_left
-	walk_down
-	step_end
-
-RustboroCity_Movement_1E1220: @ 81E1220
-	walk_down
-	walk_left
-	walk_down
-	step_end
-
-RustboroCity_Movement_1E1224: @ 81E1224
-	walk_down
-	walk_down
-	step_end
-
-RustboroCity_Movement_1E1227: @ 81E1227
-	walk_down
-	walk_right
-	walk_down
-	step_end
-
-RustboroCity_Movement_1E122B: @ 81E122B
-	walk_down
-	walk_right
-	walk_right
-	walk_down
-	step_end
-
-RustboroCity_Movement_1E1230: @ 81E1230
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_down
-	step_end
-
-RustboroCity_EventScript_1E1236:: @ 81E1236
-	msgbox RustboroCity_Text_1E249D, 2
-	end
-
-RustboroCity_Text_1E123F: @ 81E123F
-	.string "The DEVON CORPORATION…\n"
-	.string "We all just shorten it to DEVON.\p"
-	.string "That company makes all sorts of\n"
-	.string "convenient products.$"
-
-RustboroCity_Text_1E12AC: @ 81E12AC
-	.string "Hm? A sneaky-looking man?\p"
-	.string "Come to think of it, yes, a shady-\n"
-	.string "looking guy went around the corner.$"
-
-RustboroCity_Text_1E130D: @ 81E130D
-	.string "Have you taken the POKéMON GYM\n"
-	.string "challenge?\p"
-	.string "When you get that shiny GYM BADGE\n"
-	.string "in hand, I guess TRAINERS begin to\l"
-	.string "realize what is required of them.$"
-
-RustboroCity_Text_1E139E: @ 81E139E
-	.string "Hey, that’s RUSTBORO’s GYM BADGE!\p"
-	.string "Out of all the POKéMON GYM BADGES,\n"
-	.string "RUSTBORO’s is the coolest, I’d say.$"
-
-RustboroCity_Text_1E1407: @ 81E1407
-	.string "Oh? Who might you be?\n"
-	.string "You’re a new face around these parts.\p"
-	.string "Have you just transferred into the\n"
-	.string "POKéMON TRAINER’S SCHOOL?$"
-
-RustboroCity_Text_1E1480: @ 81E1480
-	.string "I challenged the GYM LEADER, but…\p"
-	.string "It’s not going to be easy winning with\n"
-	.string "my FIRE-type POKéMON…\p"
-	.string "FIRE-type POKéMON don’t match up\n"
-	.string "well against ROCK-type POKéMON…$"
-
-RustboroCity_Text_1E1520: @ 81E1520
-	.string "The old sailor MR. BRINEY lives in\n"
-	.string "a cottage by the sea.\p"
-	.string "He goes for walks in the tunnel every\n"
-	.string "so often.$"
-
-RustboroCity_Text_1E1589: @ 81E1589
-	.string "The old sailor MR. BRINEY lives in\n"
-	.string "a cottage by the sea.\p"
-	.string "He said he was going shopping in\n"
-	.string "SLATEPORT for his pet, PEEKO.\p"
-	.string "That old sea dog, he must really love\n"
-	.string "that PEEKO.$"
-
-RustboroCity_Text_1E1633: @ 81E1633
-	.string "Wow, you have POKéMON with you, too.\p"
-	.string "When I get bigger, I’m going to go\n"
-	.string "places with POKéMON, too.$"
-
-RustboroCity_Text_1E1695: @ 81E1695
-	.string "POKéMON TRAINER’S SCHOOL!\p"
-	.string "If I go to this school, will I be able\n"
-	.string "to catch rare POKéMON easily?$"
-
-RustboroCity_Text_1E16F4: @ 81E16F4
-	.string "If a POKéMON gains experience in\n"
-	.string "battles, it can sometimes change in\l"
-	.string "the way it looks.$"
-
-RustboroCity_Text_1E174B: @ 81E174B
-	.string "A POKéMON changes shape?\n"
-	.string "If one did that, I would be shocked!$"
-
-RustboroCity_Text_1E1789: @ 81E1789
-	.string "A POKéMON you get in a trade from\n"
-	.string "someone grows fast.\p"
-	.string "But if you don’t have certain GYM\n"
-	.string "BADGES, it may not obey you…$"
-
-RustboroCity_Text_1E17FE: @ 81E17FE
-	.string "Get out!\n"
-	.string "Out of the way!$"
-
-RustboroCity_Text_1E1817: @ 81E1817
-	.string "Wait! Pleeeaaase!\p"
-	.string "Don’t take my GOODS!$"
-
-RustboroCity_Text_1E183E: @ 81E183E
-	.string "Oh, it’s you!\p"
-	.string "You’re that fantastic TRAINER who\n"
-	.string "helped me in PETALBURG WOODS!\p"
-	.string "Help me! I was robbed by TEAM AQUA!\n"
-	.string "I have to get the DEVON GOODS back!\p"
-	.string "If I don’t…\n"
-	.string "I’m going to be in serious trouble.$"
-
-RustboroCity_Text_1E1904: @ 81E1904
-	.string "That shady character, I think he took\n"
-	.string "off towards the tunnel over there.$"
-
-RustboroCity_Text_1E194D: @ 81E194D
-	.string "Oh! How did it go?\n"
-	.string "The DEVON GOODS?\p"
-	.string "You did!\n"
-	.string "You got them back!\p"
-	.string "You really are a great TRAINER!\p"
-	.string "I know! As my thanks, I’ll give you\n"
-	.string "another GREAT BALL!$"
-
-RustboroCity_Text_1E19E5: @ 81E19E5
-	.string "You’re loaded with items.\n"
-	.string "I can’t give you this GREAT BALL.$"
-
-RustboroCity_Text_1E1A21: @ 81E1A21
-	.string "Excuse me, please!\n"
-	.string "Please come with me!$"
-
-RustboroCity_Text_1E1A49: @ 81E1A49
-	.string "MAY: Oh, hi, {PLAYER}{KUN}!\p"
-	.string "You had a MATCH CALL feature put\n"
-	.string "on your POKéNAV!\p"
-	.string "Let’s register each other so we can\n"
-	.string "contact one another anytime!\p"
-	.string "… … … … … …$"
-
-RustboroCity_Text_1E1ADB: @ 81E1ADB
-	.string "Registered MAY\n"
-	.string "in the POKéNAV.$"
-
-RustboroCity_Text_1E1AFA: @ 81E1AFA
-	.string "MAY: Oh, by the way, I passed\n"
-	.string "MR. BRINEY in PETALBURG WOODS.\p"
-	.string "I guess he’s on his way home to his\n"
-	.string "cottage by the sea.\p"
-	.string "How’s your POKéDEX coming along,\n"
-	.string "{PLAYER}{KUN}? Mine’s looking pretty decent!\p"
-	.string "So…\n"
-	.string "How about a little battle?$"
-
-RustboroCity_Text_1E1BD3: @ 81E1BD3
-	.string "MAY: Oh, what’s the matter?\p"
-	.string "Haven’t you caught or raised your\n"
-	.string "POKéMON very much?\p"
-	.string "That’s not very good for a TRAINER!$"
-
-RustboroCity_Text_1E1C48: @ 81E1C48
-	.string "MAY: So, what do you think?\n"
-	.string "How about a little battle here?$"
-
-RustboroCity_Text_1E1C84: @ 81E1C84
-	.string "MAY: You just became a TRAINER,\n"
-	.string "{PLAYER}{KUN}. I’m not going to lose!$"
-
-RustboroCity_Text_1E1CC1: @ 81E1CC1
-	.string "Yikes!\n"
-	.string "You’re better than I expected!$"
-
-RustboroCity_Text_1E1CE7: @ 81E1CE7
-	.string "MAY: Oh, by the way, MR. BRINEY, who\n"
-	.string "I just passed…\p"
-	.string "{PLAYER}{KUN}, you just moved here so you\n"
-	.string "might not know this, but MR. BRINEY\l"
-	.string "was once a revered seafarer.$"
-
-RustboroCity_Text_1E1D7D: @ 81E1D7D
-	.string "BRENDAN: Oh, hey, {PLAYER}!\p"
-	.string "You had a MATCH CALL feature put\n"
-	.string "on your POKéNAV! Cool!\p"
-	.string "Let’s register each other so we can\n"
-	.string "get in touch anytime!\p"
-	.string "… … … … … …$"
-
-RustboroCity_Text_1E1E11: @ 81E1E11
-	.string "Registered BRENDAN\n"
-	.string "in the POKéNAV.$"
-
-RustboroCity_Text_1E1E34: @ 81E1E34
-	.string "BRENDAN: By the way, {PLAYER}, I walked\n"
-	.string "by MR. BRINEY in PETALBURG WOODS.\p"
-	.string "I bet he was on his way home to his\n"
-	.string "cottage by the sea.\p"
-	.string "{PLAYER}, how’s your POKéDEX?\n"
-	.string "Have you filled in any pages yet?\p"
-	.string "Mine rules.\p"
-	.string "Want to have a battle to test how\n"
-	.string "far you’ve progressed?$"
-
-RustboroCity_Text_1E1F2F: @ 81E1F2F
-	.string "BRENDAN: What’s the matter? Don’t have\n"
-	.string "any confidence in your POKéMON?$"
-
-RustboroCity_Text_1E1F76: @ 81E1F76
-	.string "BRENDAN: What’s up?\n"
-	.string "Want to have a battle with me?$"
-
-RustboroCity_Text_1E1FA9: @ 81E1FA9
-	.string "BRENDAN: I know you just became\n"
-	.string "a TRAINER, but I won’t go easy!$"
-
-RustboroCity_Text_1E1FE9: @ 81E1FE9
-	.string "Hmm…\n"
-	.string "You’re pretty good.$"
-
-RustboroCity_Text_1E2002: @ 81E2002
-	.string "BRENDAN: By the way, you know\n"
-	.string "MR. BRINEY? The guy I just passed?\p"
-	.string "I bet you didn’t know this, since you\n"
-	.string "just moved here, {PLAYER}, but\l"
-	.string "MR. BRINEY was once a great sailor.$"
-
-RustboroCity_Text_1E20A6: @ 81E20A6
-	.string "“Timesaving tunnel nearing\n"
-	.string "completion!”\p"
-	.string "…Is what it says on the sign, but\n"
-	.string "there’s also a big “X” splashed\l"
-	.string "across it in red paint…$"
-
-RustboroCity_Text_1E2128: @ 81E2128
-	.string "DEVON CORPORATION\p"
-	.string "“For all your living needs, we make\n"
-	.string "it all.”$"
-
-RustboroCity_Text_1E2167: @ 81E2167
-	.string "RUSTBORO CITY POKéMON GYM\n"
-	.string "LEADER: ROXANNE\p"
-	.string "“The ROCK-loving honors student!”$"
-
-RustboroCity_Text_1E21B3: @ 81E21B3
-	.string "DEVON CORP. BRANCH OFFICE\p"
-	.string "“Access limited to DEVON employees\n"
-	.string "and authorized personnel.”$"
-
-RustboroCity_Text_1E220B: @ 81E220B
-	.string "RUSTBORO CITY\p"
-	.string "“The city probing the integration of\n"
-	.string "nature and science.”$"
-
-RustboroCity_Text_1E2253: @ 81E2253
-	.string "POKéMON TRAINER’S SCHOOL\p"
-	.string "“We’ll teach you anything about\n"
-	.string "POKéMON!”$"
-
-RustboroCity_Text_1E2296: @ 81E2296
-	.string "CUTTER’S HOUSE$"
-
-RustboroCity_Text_1E22A5: @ 81E22A5
-	.string "I’ve been developing an added feature\n"
-	.string "for the POKéNAV…\p"
-	.string "And it turned out great!\p"
-	.string "{PLAYER}, may I see that POKéNAV?\n"
-	.string "The one our PRESIDENT gave you?$"
-
-RustboroCity_Text_1E2331: @ 81E2331
-	.string "There you go, {PLAYER}!\p"
-	.string "I added a new feature named\n"
-	.string "MATCH CALL to your POKéNAV.\p"
-	.string "Using the MATCH CALL feature,\n"
-	.string "you can chat with people who have\l"
-	.string "been registered in your POKéNAV.\p"
-	.string "{PLAYER}, our PRESIDENT STONE should\n"
-	.string "be registered in your POKéNAV.\p"
-	.string "Test it out.\n"
-	.string "Please give our PRESIDENT a call.$"
-
-RustboroCity_Text_1E2449: @ 81E2449
-	.string "Please select the POKéNAV.$"
-
-RustboroCity_Text_1E2464: @ 81E2464
-	.string "Okay, I’d better get back to work.\n"
-	.string "Please take care, {PLAYER}!$"
-
-RustboroCity_Text_1E249D: @ 81E249D
-	.string "Did you know this?\p"
-	.string "You can have a 2-on-2 battle even\n"
-	.string "if you’re not with another TRAINER.\p"
-	.string "If you catch the eyes of two TRAINERS\n"
-	.string "when you have two or more POKéMON,\l"
-	.string "they’ll both challenge you.\p"
-	.string "Don’t you think it’d be cool if you\n"
-	.string "could beat two TRAINERS by yourself?$"
-
diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc
deleted file mode 100644
index 6d83c8841..000000000
--- a/data/scripts/maps/SSTidalCorridor.inc
+++ /dev/null
@@ -1,356 +0,0 @@
-SSTidalCorridor_MapScripts:: @ 823BFCF
-	map_script 2, SSTidalCorridor_MapScript2_23BFD5
-	.byte 0
-
-SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5
-	map_script_2 VAR_0x40D4, 0, SSTidalCorridor_EventScript_23C219
-	map_script_2 VAR_PORTHOLE, 1, SSTidalCorridor_EventScript_23BFFF
-	map_script_2 VAR_PORTHOLE, 5, SSTidalCorridor_EventScript_23C015
-	map_script_2 VAR_PORTHOLE, 9, SSTidalCorridor_EventScript_23C067
-	map_script_2 VAR_PORTHOLE, 10, SSTidalCorridor_EventScript_23C07D
-	.2byte 0
-
-SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF
-	special SetSSTidalFlag
-	setvar VAR_PORTHOLE, 2
-	lockall
-	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C462, 4
-	releaseall
-	end
-
-SSTidalCorridor_EventScript_23C015:: @ 823C015
-	setvar VAR_PORTHOLE, 6
-	lockall
-	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C4E3, 4
-	releaseall
-	end
-
-SSTidalRooms_EventScript_23C028:: @ 823C028
-	special SetSSTidalFlag
-	setvar VAR_PORTHOLE, 7
-	playse SE_PINPON
-	msgbox SSTidalRooms_Text_23C462, 4
-	return
-
-SSTidalRooms_EventScript_23C03C:: @ 823C03C
-	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE, 4
-	playse SE_PINPON
-	msgbox SSTidalRooms_Text_23C553, 4
-	return
-
-SSTidalCorridor_EventScript_23C050:: @ 823C050
-	compare VAR_PORTHOLE, 2
-	goto_eq SSTidalCorridor_EventScript_23C067
-	compare VAR_PORTHOLE, 7
-	goto_eq SSTidalCorridor_EventScript_23C07D
-	end
-
-SSTidalCorridor_EventScript_23C067:: @ 823C067
-	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE, 3
-	lockall
-	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C4E3, 4
-	releaseall
-	end
-
-SSTidalCorridor_EventScript_23C07D:: @ 823C07D
-	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE, 8
-	lockall
-	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C50F, 4
-	releaseall
-	end
-
-SSTidalRooms_EventScript_23C093:: @ 823C093
-	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE, 8
-	playse SE_PINPON
-	msgbox SSTidalRooms_Text_23C50F, 4
-	return
-
-SSTidalRooms_EventScript_23C0A7:: @ 823C0A7
-	switch VAR_PORTHOLE
-	case 2, SSTidalRooms_EventScript_23C03C
-	case 3, SSTidalRooms_EventScript_23C03C
-	case 6, SSTidalRooms_EventScript_23C028
-	case 7, SSTidalRooms_EventScript_23C093
-	return
-
-SSTidalCorridor_EventScript_23C0D9:: @ 823C0D9
-	msgbox SSTidalCorridor_Text_23C6EC, 2
-	end
-
-SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_WINGULL, 0
-	msgbox SSTidalCorridor_Text_23C7E1, 4
-	waitmoncry
-	release
-	end
-
-SSTidalCorridor_EventScript_23C0F5:: @ 823C0F5
-	msgbox SSTidalCorridor_Text_23C7F8, 3
-	end
-
-SSTidalCorridor_EventScript_23C0FE:: @ 823C0FE
-	msgbox SSTidalCorridor_Text_23C800, 3
-	end
-
-SSTidalCorridor_EventScript_23C107:: @ 823C107
-	msgbox SSTidalCorridor_Text_23C808, 3
-	end
-
-SSTidalCorridor_EventScript_23C110:: @ 823C110
-	msgbox SSTidalCorridor_Text_23C810, 3
-	end
-
-SSTidalCorridor_EventScript_23C119:: @ 823C119
-	lock
-	faceplayer
-	compare VAR_PORTHOLE, 4
-	goto_eq SSTidalCorridor_EventScript_23C13B
-	compare VAR_PORTHOLE, 8
-	goto_eq SSTidalCorridor_EventScript_23C15A
-	msgbox SSTidalCorridor_Text_23C596, 4
-	release
-	end
-
-SSTidalCorridor_EventScript_23C13B:: @ 823C13B
-	setrespawn 8
-	msgbox SSTidalCorridor_Text_23C64F, 4
-	checkflag FLAG_0x104
-	call_if 1, SSTidalCorridor_EventScript_23C179
-	warp LILYCOVE_CITY_HARBOR, 255, 8, 11
-	waitstate
-	release
-	end
-
-SSTidalCorridor_EventScript_23C15A:: @ 823C15A
-	setrespawn 4
-	msgbox SSTidalCorridor_Text_23C64F, 4
-	checkflag FLAG_0x104
-	call_if 1, SSTidalCorridor_EventScript_23C179
-	warp SLATEPORT_CITY_HARBOR, 255, 8, 11
-	waitstate
-	release
-	end
-
-SSTidalCorridor_EventScript_23C179:: @ 823C179
-	setflag FLAG_0x3B7
-	return
-
-SSTidalCorridor_EventScript_23C17D:: @ 823C17D
-	lockall
-	compare VAR_PORTHOLE, 2
-	goto_eq SSTidalCorridor_EventScript_23C19E
-	compare VAR_PORTHOLE, 7
-	goto_eq SSTidalCorridor_EventScript_23C19E
-	msgbox SSTidalCorridor_Text_23C6C3, 4
-	releaseall
-	end
-
-SSTidalCorridor_EventScript_23C19E:: @ 823C19E
-	special sub_80FB7A4
-	waitstate
-	end
-
-SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3
-	lock
-	faceplayer
-	checkflag FLAG_0x0F7
-	goto_eq SSTidalCorridor_EventScript_23C1BD
-	call SSTidalCorridor_EventScript_23C1C7
-	msgbox SSTidalCorridor_Text_23C65E, 4
-	release
-	end
-
-SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD
-	msgbox SSTidalCorridor_Text_23C6B0, 4
-	release
-	end
-
-SSTidalCorridor_EventScript_23C1C7:: @ 823C1C7
-	checktrainerflag TRAINER_PHILLIP
-	goto_if 0, SSTidalCorridor_EventScript_23C218
-	checktrainerflag TRAINER_LEONARD
-	goto_if 0, SSTidalCorridor_EventScript_23C218
-	checktrainerflag TRAINER_COLTON
-	goto_if 0, SSTidalCorridor_EventScript_23C218
-	checktrainerflag TRAINER_MICAH
-	goto_if 0, SSTidalCorridor_EventScript_23C218
-	checktrainerflag TRAINER_THOMAS
-	goto_if 0, SSTidalCorridor_EventScript_23C218
-	checktrainerflag TRAINER_LEA_AND_JED
-	goto_if 0, SSTidalCorridor_EventScript_23C218
-	checktrainerflag TRAINER_GARRET
-	goto_if 0, SSTidalCorridor_EventScript_23C218
-	checktrainerflag TRAINER_NAOMI
-	goto_if 0, SSTidalCorridor_EventScript_23C218
-	setflag FLAG_0x0F7
-	goto SSTidalCorridor_EventScript_23C1BD
-	return
-
-SSTidalCorridor_EventScript_23C218:: @ 823C218
-	return
-
-SSTidalCorridor_EventScript_23C219:: @ 823C219
-	lockall
-	applymovement 5, SSTidalCorridor_Movement_23C26D
-	waitmovement 0
-	applymovement 255, SSTidalCorridor_Movement_2725A8
-	waitmovement 0
-	msgbox SSTidalCorridor_Text_23C28F, 4
-	closemessage
-	applymovement 255, SSTidalCorridor_Movement_23C27D
-	applymovement 1, SSTidalCorridor_Movement_23C284
-	applymovement 5, SSTidalCorridor_Movement_23C275
-	waitmovement 0
-	playse SE_KAIDAN
-	waitse
-	removeobject 5
-	applymovement 1, SSTidalCorridor_Movement_23C28B
-	waitmovement 0
-	delay 30
-	setflag FLAG_0x1D0
-	setvar VAR_0x40D4, 1
-	releaseall
-	end
-
-SSTidalCorridor_Movement_23C26D: @ 823C26D
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-SSTidalCorridor_Movement_23C275: @ 823C275
-	walk_in_place_fastest_down
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_down
-	walk_left
-	step_end
-
-SSTidalCorridor_Movement_23C27D: @ 823C27D
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_8
-	walk_in_place_fastest_down
-	step_end
-
-SSTidalCorridor_Movement_23C284: @ 823C284
-	delay_16
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	delay_16
-	walk_in_place_fastest_left
-	step_end
-
-SSTidalCorridor_Movement_23C28B: @ 823C28B
-	walk_left
-	walk_left
-	walk_in_place_fastest_up
-	step_end
-
-SSTidalCorridor_Text_23C28F: @ 823C28F
-	.string "SCOTT: Well, hi, hi!\n"
-	.string "{PLAYER}{KUN}, {PLAYER}{KUN}!\p"
-	.string "Something’s come up, so I have to\n"
-	.string "disembark, but am I glad to see you!\p"
-	.string "Congratulations, LEAGUE CHAMPION!\p"
-	.string "There’s a place I’d like to invite\n"
-	.string "someone like you.\p"
-	.string "It’s the…\n"
-	.string "BATTLE FRONTIER!\p"
-	.string "What’s the place like?\n"
-	.string "You’ll understand when you see it!\p"
-	.string "I’ve spoken with the ship’s CAPTAIN\n"
-	.string "about this.\p"
-	.string "The next time you take a ferry,\n"
-	.string "you should be able to sail to\l"
-	.string "the BATTLE FRONTIER.\p"
-	.string "Okay, {PLAYER}{KUN}, I’ll be waiting for you\n"
-	.string "at the BATTLE FRONTIER!$"
-
-SSTidalCorridor_Text_23C462: @ 823C462
-SSTidalRooms_Text_23C462: @ 823C462
-	.string "This ferry is built to plow through\n"
-	.string "fast-running currents.\p"
-	.string "We hope you enjoy your voyage with us.\n"
-	.string "Feel free to explore the ship.$"
-
-SSTidalCorridor_Text_23C4E3: @ 823C4E3
-	.string "We hope you enjoy your voyage on\n"
-	.string "our ferry.$"
-
-SSTidalCorridor_Text_23C50F: @ 823C50F
-SSTidalRooms_Text_23C50F: @ 823C50F
-	.string "We have made land in SLATEPORT CITY.\n"
-	.string "Thank you for sailing with us.$"
-
-SSTidalRooms_Text_23C553: @ 823C553
-	.string "We have made land in LILYCOVE CITY.\n"
-	.string "Thank you for sailing with us.$"
-
-SSTidalCorridor_Text_23C596: @ 823C596
-	.string "It’ll be some time before we make land,\n"
-	.string "I reckon.\p"
-	.string "You can rest up in your cabin if you’d\n"
-	.string "like. Your cabin’s No. 2.\p"
-	.string "The bed in there is soft and plushy.\n"
-	.string "I can attest to how comfy it is!$"
-
-SSTidalCorridor_Text_23C64F: @ 823C64F
-	.string "We’ve arrived!$"
-
-SSTidalCorridor_Text_23C65E: @ 823C65E
-	.string "Go visit other cabins.\n"
-	.string "TRAINERS bored of the boat trip will\l"
-	.string "be itching to battle.$"
-
-SSTidalCorridor_Text_23C6B0: @ 823C6B0
-	.string "Enjoy your cruise!$"
-
-SSTidalCorridor_Text_23C6C3: @ 823C6C3
-	.string "The horizon spreads beyond\n"
-	.string "the porthole.$"
-
-SSTidalCorridor_Text_23C6EC: @ 823C6EC
-	.string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p"
-	.string "They made me honorary captain of\n"
-	.string "the S.S. TIDAL!\p"
-	.string "You can call me CAPTAIN BRINEY now!\p"
-	.string "You know, I retired once before,\n"
-	.string "but when I saw this majestic ship…\p"
-	.string "Let me just say, it stirred my sleeping\n"
-	.string "soul as a sailor!$"
-
-SSTidalCorridor_Text_23C7E1: @ 823C7E1
-	.string "PEEKO: Pihyo pihyohyo…$"
-
-SSTidalCorridor_Text_23C7F8: @ 823C7F8
-	.string "Cabin 1$"
-
-SSTidalCorridor_Text_23C800: @ 823C800
-	.string "Cabin 2$"
-
-SSTidalCorridor_Text_23C808: @ 823C808
-	.string "Cabin 3$"
-
-SSTidalCorridor_Text_23C810: @ 823C810
-	.string "Cabin 4$"
diff --git a/data/scripts/maps/SafariZone_South.inc b/data/scripts/maps/SafariZone_South.inc
deleted file mode 100644
index 239a2efda..000000000
--- a/data/scripts/maps/SafariZone_South.inc
+++ /dev/null
@@ -1,154 +0,0 @@
-SafariZone_South_MapScripts:: @ 823D279
-	map_script 3, SafariZone_South_MapScript1_23D2B1
-	map_script 2, SafariZone_South_MapScript2_23D284
-	.byte 0
-
-SafariZone_South_MapScript2_23D284: @ 823D284
-	map_script_2 VAR_0x40A4, 2, SafariZone_South_EventScript_23D28E
-	.2byte 0
-
-SafariZone_South_EventScript_23D28E:: @ 823D28E
-	lockall
-	applymovement 255, SafariZone_South_Movement_23D2C5
-	waitmovement 0
-	applymovement 1, SafariZone_South_Movement_23D2C7
-	waitmovement 0
-	setobjectxyperm 1, 32, 34
-	setvar VAR_0x40A4, 0
-	releaseall
-	end
-
-SafariZone_South_MapScript1_23D2B1: @ 823D2B1
-	compare VAR_0x40A4, 2
-	call_if 1, SafariZone_South_EventScript_23D2BD
-	end
-
-SafariZone_South_EventScript_23D2BD:: @ 823D2BD
-	setobjectxyperm 1, 31, 34
-	return
-
-SafariZone_South_Movement_23D2C5: @ 823D2C5
-	walk_down
-	step_end
-
-SafariZone_South_Movement_23D2C7: @ 823D2C7
-	walk_right
-	walk_in_place_fastest_down
-	step_end
-
-SafariZone_South_EventScript_23D2CA:: @ 823D2CA
-	msgbox SafariZone_South_Text_2A52EF, 2
-	end
-
-SafariZone_South_EventScript_23D2D3:: @ 823D2D3
-	msgbox SafariZone_South_Text_2A533B, 2
-	end
-
-SafariZone_South_EventScript_23D2DC:: @ 823D2DC
-	msgbox SafariZone_South_Text_2A553E, 2
-	end
-
-SafariZone_South_EventScript_23D2E5:: @ 823D2E5
-	lock
-	faceplayer
-	checkflag FLAG_0x05D
-	goto_if 0, SafariZone_South_EventScript_23D30D
-	msgbox SafariZone_South_Text_2A51D4, 5
-	compare VAR_RESULT, 1
-	goto_eq SafariZone_South_EventScript_23D31A
-	msgbox SafariZone_South_Text_2A521A, 4
-	release
-	end
-
-SafariZone_South_EventScript_23D30D:: @ 823D30D
-	setflag FLAG_0x05D
-	msgbox SafariZone_South_Text_2A52AB, 4
-	release
-	end
-
-SafariZone_South_EventScript_23D31A:: @ 823D31A
-	msgbox SafariZone_South_Text_2A5248, 4
-	closemessage
-	switch VAR_FACING
-	case 2, SafariZone_South_EventScript_23D33F
-	case 4, SafariZone_South_EventScript_23D359
-	end
-
-SafariZone_South_EventScript_23D33F:: @ 823D33F
-	applymovement 1, SafariZone_South_Movement_23D38A
-	waitmovement 0
-	applymovement 255, SafariZone_South_Movement_23D385
-	waitmovement 0
-	goto SafariZone_South_EventScript_23D373
-	end
-
-SafariZone_South_EventScript_23D359:: @ 823D359
-	applymovement 1, SafariZone_South_Movement_23D38D
-	waitmovement 0
-	applymovement 255, SafariZone_South_Movement_23D387
-	waitmovement 0
-	goto SafariZone_South_EventScript_23D373
-	end
-
-SafariZone_South_EventScript_23D373:: @ 823D373
-	setvar VAR_0x40A4, 1
-	special ExitSafariMode
-	warpdoor ROUTE_121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
-	waitstate
-	end
-
-SafariZone_South_Movement_23D385: @ 823D385
-	walk_up
-	step_end
-
-SafariZone_South_Movement_23D387: @ 823D387
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-SafariZone_South_Movement_23D38A: @ 823D38A
-	walk_left
-	walk_in_place_fastest_right
-	step_end
-
-SafariZone_South_Movement_23D38D: @ 823D38D
-	walk_down
-	walk_in_place_fastest_up
-	step_end
-
-SafariZone_South_EventScript_23D390:: @ 823D390
-	msgbox SafariZone_South_Text_2A57EE, 2
-	end
-
-SafariZone_Southeast_EventScript_23D399:: @ 823D399
-	msgbox SafariZone_Southeast_Text_2A582D, 2
-	end
-
-SafariZone_South_EventScript_23D3A2:: @ 823D3A2
-	msgbox SafariZone_South_Text_2A5887, 2
-	end
-
-SafariZone_Southeast_EventScript_23D3AB:: @ 823D3AB
-	msgbox SafariZone_Southeast_Text_2A58C6, 2
-	end
-
-SafariZone_Southeast_EventScript_23D3B4:: @ 823D3B4
-	msgbox SafariZone_Southeast_Text_2A58FD, 2
-	end
-
-SafariZone_Southeast_EventScript_23D3BD:: @ 823D3BD
-	msgbox SafariZone_Southeast_Text_2A5960, 2
-	end
-
-SafariZone_Northeast_EventScript_23D3C6:: @ 823D3C6
-	msgbox SafariZone_Northeast_Text_2A59A4, 2
-	end
-
-SafariZone_Northeast_EventScript_23D3CF:: @ 823D3CF
-	msgbox SafariZone_Northeast_Text_2A5A09, 2
-	end
-
-SafariZone_Northeast_EventScript_23D3D8:: @ 823D3D8
-	msgbox SafariZone_Northeast_Text_2A5A44, 2
-	end
-
diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/scripts/maps/SeafloorCavern_Entrance.inc
deleted file mode 100644
index b5fdc5e42..000000000
--- a/data/scripts/maps/SeafloorCavern_Entrance.inc
+++ /dev/null
@@ -1,93 +0,0 @@
-SeafloorCavern_Entrance_MapScripts:: @ 823446E
-	map_script 5, SeafloorCavern_Entrance_MapScript1_234474
-	.byte 0
-
-SeafloorCavern_Entrance_MapScript1_234474: @ 8234474
-	setdivewarp UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5
-	setescapewarp UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5
-	end
-
-SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
-	lockall
-	compare VAR_0x40D9, 1
-	goto_eq SeafloorCavern_Entrance_EventScript_2344ED
-	waitse
-	playse SE_PIN
-	applymovement 1, SeafloorCavern_Entrance_Movement_272598
-	waitmovement 0
-	applymovement 1, SeafloorCavern_Entrance_Movement_27259A
-	waitmovement 0
-	delay 20
-	compare VAR_FACING, 3
-	call_if 1, SeafloorCavern_Entrance_EventScript_23452E
-	compare VAR_FACING, 4
-	call_if 1, SeafloorCavern_Entrance_EventScript_234523
-	compare VAR_FACING, 2
-	call_if 1, SeafloorCavern_Entrance_EventScript_234539
-	delay 30
-	setvar VAR_0x40D9, 1
-	moveobjectoffscreen 1
-	msgbox SeafloorCavern_Entrance_Text_234544, 4
-	closemessage
-	applymovement 1, SeafloorCavern_Entrance_Movement_2725A6
-	waitmovement 0
-	releaseall
-	end
-
-SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED
-	compare VAR_FACING, 3
-	call_if 1, SeafloorCavern_Entrance_EventScript_23452E
-	compare VAR_FACING, 4
-	call_if 1, SeafloorCavern_Entrance_EventScript_234523
-	compare VAR_FACING, 2
-	call_if 1, SeafloorCavern_Entrance_EventScript_234539
-	msgbox SeafloorCavern_Entrance_Text_2346C8, 4
-	closemessage
-	applymovement 1, SeafloorCavern_Entrance_Movement_2725A6
-	waitmovement 0
-	releaseall
-	end
-
-SeafloorCavern_Entrance_EventScript_234523:: @ 8234523
-	applymovement 1, SeafloorCavern_Entrance_Movement_2725A4
-	waitmovement 0
-	return
-
-SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E
-	applymovement 1, SeafloorCavern_Entrance_Movement_2725A8
-	waitmovement 0
-	return
-
-SeafloorCavern_Entrance_EventScript_234539:: @ 8234539
-	applymovement 1, SeafloorCavern_Entrance_Movement_2725AA
-	waitmovement 0
-	return
-
-SeafloorCavern_Entrance_Text_234544: @ 8234544
-	.string "Hey!\n"
-	.string "I remember your face!\p"
-	.string "If you’re here, it must mean that\n"
-	.string "you’re about to mess with us again!\p"
-	.string "A punk like you, do you really think\n"
-	.string "you can take on TEAM AQUA?\p"
-	.string "I’d say you’re too early by about\n"
-	.string "a trillion years!\p"
-	.string "You’re a perfect fit for the likes of\n"
-	.string "TEAM MAGMA!\p"
-	.string "Speaking of TEAM MAGMA, I hear they\n"
-	.string "were spotted near MOSSDEEP.\p"
-	.string "That bunch of goons, they sure don’t\n"
-	.string "look good near the sea!$"
-
-SeafloorCavern_Entrance_Text_2346C8: @ 82346C8
-	.string "A punk like you, do you really think\n"
-	.string "you can take on TEAM AQUA?\p"
-	.string "I’d say you’re too early by about\n"
-	.string "a trillion years!\p"
-	.string "You’re a perfect fit for the likes of\n"
-	.string "TEAM MAGMA!\p"
-	.string "Speaking of TEAM MAGMA, I hear they\n"
-	.string "were spotted near MOSSDEEP.\p"
-	.string "That bunch of goons, they sure don’t\n"
-	.string "look good near the sea!$"
-
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
deleted file mode 100644
index e8f6323c1..000000000
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ /dev/null
@@ -1,323 +0,0 @@
-SeafloorCavern_Room9_MapScripts:: @ 8234DC8
-	.byte 0
-
-SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
-	lockall
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 4
-	setvar VAR_0x8007, 5
-	applymovement 255, SeafloorCavern_Room9_Movement_2725A6
-	waitmovement 0
-	applymovement 255, SeafloorCavern_Room9_Movement_23505C
-	waitmovement 0
-	playbgm MUS_AQA_0, 0
-	msgbox SeafloorCavern_Room9_Text_23505F, 4
-	closemessage
-	addobject VAR_0x8004
-	applymovement 255, SeafloorCavern_Room9_Movement_2725A4
-	waitmovement 0
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A
-	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_23507C, 4
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6
-	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_2350A6, 4
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E
-	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_23512C, 4
-	trainerbattle 3, TRAINER_ARCHIE, 0, SeafloorCavern_Room9_Text_2351BC
-	msgbox SeafloorCavern_Room9_Text_2351E5, 4
-	setweather 0
-	doweather
-	special sub_80B05B4
-	waitstate
-	msgbox SeafloorCavern_Room9_Text_235279, 4
-	special WaitWeather
-	waitstate
-	setvar VAR_RESULT, 1
-	playse SE_W197
-	setfieldeffectargument 0, 16
-	setfieldeffectargument 1, 42
-	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	waitfieldeffect 54
-	closemessage
-	setvar VAR_RESULT, 0
-	playfanfare MUS_ME_TAMA
-	playse SE_TAMA
-	special sub_80B0534
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6
-	applymovement 255, SeafloorCavern_Room9_Movement_2725A6
-	waitmovement 0
-	delay 150
-	removeobject 7
-	addobject 1
-	waitstate
-	delay 60
-	applymovement 1, SeafloorCavern_Room9_Movement_235040
-	waitmovement 0
-	special sub_80B058C
-	waitstate
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 8
-	setvar VAR_0x8007, 5
-	special sub_8139560
-	waitstate
-	applymovement 1, SeafloorCavern_Room9_Movement_23504B
-	waitmovement 0
-	removeobject 1
-	delay 4
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 8
-	setvar VAR_0x8007, 5
-	special sub_8139560
-	waitstate
-	delay 30
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 4
-	setvar VAR_0x8007, 5
-	msgbox SeafloorCavern_Room9_Text_2352A7, 4
-	playse SE_PC_LOGIN
-	applymovement 255, SeafloorCavern_Room9_Movement_2725A4
-	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_2352F6, 4
-	closemessage
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_235035
-	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_23532B, 4
-	closemessage
-	playse SE_PC_OFF
-	delay 20
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725AA
-	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_23546F, 4
-	closemessage
-	addobject VAR_0x8005
-	addobject VAR_0x8006
-	addobject VAR_0x8007
-	applymovement VAR_0x8007, SeafloorCavern_Room9_Movement_235057
-	applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057
-	applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E
-	waitmovement 0
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A4
-	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_2354F0, 4
-	playse SE_PIN
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_272598
-	waitmovement 0
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259A
-	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_2355C2, 4
-	msgbox SeafloorCavern_Room9_Text_235692, 4
-	closemessage
-	applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_235054
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A
-	waitmovement 0
-	msgbox SeafloorCavern_Room9_Text_235723, 4
-	setvar VAR_0x407B, 1
-	setvar VAR_0x405E, 1
-	clearflag FLAG_0x3CD
-	clearflag FLAG_0x33A
-	clearflag FLAG_0x33B
-	clearflag FLAG_0x356
-	clearflag FLAG_0x3E6
-	clearflag FLAG_0x3E5
-	setflag FLAG_0x347
-	setflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
-	clearflag FLAG_0x3B0
-	clearflag FLAG_0x3B1
-	setflag FLAG_SYS_WEATHER_CTRL
-	setflag FLAG_0x081
-	setflag FLAG_0x3C7
-	setvar VAR_0x40C6, 2
-	setvar VAR_0x40A2, 1
-	setflag FLAG_0x33C
-	setflag FLAG_0x33D
-	setflag FLAG_0x33F
-	setflag FLAG_0x35B
-	setflag FLAG_0x3B2
-	setflag FLAG_SPECIAL_FLAG_0x4000
-	warp ROUTE_128, 255, 38, 22
-	waitstate
-	releaseall
-	end
-
-SeafloorCavern_Room9_Movement_23502A: @ 823502A
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-SeafloorCavern_Room9_Movement_235032: @ 8235032
-	walk_left
-	walk_left
-	step_end
-
-SeafloorCavern_Room9_Movement_235035: @ 8235035
-	walk_left
-	delay_16
-	step_end
-
-SeafloorCavern_Room9_Movement_235038: @ 8235038
-	walk_right
-	step_end
-
-SeafloorCavern_Room9_Movement_23503A: @ 823503A
-	face_up
-	lock_facing_direction
-	walk_down
-	unlock_facing_direction
-	walk_in_place_fastest_right
-	step_end
-
-SeafloorCavern_Room9_Movement_235040: @ 8235040
-	delay_16
-	delay_16
-	walk_slow_down
-	delay_16
-	delay_16
-	delay_16
-	walk_slow_down
-	delay_16
-	delay_16
-	delay_16
-	step_end
-
-SeafloorCavern_Room9_Movement_23504B: @ 823504B
-	slide_up
-	slide_up
-	step_end
-
-SeafloorCavern_Room9_Movement_23504E: @ 823504E
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	step_end
-
-SeafloorCavern_Room9_Movement_235054: @ 8235054
-	walk_right
-	walk_right
-	step_end
-
-SeafloorCavern_Room9_Movement_235057: @ 8235057
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	step_end
-
-SeafloorCavern_Room9_Movement_23505C: @ 823505C
-	delay_16
-	delay_16
-	step_end
-
-SeafloorCavern_Room9_Text_23505F: @ 823505F
-	.string "ARCHIE: Hold it right there.$"
-
-SeafloorCavern_Room9_Text_23507C: @ 823507C
-	.string "ARCHIE: Fufufu…\n"
-	.string "So it was you, after all.$"
-
-SeafloorCavern_Room9_Text_2350A6: @ 82350A6
-	.string "ARCHIE: Behold!\p"
-	.string "See how beautiful it is, the sleeping\n"
-	.string "form of the ancient POKéMON KYOGRE!\p"
-	.string "I have waited so long for this day to\n"
-	.string "come…$"
-
-SeafloorCavern_Room9_Text_23512C: @ 823512C
-	.string "ARCHIE: It surprises me, how you’ve\n"
-	.string "managed to chase me here.\p"
-	.string "But that’s all over now.\p"
-	.string "For the realization of my dream,\n"
-	.string "you must disappear now!$"
-
-SeafloorCavern_Room9_Text_2351BC: @ 82351BC
-	.string "What?!\n"
-	.string "I lost to a mere child like you?!$"
-
-SeafloorCavern_Room9_Text_2351E5: @ 82351E5
-	.string "ARCHIE: Fufufu…\p"
-	.string "I commend you. I must recognize that\n"
-	.string "you are truly gifted.\p"
-	.string "But!\n"
-	.string "I have this in my possession!\p"
-	.string "With this RED ORB, I can make KYOGRE…$"
-
-SeafloorCavern_Room9_Text_235279: @ 8235279
-	.string "The RED ORB suddenly began shining\n"
-	.string "by itself!$"
-
-SeafloorCavern_Room9_Text_2352A7: @ 82352A7
-	.string "ARCHIE: What?!\p"
-	.string "I didn’t do anything.\n"
-	.string "Why did the RED ORB…\p"
-	.string "Where did KYOGRE go?$"
-
-SeafloorCavern_Room9_Text_2352F6: @ 82352F6
-	.string "ARCHIE: Hm? It’s a message from our\n"
-	.string "members outside…$"
-
-SeafloorCavern_Room9_Text_23532B: @ 823532B
-	.string "ARCHIE: Yes, what is it?\p"
-	.string "Hm…\n"
-	.string "It’s raining heavily?\p"
-	.string "Good… That should have happened.\n"
-	.string "That is why we awakened KYOGRE,\l"
-	.string "to realize TEAM AQUA’s vision of\l"
-	.string "expanding the sea.\p"
-	.string "What?!\p"
-	.string "It’s raining far harder than we\n"
-	.string "envisioned? You’re in danger?\p"
-	.string "That can’t be…\n"
-	.string "That’s just not possible…\p"
-	.string "Hold your position and monitor\n"
-	.string "the situation!$"
-
-SeafloorCavern_Room9_Text_23546F: @ 823546F
-	.string "ARCHIE: There’s something wrong…\p"
-	.string "The RED ORB is supposed to awaken\n"
-	.string "and control KYOGRE…\p"
-	.string "But… Why?\n"
-	.string "Why did KYOGRE disappear?\p"
-	.string "Why?!$"
-
-SeafloorCavern_Room9_Text_2354F0: @ 82354F0
-	.string "MAXIE: What have you wrought?\p"
-	.string "ARCHIE… You’ve finally awoken KYOGRE,\n"
-	.string "haven’t you?\p"
-	.string "What will happen to the world if this\n"
-	.string "downpour continues for all eternity?\p"
-	.string "The world’s landmass will drown in\n"
-	.string "the deepening sea…$"
-
-SeafloorCavern_Room9_Text_2355C2: @ 82355C2
-	.string "ARCHIE: W-what?!\n"
-	.string "Don’t get all high and mighty with me!\p"
-	.string "Wasn’t it you, TEAM MAGMA, that\n"
-	.string "infuriated GROUDON?\p"
-	.string "So long as I have this RED ORB,\n"
-	.string "I should be able to control KYOGRE…\p"
-	.string "I should be able to control it…$"
-
-SeafloorCavern_Room9_Text_235692: @ 8235692
-	.string "MAXIE: We don’t have the time to\n"
-	.string "argue about it here!\p"
-	.string "Get outside and see for yourself!\p"
-	.string "See if what you’ve wrought is the\n"
-	.string "world that we desired!$"
-
-SeafloorCavern_Room9_Text_235723: @ 8235723
-	.string "MAXIE: {PLAYER}, come on, you have\n"
-	.string "to get out of here, too!$"
-
diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc
deleted file mode 100644
index b7b55f256..000000000
--- a/data/scripts/maps/SealedChamber_OuterRoom.inc
+++ /dev/null
@@ -1,132 +0,0 @@
-SealedChamber_OuterRoom_MapScripts:: @ 8239106
-	map_script 5, SealedChamber_OuterRoom_MapScript1_239116
-	map_script 3, SealedChamber_OuterRoom_MapScript1_239127
-	map_script 1, SealedChamber_OuterRoom_MapScript1_23912B
-	.byte 0
-
-SealedChamber_OuterRoom_MapScript1_239116: @ 8239116
-	setdivewarp UNDERWATER_SEALED_CHAMBER, 255, 12, 44
-	setescapewarp UNDERWATER_SEALED_CHAMBER, 255, 12, 44
-	end
-
-SealedChamber_OuterRoom_MapScript1_239127: @ 8239127
-	setflag FLAG_LANDMARK_SEALED_CHAMBER
-	end
-
-SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B
-	checkflag FLAG_SYS_BRAILLE_DIG
-	call_if 0, SealedChamber_OuterRoom_EventScript_239135
-	end
-
-SealedChamber_OuterRoom_EventScript_239135:: @ 8239135
-	setmetatile 9, 1, 553, 1
-	setmetatile 10, 1, 553, 1
-	setmetatile 11, 1, 553, 1
-	setmetatile 9, 2, 565, 1
-	setmetatile 10, 2, 565, 1
-	setmetatile 11, 2, 565, 1
-	return
-
-SealedChamber_OuterRoom_EventScript_23916C:: @ 823916C
-	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B27
-	waitbuttonpress
-	hidebox2
-	releaseall
-	end
-
-SealedChamber_OuterRoom_EventScript_239176:: @ 8239176
-	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B31
-	waitbuttonpress
-	hidebox2
-	releaseall
-	end
-
-SealedChamber_OuterRoom_EventScript_239180:: @ 8239180
-	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B3B
-	waitbuttonpress
-	hidebox2
-	releaseall
-	end
-
-SealedChamber_OuterRoom_EventScript_23918A:: @ 823918A
-	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B45
-	waitbuttonpress
-	hidebox2
-	releaseall
-	end
-
-SealedChamber_OuterRoom_EventScript_239194:: @ 8239194
-	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B4F
-	waitbuttonpress
-	hidebox2
-	releaseall
-	end
-
-SealedChamber_OuterRoom_EventScript_23919E:: @ 823919E
-	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B59
-	waitbuttonpress
-	hidebox2
-	releaseall
-	end
-
-SealedChamber_OuterRoom_EventScript_2391A8:: @ 82391A8
-	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B63
-	waitbuttonpress
-	hidebox2
-	releaseall
-	end
-
-SealedChamber_OuterRoom_EventScript_2391B2:: @ 82391B2
-	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B6E
-	waitbuttonpress
-	hidebox2
-	releaseall
-	end
-
-SealedChamber_OuterRoom_EventScript_2391BC:: @ 82391BC
-	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B76
-	waitbuttonpress
-	hidebox2
-	releaseall
-	end
-
-SealedChamber_OuterRoom_EventScript_2391C6:: @ 82391C6
-	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B81
-	waitbuttonpress
-	hidebox2
-	releaseall
-	end
-
-SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0
-	lockall
-	checkflag FLAG_SYS_BRAILLE_DIG
-	goto_eq SealedChamber_OuterRoom_EventScript_2391E3
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B89
-	waitbuttonpress
-	hidebox2
-	releaseall
-	end
-
-SealedChamber_OuterRoom_EventScript_2391E3:: @ 82391E3
-	msgbox gUnknown_0827304E, 4
-	releaseall
-	end
-
-SealedChamber_OuterRoom_EventScript_2391ED:: @ 82391ED
-	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B89
-	waitbuttonpress
-	hidebox2
-	releaseall
-	end
-
diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc
deleted file mode 100644
index b22afaf54..000000000
--- a/data/scripts/maps/SkyPillar_2F.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SkyPillar_2F_MapScripts:: @ 823962B
-	map_script 2, SkyPillar_2F_MapScript2_2A8327
-	map_script 3, SkyPillar_2F_MapScript1_23963B
-	map_script 5, SkyPillar_2F_MapScript1_239650
-	.byte 0
-
-SkyPillar_2F_MapScript1_23963B: @ 823963B
-	compare VAR_0x40CA, 2
-	call_if 0, SkyPillar_2F_EventScript_23964C
-	copyvar VAR_ICE_STEP_COUNT, 0x1
-	end
-
-SkyPillar_2F_EventScript_23964C:: @ 823964C
-	setmaplayoutindex 434
-	return
-
-SkyPillar_2F_MapScript1_239650: @ 8239650
-	setstepcallback 7
-	setholewarp SKY_PILLAR_1F, 255, 0, 0
-	end
-
diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc
deleted file mode 100644
index 15d055f02..000000000
--- a/data/scripts/maps/SkyPillar_4F.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SkyPillar_4F_MapScripts:: @ 8239671
-	map_script 2, SkyPillar_4F_MapScript2_2A8327
-	map_script 3, SkyPillar_4F_MapScript1_239681
-	map_script 5, SkyPillar_4F_MapScript1_239696
-	.byte 0
-
-SkyPillar_4F_MapScript1_239681: @ 8239681
-	compare VAR_0x40CA, 2
-	call_if 0, SkyPillar_4F_EventScript_239692
-	copyvar VAR_ICE_STEP_COUNT, 0x1
-	end
-
-SkyPillar_4F_EventScript_239692:: @ 8239692
-	setmaplayoutindex 436
-	return
-
-SkyPillar_4F_MapScript1_239696: @ 8239696
-	setstepcallback 7
-	setholewarp SKY_PILLAR_3F, 255, 0, 0
-	end
-
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
deleted file mode 100644
index d860e6e7c..000000000
--- a/data/scripts/maps/SlateportCity.inc
+++ /dev/null
@@ -1,1383 +0,0 @@
-SlateportCity_MapScripts:: @ 81DCC61
-	map_script 3, SlateportCity_MapScript1_1DCC6C
-	map_script 2, SlateportCity_MapScript2_1DCD12
-	.byte 0
-
-SlateportCity_MapScript1_1DCC6C: @ 81DCC6C
-	setvar VAR_0x40AA, 0
-	call SlateportCity_EventScript_1DCC8D
-	compare VAR_0x4058, 1
-	call_if 1, SlateportCity_EventScript_1DCC99
-	compare VAR_0x40D2, 1
-	call_if 1, SlateportCity_EventScript_1DCCE7
-	end
-
-SlateportCity_EventScript_1DCC8D:: @ 81DCC8D
-	setflag FLAG_VISITED_SLATEPORT_CITY
-	setvar VAR_0x4086, 0
-	setflag FLAG_0x323
-	return
-
-SlateportCity_EventScript_1DCC99:: @ 81DCC99
-	setobjectxyperm 11, 28, 13
-	setobjectxyperm 7, 25, 13
-	setobjectxyperm 3, 25, 14
-	setobjectxyperm 6, 27, 16
-	setobjectxyperm 8, 28, 16
-	setobjectxyperm 1, 29, 16
-	setobjectxyperm 2, 31, 14
-	setobjectmovementtype 11, 8
-	setobjectmovementtype 7, 18
-	setobjectmovementtype 3, 16
-	setobjectmovementtype 6, 7
-	setobjectmovementtype 8, 7
-	setobjectmovementtype 1, 7
-	setobjectmovementtype 2, 9
-	return
-
-SlateportCity_EventScript_1DCCE7:: @ 81DCCE7
-	setflag FLAG_SPECIAL_FLAG_0x4000
-	getplayerxy VAR_0x8004, VAR_0x8005
-	compare VAR_0x8004, 30
-	goto_eq SlateportCity_EventScript_1DCD06
-	setobjectxyperm 35, 23, 27
-	setobjectmovementtype 35, 10
-	return
-
-SlateportCity_EventScript_1DCD06:: @ 81DCD06
-	setobjectxyperm 35, 22, 27
-	setobjectmovementtype 35, 10
-	return
-
-SlateportCity_MapScript2_1DCD12: @ 81DCD12
-	map_script_2 VAR_0x40D2, 1, SlateportCity_EventScript_1DCD1C
-	.2byte 0
-
-SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
-	lockall
-	addobject 35
-	applymovement 255, SlateportCity_Movement_1DCDA8
-	applymovement 35, SlateportCity_Movement_1DCDAC
-	waitmovement 0
-	msgbox SlateportCity_Text_1DF032, 4
-	closemessage
-	applymovement 35, SlateportCity_Movement_2725A4
-	waitmovement 0
-	delay 60
-	msgbox SlateportCity_Text_1DF0FE, 4
-	applymovement 35, SlateportCity_Movement_2725A8
-	waitmovement 0
-	msgbox SlateportCity_Text_1DF12B, 4
-	closemessage
-	delay 30
-	playfanfare MUS_ME_TORE_EYE
-	msgbox SlateportCity_Text_1DF1A6, 4
-	waitfanfare
-	closemessage
-	delay 30
-	setflag FLAG_0x0D7
-	msgbox SlateportCity_Text_1DF1D3, 4
-	closemessage
-	applymovement 35, SlateportCity_Movement_1DCDB4
-	waitmovement 0
-	removeobject 35
-	setobjectxyperm 35, 10, 12
-	setobjectmovementtype 35, 8
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	setvar VAR_0x40D2, 2
-	addvar VAR_0x40D1, 1
-	releaseall
-	end
-
-SlateportCity_Movement_1DCDA8: @ 81DCDA8
-	delay_16
-	delay_8
-	walk_in_place_fastest_left
-	step_end
-
-SlateportCity_Movement_1DCDAC: @ 81DCDAC
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-SlateportCity_Movement_1DCDB4: @ 81DCDB4
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-SlateportCity_EventScript_1DCDBD:: @ 81DCDBD
-	lock
-	faceplayer
-	message SlateportCity_Text_1DD64A
-	waitmessage
-	pokemart SlateportCity_Pokemart_1DCDD4
-	msgbox gUnknown_08272A3F, 4
-	release
-	end
-
-SlateportCity_Pokemart_1DCDD4: @ 81DCDD4
-	.2byte ITEM_PROTEIN
-	.2byte ITEM_IRON
-	.2byte ITEM_CARBOS
-	.2byte ITEM_ZINC
-	.2byte ITEM_CALCIUM
-	.2byte ITEM_HP_UP
-	.2byte ITEM_NONE
-	release
-	end
-
-SlateportCity_EventScript_1DCDE4:: @ 81DCDE4
-	lock
-	faceplayer
-	bufferleadmonspeciesname 0
-	msgbox SlateportCity_Text_1DD68A, 4
-	specialvar VAR_RESULT, LeadMonHasEffortRibbon
-	compare VAR_RESULT, 1
-	call_if 1, SlateportCity_EventScript_1DCE38
-	specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut
-	compare VAR_RESULT, 0
-	call_if 1, SlateportCity_EventScript_1DCE2E
-	msgbox SlateportCity_Text_1DD697, 4
-	playfanfare MUS_FANFA4
-	message SlateportCity_Text_1DD6E3
-	waitfanfare
-	msgbox SlateportCity_Text_1DD702, 4
-	special GiveLeadMonEffortRibbon
-	release
-	end
-
-SlateportCity_EventScript_1DCE2E:: @ 81DCE2E
-	msgbox SlateportCity_Text_1DD722, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCE38:: @ 81DCE38
-	msgbox SlateportCity_Text_1DD77B, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCE42:: @ 81DCE42
-	lock
-	faceplayer
-	compare VAR_0x4058, 1
-	call_if 1, SlateportCity_EventScript_1DCE59
-	msgbox SlateportCity_Text_1DD81A, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCE59:: @ 81DCE59
-	msgbox SlateportCity_Text_1DE3E2, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCE63:: @ 81DCE63
-	lock
-	faceplayer
-	compare VAR_0x4058, 1
-	call_if 1, SlateportCity_EventScript_1DCE7A
-	msgbox SlateportCity_Text_1DD8A6, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCE7A:: @ 81DCE7A
-	msgbox SlateportCity_Text_1DE28E, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCE84:: @ 81DCE84
-	lock
-	faceplayer
-	compare VAR_0x4058, 1
-	call_if 1, SlateportCity_EventScript_1DCEA4
-	checkflag FLAG_0x060
-	goto_eq SlateportCity_EventScript_1DCEAE
-	msgbox SlateportCity_Text_1DD93D, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCEA4:: @ 81DCEA4
-	msgbox SlateportCity_Text_1DE30C, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCEAE:: @ 81DCEAE
-	msgbox SlateportCity_Text_1DD999, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCEB8:: @ 81DCEB8
-	lock
-	faceplayer
-	compare VAR_0x4058, 1
-	call_if 1, SlateportCity_EventScript_1DCECF
-	msgbox SlateportCity_Text_1DDA34, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCECF:: @ 81DCECF
-	msgbox SlateportCity_Text_1DE376, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCED9:: @ 81DCED9
-	compare VAR_0x4058, 1
-	goto_eq SlateportCity_EventScript_1DCEED
-	msgbox SlateportCity_Text_1DDA9A, 2
-	end
-
-SlateportCity_EventScript_1DCEED:: @ 81DCEED
-	msgbox SlateportCity_Text_1DE43D, 3
-	end
-
-SlateportCity_EventScript_1DCEF6:: @ 81DCEF6
-	lock
-	faceplayer
-	compare VAR_0x4058, 1
-	call_if 1, SlateportCity_EventScript_1DCF0D
-	msgbox SlateportCity_Text_1DDB21, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCF0D:: @ 81DCF0D
-	msgbox SlateportCity_Text_1DE460, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCF17:: @ 81DCF17
-	lock
-	faceplayer
-	checkflag FLAG_0x094
-	goto_eq SlateportCity_EventScript_1DCF2C
-	msgbox SlateportCity_Text_1DDBAC, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCF2C:: @ 81DCF2C
-	msgbox SlateportCity_Text_1DDBD5, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCF36:: @ 81DCF36
-	msgbox SlateportCity_Text_1DE8BC, 3
-	end
-
-SlateportCity_EventScript_1DCF3F:: @ 81DCF3F
-	lockall
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq SlateportCity_EventScript_1DCF66
-	checkflag FLAG_BADGE07_GET
-	goto_eq SlateportCity_EventScript_1DCF5C
-	msgbox SlateportCity_Text_1DE8F8, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_1DCF5C:: @ 81DCF5C
-	msgbox SlateportCity_Text_1DE940, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_1DCF66:: @ 81DCF66
-	msgbox SlateportCity_Text_1DE9AA, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_1DCF70:: @ 81DCF70
-	msgbox SlateportCity_Text_1DEA0B, 3
-	end
-
-SlateportCity_EventScript_1DCF79:: @ 81DCF79
-	msgbox SlateportCity_Text_1DEA3B, 3
-	end
-
-SlateportCity_EventScript_1DCF82:: @ 81DCF82
-	msgbox SlateportCity_Text_1DEA6F, 3
-	end
-
-SlateportCity_EventScript_1DCF8B:: @ 81DCF8B
-	msgbox SlateportCity_Text_1DEAAF, 3
-	end
-
-SlateportCity_EventScript_1DCF94:: @ 81DCF94
-	lockall
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq SlateportCity_EventScript_1DCFA8
-	msgbox SlateportCity_Text_1DEAE3, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_1DCFA8:: @ 81DCFA8
-	msgbox SlateportCity_Text_1DEB5A, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_1DCFB2:: @ 81DCFB2
-	msgbox SlateportCity_Text_1DEBA0, 3
-	end
-
-SlateportCity_EventScript_1DCFBB:: @ 81DCFBB
-	lock
-	faceplayer
-	compare VAR_0x4058, 1
-	call_if 1, SlateportCity_EventScript_1DCFD2
-	msgbox SlateportCity_Text_1DE10E, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCFD2:: @ 81DCFD2
-	msgbox SlateportCity_Text_1DE10E, 4
-	release
-	end
-
-SlateportCity_EventScript_1DCFDC:: @ 81DCFDC
-	msgbox SlateportCity_Text_1DE16C, 2
-	end
-
-SlateportCity_EventScript_1DCFE5:: @ 81DCFE5
-	msgbox SlateportCity_Text_1DDFF7, 2
-	end
-
-SlateportCity_EventScript_1DCFEE:: @ 81DCFEE
-	msgbox SlateportCity_Text_1DE04B, 2
-	end
-
-SlateportCity_EventScript_1DCFF7:: @ 81DCFF7
-	msgbox SlateportCity_Text_1DE0D2, 2
-	end
-
-SlateportCity_EventScript_1DD000:: @ 81DD000
-	msgbox SlateportCity_Text_1DE1EC, 2
-	end
-
-SlateportCity_EventScript_1DD009:: @ 81DD009
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_1DDC4F, 4
-	closemessage
-	applymovement 5, SlateportCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_1DD020:: @ 81DD020
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_1DDC8A, 4
-	closemessage
-	applymovement 18, SlateportCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_1DD037:: @ 81DD037
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_1DDCD5, 4
-	closemessage
-	applymovement 19, SlateportCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_1DD04E:: @ 81DD04E
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_1DDD18, 4
-	closemessage
-	applymovement 26, SlateportCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_1DD065:: @ 81DD065
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_1DDD7D, 4
-	closemessage
-	applymovement 27, SlateportCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_1DD07C:: @ 81DD07C
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_1DDDC0, 4
-	closemessage
-	applymovement 28, SlateportCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_1DD093:: @ 81DD093
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_1DDDDF, 4
-	closemessage
-	applymovement 29, SlateportCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_1DD0AA:: @ 81DD0AA
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_1DDE2F, 4
-	closemessage
-	applymovement 30, SlateportCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_1DD0C1:: @ 81DD0C1
-	lock
-	faceplayer
-	playse SE_PIN
-	applymovement 31, SlateportCity_Movement_272598
-	waitmovement 0
-	applymovement 31, SlateportCity_Movement_27259A
-	waitmovement 0
-	msgbox SlateportCity_Text_1DDE6E, 4
-	closemessage
-	applymovement 31, SlateportCity_Movement_2725A2
-	waitmovement 0
-	applymovement 31, SlateportCity_Movement_1DD147
-	waitmovement 0
-	applymovement 31, SlateportCity_Movement_27259E
-	waitmovement 0
-	msgbox SlateportCity_Text_1DDE86, 4
-	closemessage
-	applymovement 31, SlateportCity_Movement_2725A2
-	waitmovement 0
-	applymovement 31, SlateportCity_Movement_1DD147
-	waitmovement 0
-	msgbox SlateportCity_Text_1DDEB8, 4
-	closemessage
-	applymovement 31, SlateportCity_Movement_27259E
-	waitmovement 0
-	applymovement 31, SlateportCity_Movement_1DD147
-	waitmovement 0
-	applymovement 31, SlateportCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SlateportCity_Movement_1DD147: @ 81DD147
-	delay_16
-	delay_16
-	step_end
-
-SlateportCity_EventScript_1DD14A:: @ 81DD14A
-	msgbox SlateportCity_Text_1DDF32, 3
-	end
-
-SlateportCity_EventScript_1DD153:: @ 81DD153
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_1DDF8D, 4
-	closemessage
-	applymovement 33, SlateportCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_1DD16A:: @ 81DD16A
-	lock
-	faceplayer
-	message gUnknown_08272A21
-	waitmessage
-	pokemartdecoration SlateportCity_PokemartDecor_1DD184
-	msgbox gUnknown_08272A3F, 4
-	release
-	end
-
-	.align 2
-SlateportCity_PokemartDecor_1DD184: @ 81DD184
-	.2byte 95
-	.2byte 78
-	.2byte 96
-	.2byte 0
-	release
-	end
-
-SlateportCity_EventScript_1DD18E:: @ 81DD18E
-	msgbox gUnknown_08272E30, 4
-	release
-	end
-
-SlateportCity_EventScript_1DD198:: @ 81DD198
-	lock
-	faceplayer
-	checkflag FLAG_0x060
-	goto_if 0, SlateportCity_EventScript_1DD18E
-	message gUnknown_08272A21
-	waitmessage
-	pokemartdecoration SlateportCity_PokemartDecor_1DD1B8
-	msgbox gUnknown_08272A3F, 4
-	release
-	end
-
-SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8
-	.2byte 25
-	.2byte 27
-	.2byte 26
-	.2byte 28
-	.2byte 29
-	.2byte 30
-	.2byte 51
-	.2byte 52
-	.2byte 53
-	.2byte 54
-	.2byte 55
-	.2byte 56
-	.2byte 57
-	.2byte 58
-	.2byte 0
-	release
-	end
-
-SlateportCity_EventScript_1DD1D8:: @ 81DD1D8
-	lock
-	faceplayer
-	message gUnknown_08272A21
-	waitmessage
-	pokemart SlateportCity_Pokemart_1DD1F0
-	msgbox gUnknown_08272A3F, 4
-	release
-	end
-
-	.align 2
-SlateportCity_Pokemart_1DD1F0: @ 81DD1F0
-	.2byte ITEM_TM10
-	.2byte ITEM_TM43
-	.2byte ITEM_NONE
-	release
-	end
-
-SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
-	lockall
-	msgbox SlateportCity_Text_1DE502, 4
-	msgbox SlateportCity_Text_1DE54A, 4
-	closemessage
-	applymovement 10, SlateportCity_Movement_2725A8
-	waitmovement 0
-	delay 10
-	applymovement 9, SlateportCity_Movement_2725AA
-	waitmovement 0
-	delay 25
-	applymovement 11, SlateportCity_Movement_1DD33C
-	applymovement 255, SlateportCity_Movement_1DD34A
-	applymovement 10, SlateportCity_Movement_1DD319
-	applymovement 9, SlateportCity_Movement_1DD326
-	waitmovement 0
-	removeobject 10
-	removeobject 9
-	msgbox SlateportCity_Text_1DE5F7, 4
-	applymovement 11, SlateportCity_Movement_2725A6
-	waitmovement 0
-	msgbox SlateportCity_Text_1DE64F, 4
-	playbgm MUS_AQA_0, 0
-	msgbox SlateportCity_Text_1DE724, 4
-	applymovement 6, SlateportCity_Movement_2725A4
-	applymovement 1, SlateportCity_Movement_2725A4
-	applymovement 7, SlateportCity_Movement_1DD309
-	applymovement 3, SlateportCity_Movement_272596
-	applymovement 2, SlateportCity_Movement_1DD311
-	waitmovement 0
-	applymovement 11, SlateportCity_Movement_2725AA
-	waitmovement 0
-	msgbox SlateportCity_Text_1DE7F7, 4
-	playse SE_PIN
-	applymovement 11, SlateportCity_Movement_272598
-	waitmovement 0
-	applymovement 11, SlateportCity_Movement_27259A
-	waitmovement 0
-	applymovement 11, SlateportCity_Movement_2725A6
-	waitmovement 0
-	msgbox SlateportCity_Text_1DE860, 4
-	msgbox SlateportCity_Text_1DE8A0, 4
-	closemessage
-	applymovement 11, SlateportCity_Movement_1DD337
-	applymovement 255, SlateportCity_Movement_1DD344
-	waitmovement 0
-	removeobject 11
-	clearflag FLAG_0x349
-	clearflag FLAG_0x350
-	clearflag FLAG_0x34D
-	clearflag FLAG_0x34E
-	setvar VAR_0x4058, 2
-	warp SLATEPORT_CITY_HARBOR, 255, 11, 14
-	waitstate
-	releaseall
-	end
-
-SlateportCity_Movement_1DD309: @ 81DD309
-	delay_16
-	delay_16
-	emote_question_mark
-	walk_in_place_fastest_right
-	delay_16
-	delay_16
-	walk_in_place_fastest_left
-	step_end
-
-SlateportCity_Movement_1DD311: @ 81DD311
-	emote_question_mark
-	walk_in_place_fastest_up
-	delay_16
-	walk_in_place_fastest_down
-	delay_16
-	delay_16
-	walk_in_place_fastest_left
-	step_end
-
-SlateportCity_Movement_1DD319: @ 81DD319
-	delay_16
-	walk_left
-	walk_left
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-SlateportCity_Movement_1DD326: @ 81DD326
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-SlateportCity_Movement_1DD334: @ 81DD334
-	walk_down
-	walk_in_place_fastest_up
-	step_end
-
-SlateportCity_Movement_1DD337: @ 81DD337
-	walk_right
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-SlateportCity_Movement_1DD33C: @ 81DD33C
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_down
-	walk_left
-	step_end
-
-SlateportCity_Movement_1DD344: @ 81DD344
-	walk_in_place_fastest_right
-	delay_16
-	delay_16
-	walk_right
-	walk_up
-	step_end
-
-SlateportCity_Movement_1DD34A: @ 81DD34A
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_in_place_fastest_down
-	step_end
-
-SlateportCity_EventScript_1DD353:: @ 81DD353
-	msgbox SlateportCity_Text_1DE491, 3
-	end
-
-SlateportCity_EventScript_1DD35C:: @ 81DD35C
-	msgbox SlateportCity_Text_1DE4C4, 3
-	end
-
-SlateportCity_EventScript_1DD365:: @ 81DD365
-	msgbox SlateportCity_Text_1DD7AD, 2
-	end
-
-SlateportCity_EventScript_1DD36E:: @ 81DD36E
-	lock
-	faceplayer
-	checkflag FLAG_0x151
-	goto_eq SlateportCity_EventScript_1DD39A
-	msgbox SlateportCity_Text_1DEBCE, 4
-	giveitem_std ITEM_POWDER_JAR
-	setflag FLAG_0x151
-	msgbox SlateportCity_Text_1DED27, 4
-	release
-	end
-
-SlateportCity_EventScript_1DD39A:: @ 81DD39A
-	setvar VAR_0x8004, 1
-	specialvar VAR_RESULT, sub_80246D4
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_EventScript_1DD3C0
-	msgbox SlateportCity_Text_1DEE40, 4
-	special sub_80248B0
-	goto SlateportCity_EventScript_1DD3CA
-	end
-
-SlateportCity_EventScript_1DD3C0:: @ 81DD3C0
-	msgbox SlateportCity_Text_1DED27, 4
-	release
-	end
-
-SlateportCity_EventScript_1DD3CA:: @ 81DD3CA
-	message SlateportCity_Text_1DEE67
-	waitmessage
-	setvar VAR_0x8004, 7
-	special sub_813A128
-	waitstate
-	switch VAR_RESULT
-	case 0, SlateportCity_EventScript_1DD46E
-	case 1, SlateportCity_EventScript_1DD482
-	case 2, SlateportCity_EventScript_1DD496
-	case 3, SlateportCity_EventScript_1DD4AA
-	case 4, SlateportCity_EventScript_1DD4BE
-	case 5, SlateportCity_EventScript_1DD4D2
-	case 6, SlateportCity_EventScript_1DD4E6
-	case 7, SlateportCity_EventScript_1DD4FA
-	case 8, SlateportCity_EventScript_1DD50E
-	case 9, SlateportCity_EventScript_1DD522
-	case 10, SlateportCity_EventScript_1DD536
-	case 11, SlateportCity_EventScript_1DD54A
-	case 127, SlateportCity_EventScript_1DD54A
-	end
-
-SlateportCity_EventScript_1DD46E:: @ 81DD46E
-	bufferitemname 0, ITEM_ENERGY_POWDER
-	setvar VAR_0x8008, 30
-	setvar VAR_0x8009, 50
-	goto SlateportCity_EventScript_1DD557
-	end
-
-SlateportCity_EventScript_1DD482:: @ 81DD482
-	bufferitemname 0, ITEM_ENERGY_ROOT
-	setvar VAR_0x8008, 31
-	setvar VAR_0x8009, 80
-	goto SlateportCity_EventScript_1DD557
-	end
-
-SlateportCity_EventScript_1DD496:: @ 81DD496
-	bufferitemname 0, ITEM_HEAL_POWDER
-	setvar VAR_0x8008, 32
-	setvar VAR_0x8009, 50
-	goto SlateportCity_EventScript_1DD557
-	end
-
-SlateportCity_EventScript_1DD4AA:: @ 81DD4AA
-	bufferitemname 0, ITEM_REVIVAL_HERB
-	setvar VAR_0x8008, 33
-	setvar VAR_0x8009, 300
-	goto SlateportCity_EventScript_1DD557
-	end
-
-SlateportCity_EventScript_1DD4BE:: @ 81DD4BE
-	bufferitemname 0, ITEM_PROTEIN
-	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
-	end
-
-SlateportCity_EventScript_1DD4D2:: @ 81DD4D2
-	bufferitemname 0, ITEM_IRON
-	setvar VAR_0x8008, 65
-	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
-	end
-
-SlateportCity_EventScript_1DD4E6:: @ 81DD4E6
-	bufferitemname 0, ITEM_CARBOS
-	setvar VAR_0x8008, 66
-	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
-	end
-
-SlateportCity_EventScript_1DD4FA:: @ 81DD4FA
-	bufferitemname 0, ITEM_CALCIUM
-	setvar VAR_0x8008, 67
-	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
-	end
-
-SlateportCity_EventScript_1DD50E:: @ 81DD50E
-	bufferitemname 0, ITEM_ZINC
-	setvar VAR_0x8008, 70
-	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
-	end
-
-SlateportCity_EventScript_1DD522:: @ 81DD522
-	bufferitemname 0, ITEM_HP_UP
-	setvar VAR_0x8008, 63
-	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
-	end
-
-SlateportCity_EventScript_1DD536:: @ 81DD536
-	bufferitemname 0, ITEM_PP_UP
-	setvar VAR_0x8008, 69
-	setvar VAR_0x8009, 3000
-	goto SlateportCity_EventScript_1DD557
-	end
-
-SlateportCity_EventScript_1DD54A:: @ 81DD54A
-	msgbox SlateportCity_Text_1DEFBC, 4
-	special sub_8024918
-	release
-	end
-
-SlateportCity_EventScript_1DD557:: @ 81DD557
-	msgbox SlateportCity_Text_1DEE90, 5
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_EventScript_1DD3CA
-	copyvar VAR_0x8004, VAR_0x8009
-	specialvar VAR_RESULT, sub_80246D4
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_EventScript_1DD5CE
-	giveitem_std VAR_0x8008
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_EventScript_1DD5C1
-	copyvar VAR_0x8004, VAR_0x8009
-	special sub_802477C
-	special sub_802488C
-	msgbox SlateportCity_Text_1DEEF7, 5
-	compare VAR_RESULT, 1
-	goto_eq SlateportCity_EventScript_1DD3CA
-	msgbox SlateportCity_Text_1DEF79, 4
-	special sub_8024918
-	release
-	end
-
-SlateportCity_EventScript_1DD5C1:: @ 81DD5C1
-	msgbox gUnknown_08272A89, 4
-	special sub_8024918
-	release
-	end
-
-SlateportCity_EventScript_1DD5CE:: @ 81DD5CE
-	msgbox SlateportCity_Text_1DEEC9, 4
-	goto SlateportCity_EventScript_1DD3CA
-	end
-
-SlateportCity_EventScript_1DD5DC:: @ 81DD5DC
-	lockall
-	applymovement 255, SlateportCity_Movement_2725B2
-	waitmovement 0
-	opendoor 10, 12
-	waitdooranim
-	addobject 35
-	applymovement 255, SlateportCity_Movement_1DD630
-	applymovement 35, SlateportCity_Movement_1DD637
-	waitmovement 0
-	closedoor 10, 12
-	waitdooranim
-	msgbox SlateportCity_Text_1DF28C, 4
-	closemessage
-	applymovement 255, SlateportCity_Movement_1DD634
-	applymovement 35, SlateportCity_Movement_1DD63A
-	waitmovement 0
-	removeobject 35
-	addvar VAR_0x40D1, 1
-	setvar VAR_0x40D2, 3
-	releaseall
-	end
-
-SlateportCity_Movement_1DD630: @ 81DD630
-	lock_facing_direction
-	walk_down
-	unlock_facing_direction
-	step_end
-
-SlateportCity_Movement_1DD634: @ 81DD634
-	delay_16
-	walk_in_place_fastest_right
-	step_end
-
-SlateportCity_Movement_1DD637: @ 81DD637
-	delay_8
-	walk_down
-	step_end
-
-SlateportCity_Movement_1DD63A: @ 81DD63A
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-SlateportCity_EventScript_1DD643:: @ 81DD643
-	lockall
-	special sub_80224D0
-	waitstate
-	releaseall
-	end
-
-SlateportCity_Text_1DD64A: @ 81DD64A
-	.string "I’m the ENERGY GURU! I’ll go for it and\n"
-	.string "sell you what you need!$"
-
-SlateportCity_Text_1DD68A: @ 81DD68A
-	.string "Oh?\n"
-	.string "Your {STR_VAR_1}…$"
-
-SlateportCity_Text_1DD697: @ 81DD697
-	.string "Went for it stupendously!\p"
-	.string "As its reward, please give it this\n"
-	.string "EFFORT RIBBON.$"
-
-SlateportCity_Text_1DD6E3: @ 81DD6E3
-	.string "{PLAYER} received the EFFORT RIBBON.$"
-
-SlateportCity_Text_1DD702: @ 81DD702
-	.string "{PLAYER} put the EFFORT RIBBON\n"
-	.string "on {STR_VAR_1}.$"
-
-SlateportCity_Text_1DD722: @ 81DD722
-	.string "You have to go for it a little harder.\p"
-	.string "If you do, I’ll give your POKéMON\n"
-	.string "something nice.$"
-
-SlateportCity_Text_1DD77B: @ 81DD77B
-	.string "Oh! Your {STR_VAR_1}, that EFFORT\n"
-	.string "RIBBON looks good on it!$"
-
-SlateportCity_Text_1DD7AD: @ 81DD7AD
-	.string "The light of the lighthouse reaches\n"
-	.string "dozens of miles away.\p"
-	.string "I wonder if it doesn’t startle POKéMON\n"
-	.string "in the sea.$"
-
-SlateportCity_Text_1DD81A: @ 81DD81A
-	.string "Ooh, look at this!\p"
-	.string "The seaweed you can get around these\n"
-	.string "parts is fresh and full of life.\p"
-	.string "Why, it looks like it can even rear up\n"
-	.string "and attack!$"
-
-SlateportCity_Text_1DD8A6: @ 81DD8A6
-	.string "Where the water is clean, the fruits\n"
-	.string "of bountiful harvest gather.\p"
-	.string "And where people gather, a market\n"
-	.string "soon starts.\p"
-	.string "That is how a town is born and grows.$"
-
-SlateportCity_Text_1DD93D: @ 81DD93D
-	.string "Shopping where you can breathe the\n"
-	.string "scent of the ocean…\p"
-	.string "SLATEPORT is such a wonderful place!$"
-
-SlateportCity_Text_1DD999: @ 81DD999
-	.string "If you put DOLLS or CUSHIONS on\n"
-	.string "the floor, they’ll get dirty.\p"
-	.string "I’m going to buy some BRICKS so my\n"
-	.string "DOLLS and CUSHIONS won’t get dirty\l"
-	.string "when I leave them out.$"
-
-SlateportCity_Text_1DDA34: @ 81DDA34
-	.string "Wroooar! I’m going to compete in\n"
-	.string "the BATTLE TENT, too!\p"
-	.string "But before that, I need to catch\n"
-	.string "some POKéMON!$"
-
-SlateportCity_Text_1DDA9A: @ 81DDA9A
-	.string "Whew… I’m just bushed…\p"
-	.string "I hiked over from MAUVILLE CITY.\n"
-	.string "But, boy, this city’s huge.\p"
-	.string "If I’d known this, I would’ve ridden\n"
-	.string "my BIKE here.$"
-
-SlateportCity_Text_1DDB21: @ 81DDB21
-	.string "STERN, the fellow who built the\n"
-	.string "MUSEUM, also happens to be the leader\l"
-	.string "of an undersea exploration team.\p"
-	.string "So, everyone calls him CAPT. STERN.$"
-
-SlateportCity_Text_1DDBAC: @ 81DDBAC
-	.string "What is that over there?\n"
-	.string "That long line…$"
-
-SlateportCity_Text_1DDBD5: @ 81DDBD5
-	.string "When I was a child, I visited\n"
-	.string "the MUSEUM often.\p"
-	.string "I used to dream about the mysteries of\n"
-	.string "the sea after seeing the exhibits.$"
-
-SlateportCity_Text_1DDC4F: @ 81DDC4F
-	.string "Hey, there! Quit pushing!\n"
-	.string "This is the line, can’t you see?$"
-
-SlateportCity_Text_1DDC8A: @ 81DDC8A
-	.string "TEAM AQUA has a policy of\n"
-	.string "assembling and dispersing at\l"
-	.string "the operation site.$"
-
-SlateportCity_Text_1DDCD5: @ 81DDCD5
-	.string "Our BOSS is brilliant.\p"
-	.string "What would he want to do with\n"
-	.string "a MUSEUM now?$"
-
-SlateportCity_Text_1DDD18: @ 81DDD18
-	.string "What’s the new scheme, I wonder?\p"
-	.string "Our BOSS is scary when he’s mad, so\n"
-	.string "I’d better not screw things up…$"
-
-SlateportCity_Text_1DDD7D: @ 81DDD7D
-	.string "If there’s something we need in\n"
-	.string "the MUSEUM, we should take it all!$"
-
-SlateportCity_Text_1DDDC0: @ 81DDDC0
-	.string "Hey, you there!\n"
-	.string "Don’t butt in!$"
-
-SlateportCity_Text_1DDDDF: @ 81DDDDF
-	.string "A long line, huh?\p"
-	.string "It reminds me of the times I lined up to\n"
-	.string "buy smash-hit games…$"
-
-SlateportCity_Text_1DDE2F: @ 81DDE2F
-	.string "Why are we even lining up and paying?\n"
-	.string "We should just march in!$"
-
-SlateportCity_Text_1DDE6E: @ 81DDE6E
-	.string "What?\n"
-	.string "What do you want?$"
-
-SlateportCity_Text_1DDE86: @ 81DDE86
-	.string "You want to read this sign?\n"
-	.string "I’ll read it for you!$"
-
-SlateportCity_Text_1DDEB8: @ 81DDEB8
-	.string "Let’s see…\p"
-	.string "Um… I think it says something like\n"
-	.string "“the life in the sea is endless.”\p"
-	.string "Yup, I’m pretty sure that’s what\n"
-	.string "it says.$"
-
-SlateportCity_Text_1DDF32: @ 81DDF32
-	.string "Grumble…\p"
-	.string "I should’ve brought my Game Boy\n"
-	.string "Advance so I wouldn’t get bored in line…\p"
-	.string "Grumble…$"
-
-SlateportCity_Text_1DDF8D: @ 81DDF8D
-	.string "When this operation’s over, I’ll take\n"
-	.string "you to a hot spring spa!\p"
-	.string "That’s what our leader said.\n"
-	.string "I can’t wait!$"
-
-SlateportCity_Text_1DDFF7: @ 81DDFF7
-	.string "The sea is just so vast…\p"
-	.string "Could the sea have been made by\n"
-	.string "the tears shed by POKéMON?$"
-
-SlateportCity_Text_1DE04B: @ 81DE04B
-	.string "Do you know what they do with old\n"
-	.string "ships that become too creaky to sail?\p"
-	.string "They sink them in the sea so they\n"
-	.string "become habitats for POKéMON.$"
-
-SlateportCity_Text_1DE0D2: @ 81DE0D2
-	.string "Whenever I visit here, I get carried\n"
-	.string "away and buy too much.$"
-
-SlateportCity_Text_1DE10E: @ 81DE10E
-	.string "If you want to change your POKéMON’s\n"
-	.string "nickname, you’ll have to get the NAME\l"
-	.string "RATER to help you.$"
-
-SlateportCity_Text_1DE16C: @ 81DE16C
-	.string "Any POKéMON you get in a trade,\n"
-	.string "you can’t change its nickname.\p"
-	.string "The original TRAINER’s love for that\n"
-	.string "POKéMON is in the nickname.$"
-
-SlateportCity_Text_1DE1EC: @ 81DE1EC
-	.string "Recently, a BATTLE TENT was built\n"
-	.string "in SLATEPORT.\p"
-	.string "GYMS are fun, but the BATTLE TENT’s\n"
-	.string "awesome in its own way.\p"
-	.string "You should go find tough POKéMON\n"
-	.string "for the BATTLE TENT!$"
-
-SlateportCity_Text_1DE28E: @ 81DE28E
-	.string "I was hoping that it was a famous star\n"
-	.string "so I could get an autograph.\p"
-	.string "But who’s that being interviewed?\n"
-	.string "Isn’t that CAPT. STERN?$"
-
-SlateportCity_Text_1DE30C: @ 81DE30C
-	.string "That lady interviewer is so cool\n"
-	.string "and pretty.\p"
-	.string "When I grow up, I’m going to be\n"
-	.string "an international journalist!$"
-
-SlateportCity_Text_1DE376: @ 81DE376
-	.string "CAPT. STERN says they discovered\n"
-	.string "something at the bottom of the sea.\p"
-	.string "I wonder what it is?\n"
-	.string "What could it be?$"
-
-SlateportCity_Text_1DE3E2: @ 81DE3E2
-	.string "What’s going on here?\p"
-	.string "Did the good CAPTAIN come back with\n"
-	.string "a big fish from the ocean floor?$"
-
-SlateportCity_Text_1DE43D: @ 81DE43D
-	.string "Hey! Are you watching?\n"
-	.string "Am I on TV?$"
-
-SlateportCity_Text_1DE460: @ 81DE460
-	.string "A TV interview! Here!\n"
-	.string "The CAPTAIN’s a celebrity!$"
-
-SlateportCity_Text_1DE491: @ 81DE491
-	.string "TY: Okay, CAPT. STERN, a big smile\n"
-	.string "for the camera!$"
-
-SlateportCity_Text_1DE4C4: @ 81DE4C4
-	.string "GABBY: I see, I see. You’ve had a most\n"
-	.string "invaluable experience…$"
-
-SlateportCity_Text_1DE502: @ 81DE502
-	.string "CAPT. STERN: Yes, indeed. We intend to\n"
-	.string "move ahead with our exploration.$"
-
-SlateportCity_Text_1DE54A: @ 81DE54A
-	.string "GABBY: That’s wonderful, CAPT. STERN!\n"
-	.string "Thank you for taking the time from\l"
-	.string "your busy schedule to talk to us.\p"
-	.string "We hope we can interview you again\n"
-	.string "with news of more discoveries!$"
-
-SlateportCity_Text_1DE5F7: @ 81DE5F7
-	.string "CAPT. STERN: Whew…\p"
-	.string "That was my first time to be filmed for\n"
-	.string "TV. That was nerve-wracking.$"
-
-SlateportCity_Text_1DE64F: @ 81DE64F
-	.string "Oh! {PLAYER}{KUN}!\n"
-	.string "You’re looking great!\p"
-	.string "We made a huge discovery on our last\n"
-	.string "seafloor exploration.\p"
-	.string "We found an underwater cavern on\n"
-	.string "ROUTE 128.\p"
-	.string "We think it’s the habitat of a POKéMON\n"
-	.string "that’s said to have been long extinct.$"
-
-SlateportCity_Text_1DE724: @ 81DE724
-	.string "Fufufu…\n"
-	.string "CAPT. STERN, I presume.\p"
-	.string "We of TEAM AQUA will assume\n"
-	.string "control of your submarine!\p"
-	.string "Your objections are meaningless!\n"
-	.string "We expect your total cooperation!\p"
-	.string "Fufufu…\n"
-	.string "Just watch and learn what TEAM\l"
-	.string "AQUA has planned!$"
-
-SlateportCity_Text_1DE7F7: @ 81DE7F7
-	.string "CAPT. STERN: What was that all about?\p"
-	.string "It sounded like someone using\n"
-	.string "a megaphone…\p"
-	.string "Where did it come from?$"
-
-SlateportCity_Text_1DE860: @ 81DE860
-	.string "It’s from the HARBOR!\p"
-	.string "The submarine!\n"
-	.string "They’re trying to take it!$"
-
-SlateportCity_Text_1DE8A0: @ 81DE8A0
-	.string "{PLAYER}{KUN}!\n"
-	.string "Please, come with me!$"
-
-SlateportCity_Text_1DE8BC: @ 81DE8BC
-	.string "BATTLE TENT SLATEPORT SITE\n"
-	.string "“Find it! The ultimate POKéMON!”$"
-
-SlateportCity_Text_1DE8F8: @ 81DE8F8
-	.string "STERN’S SHIPYARD\p"
-	.string "“Wanted: A sailor capable of sailing\n"
-	.string "in all currents.”$"
-
-SlateportCity_Text_1DE940: @ 81DE940
-	.string "STERN’S SHIPYARD\p"
-	.string "“The ferry S.S. TIDAL nears\n"
-	.string "completion for serving the ports of\l"
-	.string "SLATEPORT and LILYCOVE.”$"
-
-SlateportCity_Text_1DE9AA: @ 81DE9AA
-	.string "STERN’S SHIPYARD\p"
-	.string "“Boarding of the SLATEPORT-LILYCOVE\n"
-	.string "ferry S.S. TIDAL is handled at the\l"
-	.string "HARBOR.”$"
-
-SlateportCity_Text_1DEA0B: @ 81DEA0B
-	.string "POKéMON FAN CLUB\n"
-	.string "“Calling all fans of POKéMON!”$"
-
-SlateportCity_Text_1DEA3B: @ 81DEA3B
-	.string "“The endless sea sustains\n"
-	.string "all life.”\p"
-	.string "OCEANIC MUSEUM$"
-
-SlateportCity_Text_1DEA6F: @ 81DEA6F
-	.string "SLATEPORT CITY\p"
-	.string "“The port where people and POKéMON\n"
-	.string "cross paths.”$"
-
-SlateportCity_Text_1DEAAF: @ 81DEAAF
-	.string "SLATEPORT MARKET\n"
-	.string "“Unique items found nowhere else!”$"
-
-SlateportCity_Text_1DEAE3: @ 81DEAE3
-	.string "SLATEPORT HARBOR\p"
-	.string "“The ferry S.S. TIDAL is under\n"
-	.string "construction in the SHIPYARD.\p"
-	.string "“Service is scheduled to begin\n"
-	.string "shortly.”$"
-
-SlateportCity_Text_1DEB5A: @ 81DEB5A
-	.string "SLATEPORT HARBOR\p"
-	.string "“Enjoy a delightful cruise on\n"
-	.string "the ferry S.S. TIDAL.”$"
-
-SlateportCity_Text_1DEBA0: @ 81DEBA0
-	.string "NAME RATER’S HOUSE\n"
-	.string "“POKéMON nicknames rated.”$"
-
-SlateportCity_Text_1DEBCE: @ 81DEBCE
-	.string "If a wild POKéMON gets hurt, it heals\n"
-	.string "itself by chewing on BERRIES.\p"
-	.string "Did you know that?\p"
-	.string "Somebody saw that and got the idea\n"
-	.string "of making medicine from BERRIES.\p"
-	.string "Did you know that?\p"
-	.string "To turn BERRIES into medicine,\n"
-	.string "they must be crushed into powder.\p"
-	.string "Did you know that?\p"
-	.string "You seem to have an interest\n"
-	.string "in BERRIES!\p"
-	.string "I’ve got something good for someone\n"
-	.string "like you.$"
-
-SlateportCity_Text_1DED27: @ 81DED27
-	.string "I recently had machines installed at\n"
-	.string "POKéMON CENTERS for crushing BERRIES.\p"
-	.string "The BERRY CRUSH machines are at\n"
-	.string "the DIRECT CORNER upstairs.\p"
-	.string "Did you know?\p"
-	.string "Could you make BERRY POWDER for\n"
-	.string "me using those machines?\p"
-	.string "I can make you all sorts of medicine\n"
-	.string "if you bring me lots of BERRY POWDER.$"
-
-SlateportCity_Text_1DEE40: @ 81DEE40
-	.string "Have you brought me some\n"
-	.string "BERRY POWDER?$"
-
-SlateportCity_Text_1DEE67: @ 81DEE67
-	.string "What would you like to exchange\n"
-	.string "it with?$"
-
-SlateportCity_Text_1DEE90: @ 81DEE90
-	.string "Okay, you want to exchange your\n"
-	.string "BERRY POWDER for one {STR_VAR_1}?$"
-
-SlateportCity_Text_1DEEC9: @ 81DEEC9
-	.string "Oh, dear. You don’t have enough\n"
-	.string "BERRY POWDER.$"
-
-SlateportCity_Text_1DEEF7: @ 81DEEF7
-	.string "This is fine BERRY POWDER.\n"
-	.string "It will make excellent medicine.\p"
-	.string "Would you like to trade more of your\n"
-	.string "BERRY POWDER for something else?$"
-
-SlateportCity_Text_1DEF79: @ 81DEF79
-	.string "Okay! When you get some more\n"
-	.string "BERRY POWDER, bring it to me, please!$"
-
-SlateportCity_Text_1DEFBC: @ 81DEFBC
-	.string "Come back if you’d like to trade your\n"
-	.string "BERRY POWDER for some medicine.\p"
-	.string "I’m always running a bazaar here.\p"
-	.string "Did you know?$"
-
-SlateportCity_Text_1DF032: @ 81DF032
-	.string "SCOTT: Huh?\n"
-	.string "I’m sure I met you somewhere before.\p"
-	.string "Have I introduced myself to you?\n"
-	.string "If not, my name’s SCOTT.\p"
-	.string "I just saw TEAM AQUA run away from\n"
-	.string "here like they were stung.\p"
-	.string "Let me guess--you drove them away?$"
-
-SlateportCity_Text_1DF0FE: @ 81DF0FE
-	.string "SCOTT: Hmm…\n"
-	.string "Maybe, just maybe, this TRAINER…$"
-
-SlateportCity_Text_1DF12B: @ 81DF12B
-	.string "SCOTT: All right! I think you’re going\n"
-	.string "to become a good friend.\p"
-	.string "So, let’s register each other in our\n"
-	.string "POKéNAVS.\p"
-	.string "… … … … … …$"
-
-SlateportCity_Text_1DF1A6: @ 81DF1A6
-	.string "Registered this SCOTT person\n"
-	.string "in the POKéNAV.$"
-
-SlateportCity_Text_1DF1D3: @ 81DF1D3
-	.string "SCOTT: What I’d like to do is tag along\n"
-	.string "with you, but I do want to keep an eye\l"
-	.string "on the talents of other people, too.\p"
-	.string "So, I’ll be off to roam other towns\n"
-	.string "a bit more.\p"
-	.string "Be seeing you, {PLAYER}{KUN}!$"
-
-SlateportCity_Text_1DF28C: @ 81DF28C
-	.string "SCOTT: Oh, hey!\n"
-	.string "If it isn’t {PLAYER}{KUN}!\p"
-	.string "{PLAYER}{KUN}, let me guess--you’re going\n"
-	.string "to take the BATTLE TENT challenge?\p"
-	.string "Yeah! That’s a good idea!\n"
-	.string "That’s a really great idea!\p"
-	.string "After all, a tough TRAINER is\n"
-	.string "the perfect fit for the BATTLE TENT!\p"
-	.string "Give it your best effort!$"
-
diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc
deleted file mode 100644
index d79849a6c..000000000
--- a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc
+++ /dev/null
@@ -1,115 +0,0 @@
-SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960
-	map_script 3, SlateportCity_BattleTentBattleRoom_MapScript1_209970
-	map_script 4, SlateportCity_BattleTentBattleRoom_MapScript2_20999A
-	map_script 2, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4
-	.byte 0
-
-SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970
-	call SlateportCity_BattleTentBattleRoom_EventScript_209976
-	end
-
-SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_BattleTentBattleRoom_EventScript_20998E
-	compare VAR_RESULT, 1
-	goto_eq SlateportCity_BattleTentBattleRoom_EventScript_209994
-	return
-
-SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E
-	setvar VAR_OBJ_GFX_ID_1, 100
-	return
-
-SlateportCity_BattleTentBattleRoom_EventScript_209994:: @ 8209994
-	setvar VAR_OBJ_GFX_ID_1, 105
-	return
-
-SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A
-	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099A4
-	.2byte 0
-
-SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4
-	setvar VAR_TEMP_1, 1
-	hideobjectat 255, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
-	hideobjectat 2, SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM
-	end
-
-SlateportCity_BattleTentBattleRoom_MapScript2_2099B4: @ 82099B4
-	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099BE
-	.2byte 0
-
-SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
-	applymovement 3, SlateportCity_BattleTentBattleRoom_Movement_209A99
-	waitmovement 0
-	setvar VAR_0x8004, 11
-	special sub_81A5E74
-	setobjectxyperm 2, 5, 1
-	removeobject 2
-	addobject 2
-	applymovement 2, SlateportCity_BattleTentBattleRoom_Movement_209A9E
-	waitmovement 0
-	setvar VAR_0x8004, 4
-	special sub_81B99B4
-	lockall
-	msgbox 0x2021fc4, 4
-	waitmessage
-	closemessage
-	special HealPlayerParty
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 0
-	special sub_8163AC4
-	waitstate
-	switch VAR_RESULT
-	case 1, SlateportCity_BattleTentBattleRoom_EventScript_209A39
-
-SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special sub_81A1780
-	special LoadPlayerParty
-	warp SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
-	waitstate
-
-SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	switch VAR_RESULT
-	case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B
-@ 	case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B
-	setvar VAR_0x8006, 1
-	warp SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 3
-	waitstate
-
-SlateportCity_BattleTentBattleRoom_EventScript_209A7B:: @ 8209A7B
-SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special sub_81A1780
-	special LoadPlayerParty
-	warp SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
-	waitstate
-@ forced stop
-
-SlateportCity_BattleTentBattleRoom_Movement_209A99: @ 8209A99
-	walk_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_right
-	step_end
-
-SlateportCity_BattleTentBattleRoom_Movement_209A9E: @ 8209A9E
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_in_place_fastest_left
-	step_end
-
diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc
deleted file mode 100644
index 7446c1002..000000000
--- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc
+++ /dev/null
@@ -1,280 +0,0 @@
-SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26
-	map_script 2, SlateportCity_BattleTentCorridor_MapScript2_208E5B
-	map_script 4, SlateportCity_BattleTentCorridor_MapScript2_208E31
-	.byte 0
-
-SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31
-	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentCorridor_EventScript_208E3B
-	.2byte 0
-
-SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B
-	setvar VAR_TEMP_1, 1
-	compare VAR_0x8006, 1
-	goto_if 5, SlateportCity_BattleTentCorridor_EventScript_208E56
-	setobjectxy 1, 2, 2
-	turnobject 1, 1
-
-SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56
-	turnobject 255, 2
-	end
-
-SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B
-	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentCorridor_EventScript_208E65
-	.2byte 0
-
-SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65
-	compare VAR_0x8006, 1
-	goto_eq SlateportCity_BattleTentCorridor_EventScript_208EEE
-	setvar VAR_TEMP_0, 1
-	applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062
-	applymovement 255, SlateportCity_BattleTentCorridor_Movement_209059
-	waitmovement 0
-	compare VAR_0x8006, 2
-	goto_eq SlateportCity_BattleTentCorridor_EventScript_209044
-	setvar VAR_0x8004, 9
-	special sub_81B9D08
-	setvar VAR_0x8004, 8
-	special sub_81B9D08
-	msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, 4
-	fadescreen 1
-	setvar VAR_0x8004, 6
-	special sub_81B9D08
-	waitstate
-
-SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
-	msgbox SlateportCity_BattleTentCorridor_Text_25AB96, 4
-	closemessage
-	applymovement 1, SlateportCity_BattleTentCorridor_Movement_2725A6
-	waitmovement 0
-	opendoor 2, 1
-	waitdooranim
-	applymovement 1, SlateportCity_BattleTentCorridor_Movement_209068
-	applymovement 255, SlateportCity_BattleTentCorridor_Movement_20905E
-	waitmovement 0
-	closedoor 2, 1
-	waitdooranim
-	warp SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4
-	waitstate
-	end
-
-SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE
-	setvar VAR_0x8004, 9
-	special sub_81A5E74
-	setvar VAR_0x8004, 16
-	special sub_81A5E74
-	msgbox SlateportCity_BattleTentCorridor_Text_25A22D, 4
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-
-SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	call_if 1, SlateportCity_BattleTentCorridor_EventScript_209014
-	compare VAR_RESULT, 2
-	call_if 1, SlateportCity_BattleTentCorridor_EventScript_20901B
-	multichoice 20, 6, 104, 1
-	switch VAR_RESULT
-	case 0, SlateportCity_BattleTentCorridor_EventScript_208FBB
-	case 1, SlateportCity_BattleTentCorridor_EventScript_208F5B
-	case 2, SlateportCity_BattleTentCorridor_EventScript_208F89
-
-SlateportCity_BattleTentCorridor_EventScript_208F5B:: @ 8208F5B
-	msgbox SlateportCity_BattleTentCorridor_Text_25A350, 5
-	switch VAR_RESULT
-	case 0, SlateportCity_BattleTentCorridor_EventScript_208F0D
-	case 1, SlateportCity_BattleTentCorridor_EventScript_209022
-	case 127, SlateportCity_BattleTentCorridor_EventScript_208F0D
-
-SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89
-	message SlateportCity_BattleTentCorridor_Text_25A37A
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, SlateportCity_BattleTentCorridor_EventScript_208F0D
-	case 0, SlateportCity_BattleTentCorridor_EventScript_209A1B
-	case 127, SlateportCity_BattleTentCorridor_EventScript_208F0D
-
-SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB
-	setvar VAR_0x8004, 8
-	special sub_81B9D08
-	msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, 5
-	switch VAR_RESULT
-	case 0, SlateportCity_BattleTentCorridor_EventScript_208EB4
-	case 1, SlateportCity_BattleTentCorridor_EventScript_208FF1
-	case 127, SlateportCity_BattleTentCorridor_EventScript_208EB4
-
-SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1
-	fadescreen 1
-	setvar VAR_0x8004, 7
-	special sub_81B9D08
-	waitstate
-	compare VAR_RESULT, 1
-	goto_eq SlateportCity_BattleTentCorridor_EventScript_208EB4
-	msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, 4
-	goto SlateportCity_BattleTentCorridor_EventScript_208EB4
-
-SlateportCity_BattleTentCorridor_EventScript_209014:: @ 8209014
-	message SlateportCity_BattleTentCorridor_Text_25A263
-	waitmessage
-	return
-
-SlateportCity_BattleTentCorridor_EventScript_20901B:: @ 820901B
-	message SlateportCity_BattleTentCorridor_Text_25A289
-	waitmessage
-	return
-
-SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022
-	message SlateportCity_BattleTentCorridor_Text_25ABAE
-	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 2
-	special sub_81B9D08
-	playse SE_SAVE
-	waitse
-	fadescreen 1
-	setvar VAR_0x8004, 4
-	special sub_81A1780
-	end
-
-SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044
-	special SavePlayerParty
-	setvar VAR_0x8004, 10
-	setvar VAR_0x8005, 0
-	special sub_81A5E74
-	goto SlateportCity_BattleTentCorridor_EventScript_208F0D
-
-SlateportCity_BattleTentCorridor_Movement_209059: @ 8209059
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-SlateportCity_BattleTentCorridor_Movement_20905E: @ 820905E
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_down
-	step_end
-
-SlateportCity_BattleTentCorridor_Movement_209068: @ 8209068
-	walk_up
-	set_invisible
-	step_end
-
-SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B
-	.string "Want a tasty little bit of advice\n"
-	.string "for CONTESTS?\p"
-	.string "Using a certain move after another\n"
-	.string "certain kind of move sometimes gets\l"
-	.string "you extra attention.\p"
-	.string "If you know what you’re doing,\n"
-	.string "you can score big in appeal.\p"
-	.string "Of course, your opponents might try\n"
-	.string "disrupting your POKéMON’s showing.$"
-
-SlateportCity_BattleTentCorridor_Text_20917A: @ 820917A
-	.string "My papa, he’s a CONTEST JUDGE.\p"
-	.string "I wonder what I should be when I\n"
-	.string "grow up, a JUDGE or a GYM LEADER?$"
-
-SlateportCity_BattleTentCorridor_Text_2091DC: @ 82091DC
-	.string "Hey, man, I’m like majorly cheesed,\n"
-	.string "you know. Like, you know, I just\l"
-	.string "wanted to know why my POKéMON\l"
-	.string "never won, you know, like, hey?\p"
-	.string "So, like, I gave the JUDGE my two\n"
-	.string "cents, you know, they’re free.\p"
-	.string "And he wouldn’t hear me out, like, hey!\n"
-	.string "So, like, total bummer, man!\p"
-	.string "Hey, like, you! Zip it, you know?\n"
-	.string "Just, you know, take this!$"
-
-SlateportCity_BattleTentCorridor_Text_209322: @ 8209322
-	.string "That’s, like, TM41, you know?\n"
-	.string "Hey, it’s TORMENT, you hearing me?\p"
-	.string "Like, it won’t let the other guy\n"
-	.string "use the same move twice in a row, see?\p"
-	.string "Hey, now, you listen here, like,\n"
-	.string "I’m not laying a torment on you!$"
-
-SlateportCity_BattleTentCorridor_Text_2093ED: @ 82093ED
-	.string "MC: Oh, my, my!\n"
-	.string "Now isn’t that a dandy of a POKéMON?\p"
-	.string "Please! Do step right up and take\n"
-	.string "part in our splendid CONTESTS!\p"
-	.string "You’ll do well! I’m sure of it!\n"
-	.string "My eyes have never failed me!$"
-
-SlateportCity_BattleTentCorridor_Text_2094A1: @ 82094A1
-	.string "JUDGE: Well, hello there!\n"
-	.string "I see that you’re a TRAINER!\p"
-	.string "Then, it just wouldn’t do for you\n"
-	.string "to miss a POKéMON CONTEST!\p"
-	.string "Get a CONTEST PASS in VERDANTURF\n"
-	.string "CITY and enter anytime!$"
-
-SlateportCity_BattleTentCorridor_Text_20954E: @ 820954E
-	.string "It’s appeal time!\n"
-	.string "What should I lead with?$"
-
-SlateportCity_BattleTentCorridor_Text_209579: @ 8209579
-	.string "They didn’t pay much attention to\n"
-	.string "my POKéMON’s appeal…\p"
-	.string "Humph, that JUDGE, he doesn’t know\n"
-	.string "a good thing when he sees it.$"
-
-SlateportCity_BattleTentCorridor_Text_2095F1: @ 82095F1
-	.string "Oh, hi! You must be a serious fan to get\n"
-	.string "this close to the action.\p"
-	.string "I’ll reward your enthusiasm with\n"
-	.string "this sage advice.\p"
-	.string "If a move goes over really well,\n"
-	.string "the audience will get excited.\p"
-	.string "The POKéMON that makes its appeal\n"
-	.string "right when everyone’s excited…\p"
-	.string "Well, you’d think something good has\n"
-	.string "to happen!$"
-
-SlateportCity_BattleTentCorridor_Text_209718: @ 8209718
-	.string "I can’t do this! I’m more freaked out\n"
-	.string "than my POKéMON.\p"
-	.string "I’m shivering and my heart is racing!$"
-
-SlateportCity_BattleTentCorridor_Text_209775: @ 8209775
-	.string "A battle and a CONTEST aren’t the\n"
-	.string "same, but they are alike, too.\p"
-	.string "You need to work hard and believe\n"
-	.string "in the POKéMON you’ve raised.$"
-
-SlateportCity_BattleTentCorridor_Text_2097F6: @ 82097F6
-	.string "That POKéMON looks like it’s on top\n"
-	.string "of its game, huh?\p"
-	.string "A POKéMON that does good in the\n"
-	.string "secondary judging seems to be more\l"
-	.string "relaxed when it’s doing appeals.$"
-
-SlateportCity_BattleTentCorridor_Text_209890: @ 8209890
-	.string "Will you look at that sorry sight?\p"
-	.string "Heh, my POKéMON’s absolutely better\n"
-	.string "than that lot!$"
-
-SlateportCity_BattleTentCorridor_Text_2098E6: @ 82098E6
-	.string "Don’t you get the urge to move with\n"
-	.string "POKéMON if they’re putting on an\l"
-	.string "energetic appeal?$"
-
-SlateportCity_BattleTentCorridor_Text_20993D: @ 820993D
-	.string "POKéMON CONTESTS\n"
-	.string "HYPER RANK STAGE!$"
-
diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc
deleted file mode 100644
index 187ed0751..000000000
--- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc
+++ /dev/null
@@ -1,357 +0,0 @@
-SlateportCity_BattleTentLobby_MapScripts:: @ 8208730
-	map_script 2, SlateportCity_BattleTentLobby_MapScript2_20874F
-	map_script 4, SlateportCity_BattleTentLobby_MapScript2_20873B
-	.byte 0
-
-SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B
-	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentLobby_EventScript_208745
-	.2byte 0
-
-SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F
-	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentLobby_EventScript_208779
-	map_script_2 VAR_TEMP_0, 1, SlateportCity_BattleTentLobby_EventScript_208782
-	map_script_2 VAR_TEMP_0, 2, SlateportCity_BattleTentLobby_EventScript_208871
-	map_script_2 VAR_TEMP_0, 3, SlateportCity_BattleTentLobby_EventScript_2087B7
-	map_script_2 VAR_TEMP_0, 4, SlateportCity_BattleTentLobby_EventScript_208837
-	.2byte 0
-
-SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779
-	setvar VAR_0x8004, 0
-	special sub_81A1780
-	end
-
-SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782
-	lockall
-	msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, 4
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	releaseall
-	end
-
-SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7
-	lockall
-	message SlateportCity_BattleTentLobby_Text_2C5C6F
-	waitmessage
-	setvar VAR_0x8004, 4
-	special sub_81B9D08
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_81B9D08
-	playse SE_SAVE
-	waitse
-
-SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9
-	msgbox SlateportCity_BattleTentLobby_Text_2C5D14, 4
-	setvar VAR_0x8004, 5
-	special sub_81B9D08
-	switch VAR_RESULT
-	case 0, SlateportCity_BattleTentLobby_EventScript_20882A
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	message SlateportCity_BattleTentLobby_Text_23F68C
-	waitmessage
-	playfanfare MUS_FANFA4
-	waitfanfare
-	goto SlateportCity_BattleTentLobby_EventScript_208861
-
-SlateportCity_BattleTentLobby_EventScript_20882A:: @ 820882A
-	msgbox SlateportCity_BattleTentLobby_Text_2C5D52, 4
-	goto SlateportCity_BattleTentLobby_EventScript_208861
-
-SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837
-	lockall
-	message SlateportCity_BattleTentLobby_Text_2C5BA2
-	waitmessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_81B9D08
-	playse SE_SAVE
-	waitse
-
-SlateportCity_BattleTentLobby_EventScript_208861:: @ 8208861
-	msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871
-	lockall
-	message SlateportCity_BattleTentLobby_Text_2C5DA7
-	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 1
-	special sub_81B9D08
-	playse SE_SAVE
-	waitse
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	setvar VAR_0x8006, 2
-	goto SlateportCity_BattleTentLobby_EventScript_2089AC
-
-SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA
-	lock
-	faceplayer
-	setvar VAR_0x8004, 1
-	special sub_81B9D08
-	compare VAR_RESULT, 0
-	goto_if 5, SlateportCity_BattleTentLobby_EventScript_2087E9
-	special SavePlayerParty
-	msgbox SlateportCity_BattleTentLobby_Text_2C5810, 4
-
-SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA
-	message SlateportCity_BattleTentLobby_Text_2C586A
-	waitmessage
-	multichoice 17, 6, 23, 0
-	switch VAR_RESULT
-	case 0, SlateportCity_BattleTentLobby_EventScript_208906
-	case 1, SlateportCity_BattleTentLobby_EventScript_208A07
-	case 2, SlateportCity_BattleTentLobby_EventScript_208A2E
-	case 127, SlateportCity_BattleTentLobby_EventScript_208A2E
-
-SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906
-	setvar VAR_FRONTIER_FACILITY, 4
-	setvar VAR_0x40CE, 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 2
-	special sub_81A1780
-	msgbox SlateportCity_BattleTentLobby_Text_2C5B06, 5
-	switch VAR_RESULT
-	case 0, SlateportCity_BattleTentLobby_EventScript_208A2B
-	case 1, SlateportCity_BattleTentLobby_EventScript_208950
-	case 127, SlateportCity_BattleTentLobby_EventScript_208A2B
-
-SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950
-	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	special sub_81A1780
-	setvar VAR_0x8004, 0
-	special sub_81B9D08
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	closemessage
-	delay 2
-	call SlateportCity_BattleTentLobby_EventScript_27134F
-	setvar VAR_TEMP_0, 255
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_BattleTentLobby_EventScript_208A14
-	setvar VAR_0x8006, 0
-
-SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC
-	msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, 4
-	closemessage
-	call SlateportCity_BattleTentLobby_EventScript_2089C9
-	warp SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7
-	setvar VAR_TEMP_0, 0
-	waitstate
-	end
-
-SlateportCity_BattleTentLobby_EventScript_2089C9:: @ 82089C9
-	applymovement 1, SlateportCity_BattleTentLobby_Movement_2089F8
-	applymovement 255, SlateportCity_BattleTentLobby_Movement_2089FF
-	waitmovement 0
-	opendoor 6, 1
-	waitdooranim
-	applymovement 1, SlateportCity_BattleTentLobby_Movement_2089FC
-	applymovement 255, SlateportCity_BattleTentLobby_Movement_208A03
-	waitmovement 0
-	closedoor 6, 1
-	waitdooranim
-	return
-
-SlateportCity_BattleTentLobby_Movement_2089F8: @ 82089F8
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-SlateportCity_BattleTentLobby_Movement_2089FC: @ 82089FC
-	walk_up
-	set_invisible
-	step_end
-
-SlateportCity_BattleTentLobby_Movement_2089FF: @ 82089FF
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07
-	msgbox SlateportCity_BattleTentLobby_Text_2C589C, 4
-	goto SlateportCity_BattleTentLobby_EventScript_2088CA
-
-SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	goto SlateportCity_BattleTentLobby_EventScript_208A2E
-
-SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B
-	special LoadPlayerParty
-
-SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E
-	msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4
-	release
-	end
-
-SlateportCity_BattleTentLobby_Movement_208A38:: @ 8208A38
-	walk_up
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D
-	lock
-	faceplayer
-	checkflag FLAG_0x109
-	goto_eq SlateportCity_BattleTentLobby_EventScript_208A74
-	msgbox SlateportCity_BattleTentLobby_Text_208B4E, 4
-	giveitem_std ITEM_TM41
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_BattleTentLobby_EventScript_272054
-	setflag FLAG_0x109
-	msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4
-	release
-	end
-
-SlateportCity_BattleTentLobby_EventScript_208A74:: @ 8208A74
-	msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4
-	release
-	end
-
-SlateportCity_BattleTentLobby_EventScript_208A7E:: @ 8208A7E
-	msgbox SlateportCity_BattleTentLobby_Text_208D27, 2
-	end
-
-SlateportCity_BattleTentLobby_EventScript_208A87:: @ 8208A87
-	msgbox SlateportCity_BattleTentLobby_Text_208DA6, 2
-	end
-
-SlateportCity_BattleTentLobby_EventScript_208A90:: @ 8208A90
-	msgbox SlateportCity_BattleTentLobby_Text_208DF1, 2
-	end
-
-SlateportCity_BattleTentLobby_EventScript_208A99:: @ 8208A99
-	lockall
-	msgbox SlateportCity_BattleTentLobby_Text_259721, 4
-	goto SlateportCity_BattleTentLobby_EventScript_208AA8
-	end
-
-SlateportCity_BattleTentLobby_EventScript_208AA8:: @ 8208AA8
-	message SlateportCity_BattleTentLobby_Text_259743
-	waitmessage
-	multichoice 17, 0, 111, 0
-	switch VAR_RESULT
-	case 0, SlateportCity_BattleTentLobby_EventScript_208B06
-	case 1, SlateportCity_BattleTentLobby_EventScript_208B14
-	case 2, SlateportCity_BattleTentLobby_EventScript_208B22
-	case 3, SlateportCity_BattleTentLobby_EventScript_208B30
-	case 4, SlateportCity_BattleTentLobby_EventScript_208B3E
-	case 5, SlateportCity_BattleTentLobby_EventScript_208B4C
-	case 127, SlateportCity_BattleTentLobby_EventScript_208B4C
-	end
-
-SlateportCity_BattleTentLobby_EventScript_208B06:: @ 8208B06
-	msgbox SlateportCity_BattleTentLobby_Text_2C5F08, 4
-	goto SlateportCity_BattleTentLobby_EventScript_208AA8
-	end
-
-SlateportCity_BattleTentLobby_EventScript_208B14:: @ 8208B14
-	msgbox SlateportCity_BattleTentLobby_Text_2C5F9D, 4
-	goto SlateportCity_BattleTentLobby_EventScript_208AA8
-	end
-
-SlateportCity_BattleTentLobby_EventScript_208B22:: @ 8208B22
-	msgbox SlateportCity_BattleTentLobby_Text_2C6020, 4
-	goto SlateportCity_BattleTentLobby_EventScript_208AA8
-	end
-
-SlateportCity_BattleTentLobby_EventScript_208B30:: @ 8208B30
-	msgbox SlateportCity_BattleTentLobby_Text_2C60C0, 4
-	goto SlateportCity_BattleTentLobby_EventScript_208AA8
-	end
-
-SlateportCity_BattleTentLobby_EventScript_208B3E:: @ 8208B3E
-	msgbox SlateportCity_BattleTentLobby_Text_2C61FE, 4
-	goto SlateportCity_BattleTentLobby_EventScript_208AA8
-	end
-
-SlateportCity_BattleTentLobby_EventScript_208B4C:: @ 8208B4C
-	releaseall
-	end
-
-SlateportCity_BattleTentLobby_Text_208B4E: @ 8208B4E
-	.string "So, like, I couldn’t find myself any\n"
-	.string "POKéMON that were, like, for me.\p"
-	.string "So, I figured, like, hey, I should file\n"
-	.string "a complaint to the guy there?\p"
-	.string "And he wouldn’t hear me out, like, hey!\n"
-	.string "So, like, total bummer, man!\p"
-	.string "Hey, like, you! Zip it, you know?\n"
-	.string "Just, you know, take this!$"
-
-SlateportCity_BattleTentLobby_Text_208C5C: @ 8208C5C
-	.string "That’s, like, TM41, you know?\n"
-	.string "Hey, it’s TORMENT, you hearing me?\p"
-	.string "Like, it won’t let the other guy\n"
-	.string "use the same move twice in a row, see?\p"
-	.string "Hey, now, you listen here, like,\n"
-	.string "I’m not laying a torment on you!$"
-
-SlateportCity_BattleTentLobby_Text_208D27: @ 8208D27
-	.string "I don’t really like BUG POKéMON,\n"
-	.string "but maybe I’ll try using some for\l"
-	.string "a change of pace.\p"
-	.string "Who knows, I might even get to like\n"
-	.string "them!$"
-
-SlateportCity_BattleTentLobby_Text_208DA6: @ 8208DA6
-	.string "You can battle all you want here even\n"
-	.string "if you don’t have any tough POKéMON.$"
-
-SlateportCity_BattleTentLobby_Text_208DF1: @ 8208DF1
-	.string "Wouldn’t it be nice if they had more of\n"
-	.string "a selection?$"
-
diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc
deleted file mode 100644
index ca6ab50b5..000000000
--- a/data/scripts/maps/SlateportCity_Harbor.inc
+++ /dev/null
@@ -1,567 +0,0 @@
-SlateportCity_Harbor_MapScripts:: @ 820C97D
-	map_script 3, SlateportCity_Harbor_MapScript1_20C983
-	.byte 0
-
-SlateportCity_Harbor_MapScript1_20C983: @ 820C983
-	setescapewarp SLATEPORT_CITY, 255, 28, 13
-	setvar VAR_TEMP_1, 0
-	compare VAR_0x40A0, 1
-	call_if 1, SlateportCity_Harbor_EventScript_20C9A9
-	checkflag FLAG_SYS_GAME_CLEAR
-	call_if 1, SlateportCity_Harbor_EventScript_20C9A5
-	end
-
-SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5
-	clearflag FLAG_0x35C
-	return
-
-SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9
-	savebgm MUS_AQA_0
-	setobjectxyperm 4, 12, 13
-	setobjectmovementtype 4, 9
-	setflag FLAG_0x389
-	return
-
-SlateportCity_Harbor_EventScript_20C9BB:: @ 820C9BB
-	lockall
-	setvar VAR_0x8008, 0
-	goto SlateportCity_Harbor_EventScript_20C9F5
-	end
-
-SlateportCity_Harbor_EventScript_20C9C7:: @ 820C9C7
-	lockall
-	setvar VAR_0x8008, 1
-	goto SlateportCity_Harbor_EventScript_20C9F5
-	end
-
-SlateportCity_Harbor_EventScript_20C9D3:: @ 820C9D3
-	lockall
-	setvar VAR_0x8008, 2
-	goto SlateportCity_Harbor_EventScript_20C9F5
-	end
-
-SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF
-	lockall
-	setvar VAR_0x8008, 3
-	applymovement 255, SlateportCity_Harbor_Movement_20CAEF
-	waitmovement 0
-	goto SlateportCity_Harbor_EventScript_20C9F5
-	end
-
-SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
-	applymovement 7, SlateportCity_Harbor_Movement_2725AA
-	waitmovement 0
-	applymovement 6, SlateportCity_Harbor_Movement_2725AA
-	applymovement 255, SlateportCity_Harbor_Movement_2725A6
-	waitmovement 0
-	msgbox SlateportCity_Harbor_Text_20D291, 4
-	closemessage
-	applymovement 6, SlateportCity_Harbor_Movement_20CAC8
-	applymovement 7, SlateportCity_Harbor_Movement_20CAC8
-	applymovement 8, SlateportCity_Harbor_Movement_20CAD2
-	waitmovement 0
-	removeobject 6
-	removeobject 7
-	removeobject 8
-	setvar VAR_0x40A0, 2
-	setflag FLAG_0x061
-	setflag FLAG_0x313
-	compare VAR_0x8008, 0
-	call_if 1, SlateportCity_Harbor_EventScript_20CA89
-	compare VAR_0x8008, 1
-	call_if 1, SlateportCity_Harbor_EventScript_20CA9E
-	compare VAR_0x8008, 2
-	call_if 1, SlateportCity_Harbor_EventScript_20CAB3
-	compare VAR_0x8008, 3
-	call_if 1, SlateportCity_Harbor_EventScript_20CAB3
-	msgbox SlateportCity_Harbor_Text_20D35A, 4
-	closemessage
-	setflag FLAG_0x335
-	setflag FLAG_0x336
-	moveobjectoffscreen 4
-	setobjectmovementtype 4, 10
-	releaseall
-	end
-
-SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89
-	applymovement 4, SlateportCity_Harbor_Movement_20CAE0
-	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_2725AA
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E
-	applymovement 4, SlateportCity_Harbor_Movement_20CAE6
-	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_2725A8
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3
-	applymovement 4, SlateportCity_Harbor_Movement_20CAEB
-	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_2725A8
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_Movement_20CAC8: @ 820CAC8
-	delay_16
-	delay_16
-	jump_up
-	set_invisible
-	step_end
-
-SlateportCity_Harbor_Movement_20CACD: @ 820CACD
-	delay_16
-	delay_16
-	jump_up
-	set_invisible
-	step_end
-
-SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_right
-	walk_right
-	walk_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	step_end
-
-SlateportCity_Harbor_Movement_20CAE0: @ 820CAE0
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	step_end
-
-SlateportCity_Harbor_Movement_20CAE6: @ 820CAE6
-	walk_left
-	walk_left
-	walk_up
-	walk_left
-	step_end
-
-SlateportCity_Harbor_Movement_20CAEB: @ 820CAEB
-	walk_left
-	walk_left
-	walk_left
-	step_end
-
-SlateportCity_Harbor_Movement_20CAEF: @ 820CAEF
-	walk_up
-	step_end
-
-SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1
-	lock
-	faceplayer
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq SlateportCity_Harbor_EventScript_20CB06
-	msgbox SlateportCity_Harbor_Text_20CE20, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06
-	msgbox SlateportCity_Harbor_Text_20CE87, 4
-	message SlateportCity_Harbor_Text_20CF1C
-	waitmessage
-	goto SlateportCity_Harbor_EventScript_20CB1A
-	end
-
-SlateportCity_Harbor_EventScript_20CB1A:: @ 820CB1A
-	checkflag FLAG_0x1D0
-	goto_eq SlateportCity_Harbor_EventScript_20CB50
-	multichoicedefault 18, 8, 56, 2, 0
-	switch VAR_RESULT
-	case 0, SlateportCity_Harbor_EventScript_20CB92
-	case 1, SlateportCity_Harbor_EventScript_20CC2D
-	case 127, SlateportCity_Harbor_EventScript_20CC2D
-	end
-
-SlateportCity_Harbor_EventScript_20CB50:: @ 820CB50
-	multichoicedefault 17, 6, 52, 2, 0
-	switch VAR_RESULT
-	case 0, SlateportCity_Harbor_EventScript_20CB92
-	case 1, SlateportCity_Harbor_EventScript_20CBBA
-	case 2, SlateportCity_Harbor_EventScript_20CC2D
-	case 127, SlateportCity_Harbor_EventScript_20CC2D
-	end
-
-SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88
-	msgbox SlateportCity_Harbor_Text_20CEC1, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92
-	msgbox SlateportCity_Harbor_Text_20CF93, 5
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_Harbor_EventScript_20CBDD
-	setvar VAR_PORTHOLE, 1
-	call SlateportCity_Harbor_EventScript_20CBE9
-	warp SS_TIDAL_CORRIDOR, 255, 1, 10
-	waitstate
-	release
-	end
-
-SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA
-	msgbox SlateportCity_Harbor_Text_20CFAE, 5
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_Harbor_EventScript_20CBDD
-	call SlateportCity_Harbor_EventScript_20CBE9
-	warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
-	waitstate
-	release
-	end
-
-SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD
-	message SlateportCity_Harbor_Text_20CFFA
-	waitmessage
-	goto SlateportCity_Harbor_EventScript_20CB1A
-	end
-
-SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9
-	msgbox SlateportCity_Harbor_Text_20CFCB, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6
-	waitmovement 0
-	delay 30
-	hideobjectat VAR_LAST_TALKED, SLATEPORT_CITY_HARBOR
-	compare VAR_FACING, 2
-	call_if 1, SlateportCity_Harbor_EventScript_20CC42
-	compare VAR_FACING, 4
-	call_if 1, SlateportCity_Harbor_EventScript_20CC37
-	delay 30
-	hideobjectat 255, PETALBURG_CITY
-	setvar VAR_0x8004, 5
-	call SlateportCity_Harbor_EventScript_2721E2
-	return
-
-SlateportCity_Harbor_EventScript_20CC2D:: @ 820CC2D
-	msgbox SlateportCity_Harbor_Text_20CF71, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_20CC37:: @ 820CC37
-	applymovement 255, SlateportCity_Harbor_Movement_20CC4D
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_EventScript_20CC42:: @ 820CC42
-	applymovement 255, SlateportCity_Harbor_Movement_20CC50
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_Movement_20CC4D: @ 820CC4D
-	walk_right
-	walk_in_place_fastest_up
-	step_end
-
-SlateportCity_Harbor_Movement_20CC50: @ 820CC50
-	walk_up
-	step_end
-
-SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52
-	lock
-	faceplayer
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, SlateportCity_Harbor_EventScript_20CC89
-	setvar VAR_0x8004, 0
-	checkflag FLAG_0x1BE
-	call_if 1, SlateportCity_Harbor_EventScript_20CC93
-	checkflag FLAG_0x1BF
-	call_if 1, SlateportCity_Harbor_EventScript_20CC93
-	compare VAR_0x8004, 2
-	goto_eq SlateportCity_Harbor_EventScript_20CC89
-	msgbox SlateportCity_Harbor_Text_20D08E, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_20CC89:: @ 820CC89
-	msgbox SlateportCity_Harbor_Text_20D01C, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_20CC93:: @ 820CC93
-	addvar VAR_0x8004, 1
-	return
-
-SlateportCity_Harbor_EventScript_20CC99:: @ 820CC99
-	msgbox SlateportCity_Harbor_Text_20D194, 2
-	end
-
-SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2
-	lock
-	faceplayer
-	checkflag FLAG_BADGE07_GET
-	goto_eq SlateportCity_Harbor_EventScript_20CD00
-	checkflag FLAG_0x10F
-	goto_eq SlateportCity_Harbor_EventScript_20CCF6
-	checkflag FLAG_0x070
-	goto_eq SlateportCity_Harbor_EventScript_20CCE9
-	compare VAR_0x40A0, 2
-	goto_eq SlateportCity_Harbor_EventScript_20CCDF
-	msgbox SlateportCity_Harbor_Text_20D232, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SlateportCity_Harbor_EventScript_20CCDF:: @ 820CCDF
-	msgbox SlateportCity_Harbor_Text_20D35A, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_20CCE9:: @ 820CCE9
-	setflag FLAG_0x10F
-	msgbox SlateportCity_Harbor_Text_20D42B, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6
-	msgbox SlateportCity_Harbor_Text_20D58A, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00
-	compare VAR_TEMP_1, 1
-	goto_eq SlateportCity_Harbor_EventScript_20CE11
-	checkitem ITEM_SCANNER, 1
-	compare VAR_RESULT, 1
-	goto_eq SlateportCity_Harbor_EventScript_20CD38
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq SlateportCity_Harbor_EventScript_20CD2E
-	msgbox SlateportCity_Harbor_Text_20D65C, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_20CD2E:: @ 820CD2E
-	msgbox SlateportCity_Harbor_Text_20D6CB, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_20CD38:: @ 820CD38
-	message SlateportCity_Harbor_Text_20D76C
-	waitmessage
-	goto SlateportCity_Harbor_EventScript_20CD44
-	end
-
-SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44
-	multichoice 0, 0, 46, 0
-	switch VAR_RESULT
-	case 0, SlateportCity_Harbor_EventScript_20CD7B
-	case 1, SlateportCity_Harbor_EventScript_20CDBB
-	case 2, SlateportCity_Harbor_EventScript_20CDFB
-	case 127, SlateportCity_Harbor_EventScript_20CDFB
-	end
-
-SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B
-	msgbox SlateportCity_Harbor_Text_20D8BC, 5
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_Harbor_EventScript_20CE05
-	giveitem_std ITEM_DEEP_SEA_TOOTH
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_Harbor_EventScript_272054
-	takeitem ITEM_SCANNER, 1
-	msgbox SlateportCity_Harbor_Text_20D94A, 4
-	setflag FLAG_0x126
-	goto SlateportCity_Harbor_EventScript_20CE11
-	end
-
-SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB
-	msgbox SlateportCity_Harbor_Text_20D8F1, 5
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_Harbor_EventScript_20CE05
-	giveitem_std ITEM_DEEP_SEA_SCALE
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_Harbor_EventScript_272054
-	takeitem ITEM_SCANNER, 1
-	msgbox SlateportCity_Harbor_Text_20D94A, 4
-	setflag FLAG_0x126
-	goto SlateportCity_Harbor_EventScript_20CE11
-	end
-
-SlateportCity_Harbor_EventScript_20CDFB:: @ 820CDFB
-	msgbox SlateportCity_Harbor_Text_20D841, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_20CE05:: @ 820CE05
-	message SlateportCity_Harbor_Text_20D926
-	waitmessage
-	goto SlateportCity_Harbor_EventScript_20CD44
-	end
-
-SlateportCity_Harbor_EventScript_20CE11:: @ 820CE11
-	setvar VAR_TEMP_1, 1
-	msgbox SlateportCity_Harbor_Text_20D970, 4
-	release
-	end
-
-SlateportCity_Harbor_Text_20CE20: @ 820CE20
-	.string "I beg your pardon?\n"
-	.string "You’re looking for a ship?\p"
-	.string "I’m sorry, the ferry service isn’t\n"
-	.string "available at present…$"
-
-SlateportCity_Harbor_Text_20CE87: @ 820CE87
-	.string "Hello, are you here for the ferry?\n"
-	.string "May I see your TICKET?$"
-
-
-SlateportCity_Harbor_Text_20CEC1: @ 820CEC1
-	.string "{PLAYER} doesn’t have the TICKET…\p"
-	.string "I’m terribly sorry.\p"
-	.string "You must have a TICKET to board\n"
-	.string "the ferry.$"
-
-SlateportCity_Harbor_Text_20CF1C: @ 820CF1C
-	.string "{PLAYER} flashed the TICKET.\p"
-	.string "Perfect! That’s all you need!\p"
-	.string "And where would you like to go?$"
-
-SlateportCity_Harbor_Text_20CF71: @ 820CF71
-	.string "Please sail with us another time!$"
-
-SlateportCity_Harbor_Text_20CF93: @ 820CF93
-	.string "LILYCOVE CITY it is, then!$"
-
-SlateportCity_Harbor_Text_20CFAE: @ 820CFAE
-	.string "BATTLE FRONTIER it is, then!$"
-
-SlateportCity_Harbor_Text_20CFCB: @ 820CFCB
-	.string "Please board the ferry and wait for\n"
-	.string "departure.$"
-
-SlateportCity_Harbor_Text_20CFFA: @ 820CFFA
-	.string "Then, where would you like to go?$"
-
-SlateportCity_Harbor_Text_20D01C: @ 820D01C
-	.string "A journey to the bottom of the sea…\n"
-	.string "I wonder what it’d be like?\p"
-	.string "I’d love to go deep underwater like\n"
-	.string "that someday.$"
-
-SlateportCity_Harbor_Text_20D08E: @ 820D08E
-	.string "For a ship to sail safely, we need to\n"
-	.string "know about the weather!\p"
-	.string "Speaking of weather, I heard something\n"
-	.string "from a guy at the WEATHER INSTITUTE.\p"
-	.string "He was saying abnormal weather has\n"
-	.string "been reported all over the place!\p"
-	.string "You should visit the WEATHER INSTITUTE\n"
-	.string "and ask around!$"
-
-SlateportCity_Harbor_Text_20D194: @ 820D194
-	.string "I wanted to go with CAPT. STERN on\n"
-	.string "the ocean floor exploration.\p"
-	.string "But the sub’s too small for me.\p"
-	.string "If I squeezed in, there wouldn’t be\n"
-	.string "any room for the CAPTAIN…$"
-
-SlateportCity_Harbor_Text_20D232: @ 820D232
-	.string "CAPT. STERN: Those thugs…\p"
-	.string "They’re the same lot who tried to rob\n"
-	.string "the DEVON GOODS at the MUSEUM.$"
-
-SlateportCity_Harbor_Text_20D291: @ 820D291
-	.string "ARCHIE: Oh?\n"
-	.string "Not you again…\p"
-	.string "You are tenacious to track us here,\n"
-	.string "that much I will give you.\p"
-	.string "But now…\n"
-	.string "No one can stop us! No one!\p"
-	.string "Or, will you follow us back to our\n"
-	.string "HIDEOUT in LILYCOVE CITY?\p"
-	.string "Fwahahahaha…$"
-
-SlateportCity_Harbor_Text_20D35A: @ 820D35A
-	.string "CAPT. STERN: Why…\p"
-	.string "Why would TEAM AQUA steal my\n"
-	.string "SUBMARINE EXPLORER 1?\p"
-	.string "They can’t be after the slumbering\n"
-	.string "POKéMON at the bottom of the sea…\p"
-	.string "But even if I were to chase them,\n"
-	.string "I don’t stand a chance against them…$"
-
-SlateportCity_Harbor_Text_20D42B: @ 820D42B
-	.string "CAPT. STERN: Oh, {PLAYER}{KUN}…\p"
-	.string "Okay… So TEAM AQUA left before you\n"
-	.string "could stop them…\p"
-	.string "Oh, no, don’t blame yourself.\n"
-	.string "You’re not responsible for this.\p"
-	.string "Trying to catch a submarine…\n"
-	.string "It’s impossible for most people.\p"
-	.string "You would need a POKéMON that knows\n"
-	.string "how to DIVE…\p"
-	.string "Perhaps if you went out to\n"
-	.string "MOSSDEEP CITY…\p"
-	.string "A lot of divers live out there, so\n"
-	.string "someone might teach you…$"
-
-SlateportCity_Harbor_Text_20D58A: @ 820D58A
-	.string "CAPT. STERN: Trying to catch a\n"
-	.string "submarine… It’s impossible.\p"
-	.string "You would need a POKéMON that knows\n"
-	.string "how to DIVE…\p"
-	.string "Perhaps if you went out to\n"
-	.string "MOSSDEEP CITY…\p"
-	.string "A lot of divers live out there, so\n"
-	.string "someone might teach you…$"
-
-SlateportCity_Harbor_Text_20D65C: @ 820D65C
-	.string "CAPT. STERN: Oh, yes.\n"
-	.string "MR. BRINEY came to our SHIPYARD.\p"
-	.string "It won’t be long now before we finish\n"
-	.string "making the ferry!$"
-
-SlateportCity_Harbor_Text_20D6CB: @ 820D6CB
-	.string "CAPT. STERN: {PLAYER}{KUN}!\p"
-	.string "We finally finished making the ferry\n"
-	.string "S.S. TIDAL!\p"
-	.string "We couldn’t have done it without\n"
-	.string "your friend MR. BRINEY.\p"
-	.string "Please go for a short cruise on it!$"
-
-SlateportCity_Harbor_Text_20D76C: @ 820D76C
-	.string "CAPT. STERN: Oh?\n"
-	.string "{PLAYER}{KUN}, that item you have…\p"
-	.string "That’s a SCANNER! That would sure\n"
-	.string "help us on our explorations.\p"
-	.string "{PLAYER}{KUN}, would you trade your\n"
-	.string "SCANNER for something?\p"
-	.string "Like, say, a DEEPSEATOOTH or\n"
-	.string "a DEEPSEASCALE that I have?$"
-
-SlateportCity_Harbor_Text_20D841: @ 820D841
-	.string "CAPT. STERN: Are you certain?\n"
-	.string "It’s useless to you, {PLAYER}{KUN}…\p"
-	.string "Well, okay, then. If you want to trade\n"
-	.string "your SCANNER, let me know.$"
-
-SlateportCity_Harbor_Text_20D8BC: @ 820D8BC
-	.string "CAPT. STERN: So you’ll trade it for\n"
-	.string "my DEEPSEATOOTH?$"
-
-SlateportCity_Harbor_Text_20D8F1: @ 820D8F1
-	.string "CAPT. STERN: So you’ll trade it for\n"
-	.string "my DEEPSEASCALE?$"
-
-SlateportCity_Harbor_Text_20D926: @ 820D926
-	.string "CAPT. STERN: Which one do you want?$"
-
-SlateportCity_Harbor_Text_20D94A: @ 820D94A
-	.string "{PLAYER} handed the SCANNER to\n"
-	.string "CAPT. STERN.$"
-
-SlateportCity_Harbor_Text_20D970: @ 820D970
-	.string "CAPT. STERN: Thanks, {PLAYER}{KUN}!\n"
-	.string "This will help our research a lot!$"
-
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
deleted file mode 100644
index 6a26ee0ff..000000000
--- a/data/scripts/maps/SootopolisCity.inc
+++ /dev/null
@@ -1,1784 +0,0 @@
-SootopolisCity_MapScripts:: @ 81E565C
-	map_script 1, SootopolisCity_MapScript1_1E5676
-	map_script 3, SootopolisCity_MapScript1_1E56EF
-	map_script 5, SootopolisCity_MapScript1_1E590B
-	map_script 2, SootopolisCity_MapScript2_1E5914
-	map_script 4, SootopolisCity_MapScript2_1E58DB
-	.byte 0
-
-SootopolisCity_MapScript1_1E5676: @ 81E5676
-	checkflag FLAG_0x09E
-	call_if 0, SootopolisCity_EventScript_1E56E5
-	checkflag FLAG_0x081
-	goto_if 0, SootopolisCity_EventScript_1E5692
-	checkflag FLAG_0x09E
-	call_if 0, SootopolisCity_EventScript_1E5693
-	end
-
-SootopolisCity_EventScript_1E5692:: @ 81E5692
-	end
-
-SootopolisCity_EventScript_1E5693:: @ 81E5693
-	setmetatile 9, 6, 584, 1
-	setmetatile 9, 17, 584, 1
-	setmetatile 9, 26, 584, 1
-	setmetatile 44, 17, 584, 1
-	setmetatile 8, 35, 584, 1
-	setmetatile 53, 28, 584, 1
-	setmetatile 45, 6, 584, 1
-	setmetatile 48, 25, 584, 1
-	setmetatile 51, 36, 584, 1
-	return
-
-SootopolisCity_EventScript_1E56E5:: @ 81E56E5
-	setmetatile 31, 32, 592, 1
-	return
-
-SootopolisCity_MapScript1_1E56EF: @ 81E56EF
-	setflag FLAG_VISITED_SOOTOPOLIS_CITY
-	compare VAR_0x405E, 1
-	call_if 1, SootopolisCity_EventScript_1E5781
-	compare VAR_0x40CA, 1
-	call_if 1, SootopolisCity_EventScript_1E5781
-	call SootopolisCity_EventScript_1E5805
-	call SootopolisCity_EventScript_1E57B2
-	compare VAR_0x405E, 1
-	call_if 1, SootopolisCity_EventScript_1E5785
-	compare VAR_0x405E, 2
-	call_if 1, SootopolisCity_EventScript_1E5785
-	compare VAR_0x405E, 3
-	call_if 1, SootopolisCity_EventScript_1E5785
-	compare VAR_0x405E, 4
-	call_if 1, SootopolisCity_EventScript_1E5785
-	compare VAR_0x405E, 5
-	call_if 1, SootopolisCity_EventScript_1E5785
-	compare VAR_0x405E, 2
-	call_if 1, SootopolisCity_EventScript_1E5842
-	compare VAR_0x405E, 3
-	call_if 1, SootopolisCity_EventScript_1E5842
-	compare VAR_0x405E, 4
-	call_if 1, SootopolisCity_EventScript_1E585B
-	compare VAR_0x405E, 5
-	call_if 1, SootopolisCity_EventScript_1E5871
-	compare VAR_0x405E, 6
-	call_if 1, SootopolisCity_EventScript_1E58D3
-	end
-
-SootopolisCity_EventScript_1E5781:: @ 81E5781
-	setflag FLAG_SPECIAL_FLAG_0x4000
-	return
-
-SootopolisCity_EventScript_1E5785:: @ 81E5785
-	setobjectxyperm 3, 13, 48
-	setobjectxyperm 5, 46, 32
-	setobjectxyperm 4, 48, 41
-	setobjectxyperm 8, 45, 43
-	setobjectmovementtype 3, 7
-	setobjectmovementtype 5, 9
-	setobjectmovementtype 4, 9
-	setobjectmovementtype 8, 9
-	return
-
-SootopolisCity_EventScript_1E57B2:: @ 81E57B2
-	compare VAR_0x405E, 0
-	goto_eq SootopolisCity_EventScript_1E5800
-	compare VAR_0x405E, 6
-	goto_if 4, SootopolisCity_EventScript_1E5800
-	compare VAR_0x405E, 1
-	goto_eq SootopolisCity_EventScript_1E5801
-	compare VAR_0x405E, 2
-	goto_eq SootopolisCity_EventScript_1E5801
-	compare VAR_0x405E, 3
-	goto_eq SootopolisCity_EventScript_1E5801
-	compare VAR_0x405E, 4
-	goto_eq SootopolisCity_EventScript_1E5801
-	compare VAR_0x40CA, 1
-	goto_if 3, SootopolisCity_EventScript_1E5801
-	return
-
-SootopolisCity_EventScript_1E5800:: @ 81E5800
-	return
-
-SootopolisCity_EventScript_1E5801:: @ 81E5801
-	setmaplayoutindex 357
-	return
-
-SootopolisCity_EventScript_1E5805:: @ 81E5805
-	compare VAR_0x405E, 0
-	goto_eq SootopolisCity_EventScript_1E583D
-	compare VAR_0x405E, 6
-	goto_if 4, SootopolisCity_EventScript_1E583D
-	compare VAR_0x405E, 1
-	goto_eq SootopolisCity_EventScript_1E583E
-	compare VAR_0x40CA, 1
-	goto_eq SootopolisCity_EventScript_1E583E
-	compare VAR_0x40CA, 1
-	goto_if 3, SootopolisCity_EventScript_27207A
-	return
-
-SootopolisCity_EventScript_1E583D:: @ 81E583D
-	return
-
-SootopolisCity_EventScript_1E583E:: @ 81E583E
-	setweather 13
-	return
-
-SootopolisCity_EventScript_1E5842:: @ 81E5842
-	checkflag FLAG_0x133
-	goto_eq SootopolisCity_EventScript_1E584C
-	return
-
-SootopolisCity_EventScript_1E584C:: @ 81E584C
-	setobjectxyperm 1, 30, 18
-	setobjectxyperm 7, 32, 18
-	return
-
-SootopolisCity_EventScript_1E585B:: @ 81E585B
-	setobjectxyperm 1, 30, 18
-	setobjectxyperm 18, 31, 18
-	setobjectxyperm 7, 32, 18
-	end
-
-SootopolisCity_EventScript_1E5871:: @ 81E5871
-	setobjectxyperm 1, 31, 18
-	setobjectxyperm 7, 29, 33
-	setobjectxyperm 16, 33, 35
-	setobjectxyperm 17, 34, 35
-	compare VAR_0x40D8, 0
-	call_if 1, SootopolisCity_EventScript_1E58AF
-	compare VAR_0x40D8, 1
-	call_if 1, SootopolisCity_EventScript_1E58BB
-	compare VAR_0x40D8, 2
-	call_if 1, SootopolisCity_EventScript_1E58C7
-	return
-
-SootopolisCity_EventScript_1E58AF:: @ 81E58AF
-	setobjectxyperm 18, 31, 33
-	setobjectmovementtype 18, 8
-	return
-
-SootopolisCity_EventScript_1E58BB:: @ 81E58BB
-	setobjectxyperm 18, 32, 33
-	setobjectmovementtype 18, 8
-	return
-
-SootopolisCity_EventScript_1E58C7:: @ 81E58C7
-	setobjectxyperm 18, 30, 33
-	setobjectmovementtype 18, 8
-	return
-
-SootopolisCity_EventScript_1E58D3:: @ 81E58D3
-	setobjectxyperm 1, 31, 18
-	return
-
-SootopolisCity_MapScript2_1E58DB: @ 81E58DB
-	map_script_2 VAR_0x405E, 5, SootopolisCity_EventScript_1E58E5
-	.2byte 0
-
-SootopolisCity_EventScript_1E58E5:: @ 81E58E5
-	compare VAR_0x40CA, 1
-	call_if 1, SootopolisCity_EventScript_1E58FC
-	compare VAR_0x40CA, 2
-	call_if 1, SootopolisCity_EventScript_1E5901
-	end
-
-SootopolisCity_EventScript_1E58FC:: @ 81E58FC
-	turnobject 255, 2
-	return
-
-SootopolisCity_EventScript_1E5901:: @ 81E5901
-	turnobject 255, 2
-	setvar VAR_0x40CA, 3
-	return
-
-SootopolisCity_MapScript1_1E590B: @ 81E590B
-	setdivewarp UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6
-	end
-
-SootopolisCity_MapScript2_1E5914: @ 81E5914
-	map_script_2 VAR_0x405E, 1, SootopolisCity_EventScript_1E5926
-	map_script_2 VAR_0x40CA, 1, SootopolisCity_EventScript_1E5BFE
-	.2byte 0
-
-SootopolisCity_EventScript_1E5926:: @ 81E5926
-	lockall
-	special StorePlayerCoordsInVars
-	compare VAR_0x8004, 43
-	goto_if 5, SootopolisCity_EventScript_1E5A82
-	compare VAR_0x8005, 32
-	goto_if 5, SootopolisCity_EventScript_1E5A82
-	goto SootopolisCity_EventScript_1E5946
-	end
-
-SootopolisCity_EventScript_1E5946:: @ 81E5946
-	delay 60
-	special SpawnScriptEventObject
-	applymovement 127, SootopolisCity_Movement_1E5A68
-	waitmovement 0
-	special RemoveScriptEventObject
-	delay 60
-	fadescreenspeed 1, 8
-	setweather 15
-	doweather
-	setvar VAR_0x8004, 0
-	special sub_813B7D8
-	waitstate
-	applymovement 10, SootopolisCity_Movement_2725A4
-	applymovement 9, SootopolisCity_Movement_2725A8
-	waitmovement 0
-	delay 60
-	waitse
-	playmoncry SPECIES_KYOGRE, 2
-	applymovement 10, SootopolisCity_Movement_1E5BB8
-	applymovement 9, SootopolisCity_Movement_1E5BE5
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 8
-	setvar VAR_0x8007, 5
-	special sub_8139560
-	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_GROUDON, 2
-	applymovement 10, SootopolisCity_Movement_1E5BC2
-	applymovement 9, SootopolisCity_Movement_1E5BDD
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 8
-	setvar VAR_0x8007, 5
-	special sub_8139560
-	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_KYOGRE, 2
-	applymovement 10, SootopolisCity_Movement_1E5BB8
-	applymovement 9, SootopolisCity_Movement_1E5BE5
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 8
-	setvar VAR_0x8007, 5
-	special sub_8139560
-	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
-	waitmovement 0
-	special SpawnScriptEventObject
-	applymovement 10, SootopolisCity_Movement_1E5BD6
-	applymovement 9, SootopolisCity_Movement_1E5BF7
-	applymovement 127, SootopolisCity_Movement_1E5A75
-	waitmovement 0
-	special RemoveScriptEventObject
-	setvar VAR_0x405E, 2
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	releaseall
-	end
-
-SootopolisCity_Movement_1E5A68: @ 81E5A68
-	walk_slow_diag_southwest
-	walk_slow_diag_southwest
-	walk_slow_diag_southwest
-	walk_slow_diag_southwest
-	walk_slow_diag_southwest
-	walk_slow_diag_southwest
-	walk_slow_diag_southwest
-	walk_slow_diag_southwest
-	walk_slow_diag_southwest
-	walk_slow_diag_southwest
-	walk_slow_diag_southwest
-	walk_slow_diag_southwest
-	step_end
-
-SootopolisCity_Movement_1E5A75: @ 81E5A75
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	step_end
-
-SootopolisCity_EventScript_1E5A82:: @ 81E5A82
-	delay 60
-	special SpawnScriptEventObject
-	applymovement 127, SootopolisCity_Movement_1E5BA4
-	waitmovement 0
-	special RemoveScriptEventObject
-	delay 60
-	fadescreenspeed 1, 8
-	setweather 15
-	doweather
-	setvar VAR_0x8004, 0
-	special sub_813B7D8
-	waitstate
-	applymovement 10, SootopolisCity_Movement_2725A4
-	applymovement 9, SootopolisCity_Movement_2725A8
-	waitmovement 0
-	delay 60
-	waitse
-	playmoncry SPECIES_KYOGRE, 2
-	applymovement 10, SootopolisCity_Movement_1E5BB8
-	applymovement 9, SootopolisCity_Movement_1E5BE5
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 8
-	setvar VAR_0x8007, 5
-	special sub_8139560
-	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_GROUDON, 2
-	applymovement 10, SootopolisCity_Movement_1E5BC2
-	applymovement 9, SootopolisCity_Movement_1E5BDD
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 8
-	setvar VAR_0x8007, 5
-	special sub_8139560
-	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_KYOGRE, 2
-	applymovement 10, SootopolisCity_Movement_1E5BB8
-	applymovement 9, SootopolisCity_Movement_1E5BE5
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 8
-	setvar VAR_0x8007, 5
-	special sub_8139560
-	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
-	waitmovement 0
-	special SpawnScriptEventObject
-	applymovement 10, SootopolisCity_Movement_1E5BD6
-	applymovement 9, SootopolisCity_Movement_1E5BF7
-	applymovement 127, SootopolisCity_Movement_1E5BAE
-	waitmovement 0
-	special RemoveScriptEventObject
-	setvar VAR_0x405E, 2
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	releaseall
-	end
-
-SootopolisCity_Movement_1E5BA4: @ 81E5BA4
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-SootopolisCity_Movement_1E5BAE: @ 81E5BAE
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_slow_diag_southwest
-	walk_slow_diag_southwest
-	step_end
-
-SootopolisCity_Movement_1E5BB8: @ 81E5BB8
-	walk_in_place_slow_left
-	walk_in_place_slow_left
-	walk_in_place_slow_left
-	delay_16
-	delay_16
-	delay_16
-	init_affine_anim
-	walk_left_affine
-	clear_affine_anim
-	step_end
-
-SootopolisCity_Movement_1E5BC2: @ 81E5BC2
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	init_affine_anim
-	walk_left_affine
-	clear_affine_anim
-	step_end
-
-SootopolisCity_Movement_1E5BCF: @ 81E5BCF
-	lock_facing_direction
-	walk_right
-	delay_16
-	delay_16
-	delay_16
-	unlock_facing_direction
-	step_end
-
-SootopolisCity_Movement_1E5BD6: @ 81E5BD6
-	walk_in_place_slow_left
-	walk_in_place_slow_left
-	walk_in_place_slow_left
-	walk_in_place_slow_left
-	walk_in_place_slow_left
-	walk_in_place_slow_left
-	step_end
-
-SootopolisCity_Movement_1E5BDD: @ 81E5BDD
-	walk_in_place_slow_right
-	walk_in_place_slow_right
-	walk_in_place_slow_right
-	delay_16
-	delay_16
-	delay_16
-	walk_fast_right
-	step_end
-
-SootopolisCity_Movement_1E5BE5: @ 81E5BE5
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_fast_right
-	step_end
-
-SootopolisCity_Movement_1E5BF0: @ 81E5BF0
-	lock_facing_direction
-	walk_left
-	delay_16
-	delay_16
-	delay_16
-	unlock_facing_direction
-	step_end
-
-SootopolisCity_Movement_1E5BF7: @ 81E5BF7
-	walk_in_place_slow_right
-	walk_in_place_slow_right
-	walk_in_place_slow_right
-	walk_in_place_slow_right
-	walk_in_place_slow_right
-	walk_in_place_slow_right
-	step_end
-
-SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE
-	lockall
-	special StorePlayerCoordsInVars
-	compare VAR_0x8004, 43
-	goto_if 5, SootopolisCity_EventScript_1E5CCE
-	compare VAR_0x8005, 32
-	goto_if 5, SootopolisCity_EventScript_1E5CCE
-	goto SootopolisCity_EventScript_1E5C1E
-	end
-
-SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
-	delay 60
-	special SpawnScriptEventObject
-	applymovement 127, SootopolisCity_Movement_1E5A68
-	waitmovement 0
-	special RemoveScriptEventObject
-	delay 60
-	fadescreenspeed 1, 8
-	call SootopolisCity_EventScript_1E5D82
-	removeobject 9
-	removeobject 10
-	addobject 11
-	setvar VAR_0x8004, 1
-	special sub_813B7D8
-	waitstate
-	playse SE_T_KAMI
-	special SpawnScriptEventObject
-	applymovement 127, SootopolisCity_Movement_1E5E63
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_RAYQUAZA, 2
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 8
-	setvar VAR_0x8007, 3
-	special sub_8139560
-	waitstate
-	waitse
-	playmoncry SPECIES_RAYQUAZA, 2
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 8
-	setvar VAR_0x8007, 5
-	special sub_8139560
-	waitstate
-	waitmoncry
-	setweather 0
-	doweather
-	applymovement 11, SootopolisCity_Movement_1E5E5B
-	waitmovement 0
-	removeobject 11
-	special WaitWeather
-	waitstate
-	clearflag FLAG_SYS_WEATHER_CTRL
-	setvar VAR_0x40CA, 3
-	clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
-	fadenewbgm MUS_RUNECITY
-	delay 120
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	warp8 SOOTOPOLIS_CITY, 255, 43, 32
-	waitstate
-	end
-
-SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
-	delay 60
-	special SpawnScriptEventObject
-	applymovement 127, SootopolisCity_Movement_1E5BA4
-	waitmovement 0
-	special RemoveScriptEventObject
-	delay 60
-	fadescreenspeed 1, 8
-	call SootopolisCity_EventScript_1E5D82
-	removeobject 9
-	removeobject 10
-	addobject 11
-	setvar VAR_0x8004, 1
-	special sub_813B7D8
-	waitstate
-	special SpawnScriptEventObject
-	applymovement 127, SootopolisCity_Movement_1E5E63
-	applymovement 255, SootopolisCity_Movement_1E5E68
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_RAYQUAZA, 2
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 8
-	setvar VAR_0x8007, 3
-	special sub_8139560
-	waitstate
-	waitse
-	playmoncry SPECIES_RAYQUAZA, 2
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 8
-	setvar VAR_0x8007, 5
-	special sub_8139560
-	waitstate
-	waitmoncry
-	setweather 0
-	doweather
-	applymovement 11, SootopolisCity_Movement_1E5E5B
-	waitmovement 0
-	removeobject 11
-	special WaitWeather
-	waitstate
-	clearflag FLAG_SYS_WEATHER_CTRL
-	setvar VAR_0x40CA, 2
-	clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
-	fadenewbgm MUS_NAMINORI
-	delay 120
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	warp8 SOOTOPOLIS_CITY, 255, 29, 53
-	waitstate
-	end
-
-SootopolisCity_EventScript_1E5D82:: @ 81E5D82
-	setmetatile 27, 43, 656, 0
-	setmetatile 28, 43, 656, 0
-	setmetatile 29, 43, 656, 0
-	setmetatile 30, 43, 656, 0
-	setmetatile 27, 44, 656, 0
-	setmetatile 28, 44, 656, 0
-	setmetatile 29, 44, 656, 0
-	setmetatile 30, 44, 656, 0
-	setmetatile 27, 45, 656, 0
-	setmetatile 28, 45, 656, 0
-	setmetatile 29, 45, 656, 0
-	setmetatile 30, 45, 656, 0
-	setmetatile 32, 43, 656, 0
-	setmetatile 33, 43, 656, 0
-	setmetatile 34, 43, 656, 0
-	setmetatile 35, 43, 656, 0
-	setmetatile 32, 44, 656, 0
-	setmetatile 33, 44, 656, 0
-	setmetatile 34, 44, 656, 0
-	setmetatile 35, 44, 656, 0
-	setmetatile 32, 45, 656, 0
-	setmetatile 33, 45, 656, 0
-	setmetatile 34, 45, 656, 0
-	setmetatile 35, 45, 656, 0
-	return
-
-SootopolisCity_Movement_1E5E5B: @ 81E5E5B
-	walk_fast_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	walk_fastest_up
-	step_end
-
-SootopolisCity_Movement_1E5E63: @ 81E5E63
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-SootopolisCity_Movement_1E5E68: @ 81E5E68
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-SootopolisCity_Movement_1E5E6D: @ 81E5E6D
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	step_end
-
-SootopolisCity_Movement_1E5E72: @ 81E5E72
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_slow_diag_northeast
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-SootopolisCity_Movement_1E5E7F: @ 81E5E7F
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_slow_diag_southwest
-	walk_slow_diag_southwest
-	step_end
-
-SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D
-	lock
-	faceplayer
-	compare VAR_0x405E, 6
-	goto_if 4, SootopolisCity_EventScript_1E5EC4
-	compare VAR_0x405E, 5
-	goto_eq SootopolisCity_EventScript_1E5ECE
-	compare VAR_0x405E, 2
-	goto_if 4, SootopolisCity_EventScript_1E5EBA
-	msgbox SootopolisCity_Text_1E6D77, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E5EBA:: @ 81E5EBA
-	msgbox SootopolisCity_Text_1E6DFE, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E5EC4:: @ 81E5EC4
-	msgbox SootopolisCity_Text_1E6F38, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE
-	msgbox SootopolisCity_Text_1E6ED4, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8
-	lock
-	faceplayer
-	compare VAR_0x405E, 1
-	goto_if 3, SootopolisCity_EventScript_1E5F1B
-	compare VAR_0x405E, 6
-	goto_if 4, SootopolisCity_EventScript_1E5F1B
-	compare VAR_0x405E, 5
-	goto_eq SootopolisCity_EventScript_1E5F10
-	msgbox SootopolisCity_Text_1E6BFF, 4
-	closemessage
-	applymovement 3, SootopolisCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SootopolisCity_EventScript_1E5F10:: @ 81E5F10
-	msgbox SootopolisCity_Text_1E6C53, 4
-	closemessage
-	release
-	end
-
-SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
-	dodailyevents
-	special GetPlayerBigGuyGirlString
-	checkflag FLAG_0x932
-	goto_eq SootopolisCity_EventScript_1E5FBB
-	msgbox SootopolisCity_Text_2A7BB0, 4
-	random 10
-	addvar VAR_RESULT, 20
-	addvar VAR_RESULT, 133
-	giveitem_std VAR_RESULT
-	compare VAR_RESULT, 0
-	goto_eq SootopolisCity_EventScript_272054
-	setflag FLAG_0x932
-	msgbox SootopolisCity_Text_2A7C7C, 4
-	random 2
-	compare VAR_RESULT, 0
-	goto_eq SootopolisCity_EventScript_1E5F79
-	compare VAR_RESULT, 1
-	goto_eq SootopolisCity_EventScript_1E5F9A
-	end
-
-SootopolisCity_EventScript_1E5F79:: @ 81E5F79
-	giveitem_std ITEM_FIGY_BERRY
-	compare VAR_RESULT, 0
-	goto_eq SootopolisCity_EventScript_272054
-	msgbox SootopolisCity_Text_2A7CB7, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A
-	giveitem_std ITEM_IAPAPA_BERRY
-	compare VAR_RESULT, 0
-	goto_eq SootopolisCity_EventScript_272054
-	msgbox SootopolisCity_Text_2A7CB7, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB
-	msgbox SootopolisCity_Text_2A7CEC, 5
-	compare VAR_RESULT, 1
-	goto_eq SootopolisCity_EventScript_1E5FD8
-	msgbox SootopolisCity_Text_2A7DD2, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8
-	msgbox SootopolisCity_Text_2A7D80, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2
-	lockall
-	applymovement 2, SootopolisCity_Movement_27259E
-	waitmovement 0
-	compare VAR_0x405E, 5
-	goto_eq SootopolisCity_EventScript_1E600D
-	msgbox SootopolisCity_Text_1E71A1, 4
-	closemessage
-	applymovement 2, SootopolisCity_Movement_2725A2
-	waitmovement 0
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E600D:: @ 81E600D
-	msgbox SootopolisCity_Text_1E728C, 4
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E6017:: @ 81E6017
-	lock
-	faceplayer
-	compare VAR_0x405E, 6
-	goto_if 4, SootopolisCity_EventScript_1E602E
-	msgbox SootopolisCity_Text_1E6CCA, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E602E:: @ 81E602E
-	msgbox SootopolisCity_Text_1E6D57, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E6038:: @ 81E6038
-	lock
-	faceplayer
-	compare VAR_0x405E, 6
-	goto_if 4, SootopolisCity_EventScript_1E607A
-	compare VAR_0x405E, 5
-	goto_eq SootopolisCity_EventScript_1E6084
-	compare VAR_0x405E, 2
-	goto_if 4, SootopolisCity_EventScript_1E6065
-	msgbox SootopolisCity_Text_1E6F90, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E6065:: @ 81E6065
-	msgbox SootopolisCity_Text_1E7078, 4
-	closemessage
-	applymovement 8, SootopolisCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SootopolisCity_EventScript_1E607A:: @ 81E607A
-	msgbox SootopolisCity_Text_1E710B, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E6084:: @ 81E6084
-	msgbox SootopolisCity_Text_1E70D4, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E608E:: @ 81E608E
-	lockall
-	applymovement 4, SootopolisCity_Movement_27259E
-	waitmovement 0
-	compare VAR_0x405E, 5
-	goto_eq SootopolisCity_EventScript_1E60D9
-	compare VAR_0x405E, 6
-	goto_if 4, SootopolisCity_EventScript_1E60CF
-	compare VAR_0x405E, 1
-	goto_if 3, SootopolisCity_EventScript_1E60CF
-	msgbox SootopolisCity_Text_1E690B, 4
-	closemessage
-	applymovement 4, SootopolisCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SootopolisCity_EventScript_1E60CF:: @ 81E60CF
-	msgbox SootopolisCity_Text_1E68A1, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E60D9:: @ 81E60D9
-	msgbox SootopolisCity_Text_1E6920, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E60E3:: @ 81E60E3
-	lockall
-	applymovement 5, SootopolisCity_Movement_27259E
-	waitmovement 0
-	compare VAR_0x405E, 5
-	goto_eq SootopolisCity_EventScript_1E612D
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq SootopolisCity_EventScript_1E6137
-	compare VAR_0x405E, 6
-	goto_if 4, SootopolisCity_EventScript_1E6141
-	compare VAR_0x405E, 1
-	goto_if 3, SootopolisCity_EventScript_1E6141
-	msgbox SootopolisCity_Text_1E6692, 4
-	closemessage
-	applymovement 5, SootopolisCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SootopolisCity_EventScript_1E612D:: @ 81E612D
-	msgbox SootopolisCity_Text_1E6750, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E6137:: @ 81E6137
-	msgbox SootopolisCity_Text_1E677F, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E6141:: @ 81E6141
-	msgbox SootopolisCity_Text_1E6618, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E614B:: @ 81E614B
-	msgbox SootopolisCity_Text_1E656F, 3
-	end
-
-SootopolisCity_EventScript_1E6154:: @ 81E6154
-	msgbox SootopolisCity_Text_1E65C8, 3
-	end
-
-SootopolisCity_EventScript_1E615D:: @ 81E615D
-	msgbox SootopolisCity_Text_1E6604, 3
-	end
-
-SootopolisCity_EventScript_1E6166:: @ 81E6166
-	lockall
-	applymovement 7, SootopolisCity_Movement_27259E
-	waitmovement 0
-	checkflag FLAG_0x133
-	call_if 0, SootopolisCity_EventScript_1E61CC
-	compare VAR_0x405E, 2
-	goto_eq SootopolisCity_EventScript_1E61AE
-	compare VAR_0x405E, 3
-	goto_eq SootopolisCity_EventScript_1E61C2
-	compare VAR_0x405E, 4
-	goto_eq SootopolisCity_EventScript_1E61C2
-	checkflag FLAG_0x09E
-	goto_eq SootopolisCity_EventScript_1E61B8
-	msgbox SootopolisCity_Text_1E78E5, 4
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E61AE:: @ 81E61AE
-	msgbox SootopolisCity_Text_1E7866, 4
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E61B8:: @ 81E61B8
-	msgbox SootopolisCity_Text_1E794B, 4
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E61C2:: @ 81E61C2
-	msgbox SootopolisCity_Text_1E789A, 4
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E61CC:: @ 81E61CC
-	msgbox SootopolisCity_Text_1E75CB, 4
-	closemessage
-	compare VAR_FACING, 3
-	call_if 1, SootopolisCity_EventScript_1E6243
-	compare VAR_FACING, 2
-	call_if 1, SootopolisCity_EventScript_1E6255
-	msgbox SootopolisCity_Text_1E7737, 4
-	closemessage
-	applymovement 7, SootopolisCity_Movement_1E62D4
-	applymovement 255, SootopolisCity_Movement_1E630E
-	waitmovement 0
-	delay 120
-	applymovement 1, SootopolisCity_Movement_1E6341
-	waitmovement 0
-	applymovement 7, SootopolisCity_Movement_1E6344
-	applymovement 255, SootopolisCity_Movement_1E634F
-	waitmovement 0
-	msgbox SootopolisCity_Text_1E77F0, 4
-	closemessage
-	setflag FLAG_0x133
-	applymovement 255, SootopolisCity_Movement_1E635A
-	waitmovement 0
-	warp CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20
-	waitstate
-	end
-
-SootopolisCity_EventScript_1E6243:: @ 81E6243
-	applymovement 7, SootopolisCity_Movement_1E6267
-	applymovement 255, SootopolisCity_Movement_1E628C
-	waitmovement 0
-	return
-
-SootopolisCity_EventScript_1E6255:: @ 81E6255
-	applymovement 7, SootopolisCity_Movement_1E6267
-	applymovement 255, SootopolisCity_Movement_1E62B0
-	waitmovement 0
-	return
-
-SootopolisCity_Movement_1E6267: @ 81E6267
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_down
-	step_end
-
-SootopolisCity_Movement_1E628C: @ 81E628C
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-SootopolisCity_Movement_1E62B0: @ 81E62B0
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-SootopolisCity_Movement_1E62D4: @ 81E62D4
-	walk_up
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	delay_4
-	walk_in_place_fastest_left
-	delay_16
-	delay_16
-	walk_right
-	walk_up
-	walk_up
-	step_end
-
-SootopolisCity_Movement_1E630E: @ 81E630E
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	step_end
-
-SootopolisCity_Movement_1E6341: @ 81E6341
-	walk_slow_left
-	walk_in_place_fastest_right
-	step_end
-
-SootopolisCity_Movement_1E6344: @ 81E6344
-	walk_down
-	walk_down
-	walk_left
-	delay_8
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_in_place_fastest_left
-	step_end
-
-SootopolisCity_Movement_1E634F: @ 81E634F
-	delay_16
-	delay_16
-	delay_16
-	delay_8
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_right
-	step_end
-
-SootopolisCity_Movement_1E635A: @ 81E635A
-	walk_up
-	walk_up
-	step_end
-
-SootopolisCity_EventScript_1E635D:: @ 81E635D
-	lockall
-	applymovement 15, SootopolisCity_Movement_27259E
-	waitmovement 0
-	compare VAR_0x405E, 5
-	goto_eq SootopolisCity_EventScript_1E6388
-	msgbox SootopolisCity_Text_1E67DC, 4
-	closemessage
-	applymovement 15, SootopolisCity_Movement_2725A2
-	waitmovement 0
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E6388:: @ 81E6388
-	msgbox SootopolisCity_Text_1E6853, 4
-	closemessage
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E6393:: @ 81E6393
-	lockall
-	compare VAR_0x405E, 5
-	goto_eq SootopolisCity_EventScript_1E63C7
-	msgbox SootopolisCity_Text_1E6936, 4
-	closemessage
-	applymovement 14, SootopolisCity_Movement_27259E
-	waitmovement 0
-	msgbox SootopolisCity_Text_1E696C, 4
-	closemessage
-	applymovement 14, SootopolisCity_Movement_2725A2
-	waitmovement 0
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E63C7:: @ 81E63C7
-	applymovement 14, SootopolisCity_Movement_27259E
-	waitmovement 0
-	msgbox SootopolisCity_Text_1E69B8, 4
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E63DB:: @ 81E63DB
-	lockall
-	applymovement 13, SootopolisCity_Movement_27259E
-	waitmovement 0
-	compare VAR_0x405E, 5
-	goto_eq SootopolisCity_EventScript_1E6406
-	msgbox SootopolisCity_Text_1E6C7C, 4
-	closemessage
-	applymovement 13, SootopolisCity_Movement_2725A2
-	waitmovement 0
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E6406:: @ 81E6406
-	msgbox SootopolisCity_Text_1E6CA6, 4
-	closemessage
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E6411:: @ 81E6411
-	lockall
-	applymovement 12, SootopolisCity_Movement_27259E
-	waitmovement 0
-	compare VAR_0x405E, 5
-	goto_eq SootopolisCity_EventScript_1E643C
-	msgbox SootopolisCity_Text_1E6A50, 4
-	closemessage
-	applymovement 12, SootopolisCity_Movement_2725A2
-	waitmovement 0
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E643C:: @ 81E643C
-	msgbox SootopolisCity_Text_1E6B2A, 4
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E6446:: @ 81E6446
-	lock
-	faceplayer
-	compare VAR_0x405E, 4
-	goto_eq SootopolisCity_EventScript_1E64D8
-	checkflag FLAG_0x138
-	goto_eq SootopolisCity_EventScript_1E64E2
-	checkflag FLAG_0x09E
-	goto_eq SootopolisCity_EventScript_1E646F
-	msgbox SootopolisCity_Text_1E7A3E, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E646F:: @ 81E646F
-	msgbox SootopolisCity_Text_1E7ACF, 4
-	giveitem_std ITEM_HM07
-	setflag FLAG_0x138
-	msgbox SootopolisCity_Text_1E7B86, 4
-	closemessage
-	compare VAR_FACING, 2
-	call_if 1, SootopolisCity_EventScript_1E64B2
-	compare VAR_FACING, 4
-	call_if 1, SootopolisCity_EventScript_1E64B2
-	compare VAR_FACING, 3
-	call_if 1, SootopolisCity_EventScript_1E64C5
-	release
-	end
-
-SootopolisCity_EventScript_1E64B2:: @ 81E64B2
-	applymovement 18, SootopolisCity_Movement_1E64EC
-	waitmovement 0
-	moveobjectoffscreen 18
-	setvar VAR_0x40D8, 1
-	return
-
-SootopolisCity_EventScript_1E64C5:: @ 81E64C5
-	applymovement 18, SootopolisCity_Movement_1E64EF
-	waitmovement 0
-	moveobjectoffscreen 18
-	setvar VAR_0x40D8, 2
-	return
-
-SootopolisCity_EventScript_1E64D8:: @ 81E64D8
-	msgbox SootopolisCity_Text_1E79C8, 4
-	release
-	end
-
-SootopolisCity_EventScript_1E64E2:: @ 81E64E2
-	msgbox SootopolisCity_Text_1E7CBC, 4
-	release
-	end
-
-SootopolisCity_Movement_1E64EC: @ 81E64EC
-	walk_right
-	walk_in_place_fastest_down
-	step_end
-
-SootopolisCity_Movement_1E64EF: @ 81E64EF
-	walk_left
-	walk_in_place_fastest_down
-	step_end
-
-SootopolisCity_EventScript_1E64F2:: @ 81E64F2
-	lockall
-	compare VAR_0x405E, 5
-	goto_eq SootopolisCity_EventScript_1E6509
-	msgbox SootopolisCity_Text_1E72DB, 4
-	closemessage
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E6509:: @ 81E6509
-	msgbox SootopolisCity_Text_1E737E, 4
-	setflag FLAG_0x135
-	checkflag FLAG_0x134
-	goto_eq SootopolisCity_EventScript_1E654C
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E651F:: @ 81E651F
-	lockall
-	compare VAR_0x405E, 5
-	goto_eq SootopolisCity_EventScript_1E6536
-	msgbox SootopolisCity_Text_1E7460, 4
-	closemessage
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E6536:: @ 81E6536
-	msgbox SootopolisCity_Text_1E74F6, 4
-	setflag FLAG_0x134
-	checkflag FLAG_0x135
-	goto_eq SootopolisCity_EventScript_1E654C
-	releaseall
-	end
-
-SootopolisCity_EventScript_1E654C:: @ 81E654C
-	setflag FLAG_0x33B
-	setflag FLAG_0x33A
-	setflag FLAG_0x09E
-	clearflag FLAG_0x358
-	clearflag FLAG_0x394
-	setvar VAR_0x40B9, 2
-	warpsilent SOOTOPOLIS_CITY, 255, 31, 34
-	waitstate
-	releaseall
-	end
-
-SootopolisCity_Movement_1E656B:: @ 81E656B
-	levitate
-	step_end
-
-SootopolisCity_Movement_1E656D:: @ 81E656D
-	destroy_extra_task
-	step_end
-
-SootopolisCity_Text_1E656F: @ 81E656F
-	.string "SOOTOPOLIS CITY POKéMON GYM\n"
-	.string "LEADER: JUAN\p"
-	.string "“The GYM LEADER with the beauty\n"
-	.string "of pure water!”$"
-
-SootopolisCity_Text_1E65C8: @ 81E65C8
-	.string "SOOTOPOLIS CITY\p"
-	.string "“The mystical city where history\n"
-	.string "slumbers.”$"
-
-
-SootopolisCity_Text_1E6604: @ 81E6604
-	.string "The door is closed.$"
-
-SootopolisCity_Text_1E6618: @ 81E6618
-	.string "Diving in the sea. Climbing up and\n"
-	.string "down stairs all the time…\p"
-	.string "If you live in this town, you end up\n"
-	.string "getting physically fit.$"
-
-SootopolisCity_Text_1E6692: @ 81E6692
-	.string "These giant POKéMON suddenly appeared\n"
-	.string "in the middle of the city!\p"
-	.string "And, I’ve never seen them before!\p"
-	.string "Why are they smashing into each\n"
-	.string "other like that?\p"
-	.string "Why can’t they be friends, those\n"
-	.string "POKéMON?$"
-
-SootopolisCity_Text_1E6750: @ 81E6750
-	.string "What? What? What?\n"
-	.string "What is that green POKéMON?!$"
-
-SootopolisCity_Text_1E677F: @ 81E677F
-	.string "GROUDON and KYOGRE…\n"
-	.string "Where did they go?\p"
-	.string "Will they cause droughts or downpours\n"
-	.string "somewhere else?$"
-
-SootopolisCity_Text_1E67DC: @ 81E67DC
-	.string "I just get this sense somehow that\n"
-	.string "the two POKéMON aren’t angry.\p"
-	.string "I think… They probably can’t control\n"
-	.string "their own power…$"
-
-SootopolisCity_Text_1E6853: @ 81E6853
-	.string "That flying POKéMON came down from\n"
-	.string "the sky and stopped the rampaging\l"
-	.string "POKéMON…$"
-
-SootopolisCity_Text_1E68A1: @ 81E68A1
-	.string "I… I’ve never been out of this city.\p"
-	.string "I wonder what the world is like on\n"
-	.string "the other side of this round sky?$"
-
-SootopolisCity_Text_1E690B: @ 81E690B
-	.string "Wow!\n"
-	.string "This is wicked!$"
-
-SootopolisCity_Text_1E6920: @ 81E6920
-	.string "Wow!\n"
-	.string "That was wicked!$"
-
-SootopolisCity_Text_1E6936: @ 81E6936
-	.string "Go for it, red POKéMON!\n"
-	.string "Don’t back off, blue POKéMON!$"
-
-SootopolisCity_Text_1E696C: @ 81E696C
-	.string "… … … … … …\p"
-	.string "Hi, do you know the names of those\n"
-	.string "POKéMON fighting over there?$"
-
-SootopolisCity_Text_1E69B8: @ 81E69B8
-	.string "I was wondering which one would win,\n"
-	.string "the red one or the blue one, but, oh no,\l"
-	.string "it’s the green one that settles things!\p"
-	.string "Talk about a huge turn of events!$"
-
-SootopolisCity_Text_1E6A50: @ 81E6A50
-	.string "There’s an ancient legend that claims\n"
-	.string "the land and sea were shaped by\l"
-	.string "a colossal battle between POKéMON.\p"
-	.string "Well, I’m seeing that happen with\n"
-	.string "my very own eyes!\p"
-	.string "Whoa! I never expected to be\n"
-	.string "witness to something this huge!$"
-
-SootopolisCity_Text_1E6B2A: @ 81E6B2A
-	.string "There’s an ancient legend that claims\n"
-	.string "the land and sea were shaped by\l"
-	.string "a colossal battle between POKéMON.\p"
-	.string "Well, I saw that happen with\n"
-	.string "my very own eyes!\p"
-	.string "Whoa! I never expected to be\n"
-	.string "witness to something this huge!$"
-
-SootopolisCity_Text_1E6BFF: @ 81E6BFF
-	.string "A big POKéMON is fighting with\n"
-	.string "another big POKéMON!\p"
-	.string "Please, someone make them stop!$"
-
-SootopolisCity_Text_1E6C53: @ 81E6C53
-	.string "A pretty POKéMON came down from\n"
-	.string "the sky…$"
-
-SootopolisCity_Text_1E6C7C: @ 81E6C7C
-	.string "Oh, no!\n"
-	.string "SOOTOPOLIS CITY will get wrecked!$"
-
-SootopolisCity_Text_1E6CA6: @ 81E6CA6
-	.string "SOOTOPOLIS CITY didn’t get wrecked!$"
-
-SootopolisCity_Text_1E6CCA: @ 81E6CCA
-	.string "Hm!\n"
-	.string "You’ve come all the way to SOOTOPOLIS?\l"
-	.string "You’re no ordinary tourist.\p"
-	.string "But I suppose that doesn’t make you\n"
-	.string "an extraordinary tourist, either.$"
-
-SootopolisCity_Text_1E6D57: @ 81E6D57
-	.string "The city has regained its calm…$"
-
-SootopolisCity_Text_1E6D77: @ 81E6D77
-	.string "Who might you be?\p"
-	.string "This is the CAVE OF ORIGIN.\p"
-	.string "The spirits of POKéMON, becalmed at\n"
-	.string "MT. PYRE, are said to be revived here.\p"
-	.string "Please leave.$"
-
-SootopolisCity_Text_1E6DFE: @ 81E6DFE
-	.string "A person with a strong will and\n"
-	.string "superior talent…\p"
-	.string "A TRAINER who has knowledge and\n"
-	.string "experience of many kinds of POKéMON…\p"
-	.string "If such a person were to appear, I was\n"
-	.string "instructed by WALLACE to lead that\l"
-	.string "TRAINER to this CAVE.$"
-
-SootopolisCity_Text_1E6ED4: @ 81E6ED4
-	.string "Oh, my…\p"
-	.string "The clash between the two awakened\n"
-	.string "POKéMON was quelled by the awakening\l"
-	.string "of a third POKéMON…$"
-
-SootopolisCity_Text_1E6F38: @ 81E6F38
-	.string "This is the CAVE OF ORIGIN…\p"
-	.string "With the passing of the crisis,\n"
-	.string "the cave, too, shall sleep…$"
-
-SootopolisCity_Text_1E6F90: @ 81E6F90
-	.string "SOOTOPOLIS sprang up as a town in\n"
-	.string "the crater of a volcano.\p"
-	.string "If you look up at the sky, the lip of\n"
-	.string "the crater is also visible.\l"
-	.string "So, all you see is the sky in a circle.\p"
-	.string "But that’s what makes the sky above\n"
-	.string "SOOTOPOLIS the most beautiful.$"
-
-SootopolisCity_Text_1E7078: @ 81E7078
-	.string "When two POKéMON that gigantic\n"
-	.string "are fighting that savagely, there’s\l"
-	.string "not much that we can do.$"
-
-SootopolisCity_Text_1E70D4: @ 81E70D4
-	.string "When that third POKéMON flew down,\n"
-	.string "I feared the worst.$"
-
-SootopolisCity_Text_1E710B: @ 81E710B
-	.string "A circle of a night sky framed by\n"
-	.string "the crater of a volcano…\p"
-	.string "And in that ring, stars flicker and\n"
-	.string "blink as if they were alive…\l"
-	.string "It’s my favorite scenery.$"
-
-SootopolisCity_Text_1E71A1: @ 81E71A1
-	.string "The weather was clear this morning,\n"
-	.string "but…\p"
-	.string "All of a sudden, dark clouds brewed up,\n"
-	.string "rain started falling in sheets, and\l"
-	.string "there was thunder and lightning, too.\p"
-	.string "The weather just went completely\n"
-	.string "wild!\p"
-	.string "Is all of this because of those\n"
-	.string "POKéMON?$"
-
-SootopolisCity_Text_1E728C: @ 81E728C
-	.string "Oh?\p"
-	.string "It was you who brought that flying\n"
-	.string "POKéMON here?\p"
-	.string "Well, aren’t you amazing!$"
-
-SootopolisCity_Text_1E72DB: @ 81E72DB
-	.string "MAXIE: G… GROUDON…\n"
-	.string "Please! Stop what you’re doing!\p"
-	.string "I know the extent of your power now!\p"
-	.string "If you keep going, all HOENN, not just\n"
-	.string "SOOTOPOLIS, will be utterly ruined!$"
-
-SootopolisCity_Text_1E737E: @ 81E737E
-	.string "MAXIE: So the super-ancient POKéMON\n"
-	.string "weren’t only GROUDON and KYOGRE…\p"
-	.string "After all our fruitless scheming and\n"
-	.string "frantic efforts, that one POKéMON’s\l"
-	.string "simple action puts everything right\l"
-	.string "again as if nothing had happened…\p"
-	.string "Fu…\n"
-	.string "Fuhahaha…$"
-
-SootopolisCity_Text_1E7460: @ 81E7460
-	.string "ARCHIE: KYOGRE! What’s wrong?!\n"
-	.string "Look over here! It’s the RED ORB!\l"
-	.string "Calm down! KYOGRE!\p"
-	.string "… … … … … …\n"
-	.string "… … … … … …\p"
-	.string "It’s no good!\n"
-	.string "It’s not responding at all!$"
-
-SootopolisCity_Text_1E74F6: @ 81E74F6
-	.string "ARCHIE: KYOGRE and GROUDON both\n"
-	.string "flew off to who knows where.\p"
-	.string "The weather in HOENN has returned\n"
-	.string "to its normal state…\p"
-	.string "Haha…\n"
-	.string "Hahaha…\p"
-	.string "Maybe what we were trying to do was\n"
-	.string "something small, even meaningless,\l"
-	.string "to POKéMON…$"
-
-SootopolisCity_Text_1E75CB: @ 81E75CB
-	.string "STEVEN: Those POKéMON fighting…\n"
-	.string "GROUDON… And KYOGRE…\p"
-	.string "The two super-ancient POKéMON\n"
-	.string "were awakened from a long sleep…\p"
-	.string "And now they are smashing each other\n"
-	.string "with their uncontrollable energy…\p"
-	.string "…{PLAYER}{KUN}.\p"
-	.string "You being here now I’ll take to mean\n"
-	.string "that you’re prepared to become\l"
-	.string "involved in this crisis.\p"
-	.string "Well, then, there’s someone that\n"
-	.string "I’d like you to meet.\p"
-	.string "Come with me, please.$"
-
-SootopolisCity_Text_1E7737: @ 81E7737
-	.string "STEVEN: Listen, {PLAYER}{KUN}.\p"
-	.string "Does seeing GROUDON and KYOGRE make\n"
-	.string "you think POKéMON are to be feared?\p"
-	.string "But that’s not true.\n"
-	.string "POKéMON are really more…\p"
-	.string "…Why am I asking you this?\n"
-	.string "You already know.$"
-
-SootopolisCity_Text_1E77F0: @ 81E77F0
-	.string "STEVEN: Okay, here we are!\p"
-	.string "Inside here you’ll find someone named\n"
-	.string "WALLACE.\p"
-	.string "I think you have what’s needed to\n"
-	.string "help him…$"
-
-SootopolisCity_Text_1E7866: @ 81E7866
-	.string "STEVEN: I think you have what’s\n"
-	.string "needed to help him…$"
-
-SootopolisCity_Text_1E789A: @ 81E789A
-	.string "STEVEN: The SKY PILLAR…\p"
-	.string "I’ve never been there.\n"
-	.string "I wonder where it could be?$"
-
-SootopolisCity_Text_1E78E5: @ 81E78E5
-	.string "STEVEN: So that’s RAYQUAZA…\p"
-	.string "It’s incredible how the two rampaging\n"
-	.string "POKéMON would flee from it in fear…$"
-
-SootopolisCity_Text_1E794B: @ 81E794B
-	.string "STEVEN: It looks like both MAXIE and\n"
-	.string "ARCHIE have gone away somewhere.\p"
-	.string "Perhaps they’ve gone to MT. PYRE to\n"
-	.string "return those ORBS…$"
-
-SootopolisCity_Text_1E79C8: @ 81E79C8
-	.string "WALLACE: Oh?\n"
-	.string "{PLAYER}{KUN}?\p"
-	.string "Haven’t you scaled the SKY PILLAR\n"
-	.string "yet?\p"
-	.string "I’m sure that you can make it to\n"
-	.string "the top of the SKY PILLAR…$"
-
-SootopolisCity_Text_1E7A3E: @ 81E7A3E
-	.string "WALLACE: {PLAYER}{KUN}…\p"
-	.string "The leaders of TEAM MAGMA and AQUA,\n"
-	.string "I don’t think they meant harm.\p"
-	.string "It wouldn’t hurt to hear what they\n"
-	.string "have to say for themselves.$"
-
-SootopolisCity_Text_1E7ACF: @ 81E7ACF
-	.string "WALLACE: {PLAYER}{KUN}…\n"
-	.string "My eyes didn’t deceive me.\p"
-	.string "Thanks to your help, SOOTOPOLIS…\n"
-	.string "No, all of HOENN was saved.\p"
-	.string "On behalf of the people, I thank you.\p"
-	.string "This is a gift from me.\n"
-	.string "Please accept it.$"
-
-SootopolisCity_Text_1E7B86: @ 81E7B86
-	.string "That HIDDEN MACHINE contains\n"
-	.string "WATERFALL.\p"
-	.string "If you have the RAIN BADGE, a POKéMON\n"
-	.string "that has learned that HM move can\l"
-	.string "force its way up waterfalls.\p"
-	.string "And where does one get the RAIN BADGE?\n"
-	.string "You know, don’t you?\p"
-	.string "That’s right! You have to beat\n"
-	.string "the SOOTOPOLIS GYM LEADER.\p"
-	.string "When you’re all set to go, step through\n"
-	.string "that door.$"
-
-SootopolisCity_Text_1E7CBC: @ 81E7CBC
-	.string "WALLACE: I’m sure that you will be\n"
-	.string "dazzled by my mentor’s breathtakingly\l"
-	.string "elegant battle style.$"
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc
deleted file mode 100644
index 02ac01f2b..000000000
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ /dev/null
@@ -1,329 +0,0 @@
-SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C
-	map_script 2, SootopolisCity_Gym_1F_MapScript2_224ECB
-	map_script 5, SootopolisCity_Gym_1F_MapScript1_224E67
-	map_script 1, SootopolisCity_Gym_1F_MapScript1_224E6A
-	map_script 3, SootopolisCity_Gym_1F_MapScript1_224E61
-	.byte 0
-
-SootopolisCity_Gym_1F_MapScript1_224E61: @ 8224E61
-	setvar VAR_ICE_STEP_COUNT, 1
-	end
-
-SootopolisCity_Gym_1F_MapScript1_224E67: @ 8224E67
-	setstepcallback 4
-	end
-
-SootopolisCity_Gym_1F_MapScript1_224E6A: @ 8224E6A
-	call SootopolisCity_Gym_1F_EventScript_224E73
-	special SetSootopolisGymCrackedIceMetatiles
-	end
-
-SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73
-	compare VAR_ICE_STEP_COUNT, 8
-	goto_if 0, SootopolisCity_Gym_1F_EventScript_224ECA
-	compare VAR_ICE_STEP_COUNT, 28
-	goto_if 0, SootopolisCity_Gym_1F_EventScript_224EB8
-	compare VAR_ICE_STEP_COUNT, 67
-	goto_if 0, SootopolisCity_Gym_1F_EventScript_224EA6
-	setmetatile 8, 4, 519, 0
-	setmetatile 8, 5, 519, 0
-
-SootopolisCity_Gym_1F_EventScript_224EA6:: @ 8224EA6
-	setmetatile 8, 10, 519, 0
-	setmetatile 8, 11, 519, 0
-
-SootopolisCity_Gym_1F_EventScript_224EB8:: @ 8224EB8
-	setmetatile 8, 15, 519, 0
-	setmetatile 8, 16, 519, 0
-
-SootopolisCity_Gym_1F_EventScript_224ECA:: @ 8224ECA
-	return
-
-SootopolisCity_Gym_1F_MapScript2_224ECB: @ 8224ECB
-	map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_224EED
-	map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_224F01
-	map_script_2 VAR_ICE_STEP_COUNT, 67, SootopolisCity_Gym_1F_EventScript_224F15
-	map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_224F29
-	.2byte 0
-
-SootopolisCity_Gym_1F_EventScript_224EED:: @ 8224EED
-	addvar VAR_ICE_STEP_COUNT, 1
-	delay 40
-	playse SE_RU_GASHIN
-	call SootopolisCity_Gym_1F_EventScript_224E73
-	special DrawWholeMapView
-	end
-
-SootopolisCity_Gym_1F_EventScript_224F01:: @ 8224F01
-	addvar VAR_ICE_STEP_COUNT, 1
-	delay 40
-	playse SE_RU_GASHIN
-	call SootopolisCity_Gym_1F_EventScript_224E73
-	special DrawWholeMapView
-	end
-
-SootopolisCity_Gym_1F_EventScript_224F15:: @ 8224F15
-	addvar VAR_ICE_STEP_COUNT, 1
-	delay 40
-	playse SE_RU_GASHIN
-	call SootopolisCity_Gym_1F_EventScript_224E73
-	special DrawWholeMapView
-	end
-
-SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29
-	lockall
-	delay 20
-	applymovement 255, SootopolisCity_Gym_1F_Movement_224F42
-	waitmovement 0
-	playse SE_RU_HYUU
-	delay 60
-	warphole SOOTOPOLIS_CITY_GYM_B1F
-	waitstate
-	end
-
-SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42
-	set_invisible
-	step_end
-
-SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44
-	trainerbattle 1, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq SootopolisCity_Gym_1F_EventScript_225025
-	checkflag FLAG_0x0AC
-	goto_if 0, SootopolisCity_Gym_1F_EventScript_224FF7
-	checkflag FLAG_BADGE06_GET
-	goto_if 0, SootopolisCity_Gym_1F_EventScript_22501B
-	msgbox SootopolisCity_Gym_1F_Text_225778, 4
-	release
-	end
-
-SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82
-	message SootopolisCity_Gym_1F_Text_225598
-	waitmessage
-	call SootopolisCity_Gym_1F_EventScript_27207E
-	msgbox SootopolisCity_Gym_1F_Text_2255BE, 4
-	setflag FLAG_0x4F7
-	setflag FLAG_BADGE08_GET
-	setflag FLAG_0x356
-	setflag FLAG_0x3CD
-	setflag FLAG_0x330
-	setvar VAR_0x405E, 6
-	clearflag FLAG_0x347
-	setvar VAR_0x8008, 8
-	call SootopolisCity_Gym_1F_EventScript_271F43
-	call SootopolisCity_Gym_1F_EventScript_224FD4
-	closemessage
-	delay 30
-	playfanfare MUS_ME_TORE_EYE
-	msgbox SootopolisCity_Gym_1F_Text_22574D, 4
-	waitfanfare
-	closemessage
-	delay 30
-	setflag FLAG_0x1D9
-	release
-	end
-
-SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4
-	giveitem_std ITEM_TM03
-	compare VAR_RESULT, 0
-	goto_eq SootopolisCity_Gym_1F_EventScript_27205E
-	msgbox SootopolisCity_Gym_1F_Text_2256C1, 4
-	setflag FLAG_0x0AC
-	return
-
-SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7
-	giveitem_std ITEM_TM03
-	compare VAR_RESULT, 0
-	goto_eq SootopolisCity_Gym_1F_EventScript_272054
-	msgbox SootopolisCity_Gym_1F_Text_2256C1, 4
-	setflag FLAG_0x0AC
-	release
-	end
-
-SootopolisCity_Gym_1F_EventScript_22501B:: @ 822501B
-	msgbox SootopolisCity_Gym_1F_Text_225865, 4
-	release
-	end
-
-SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025
-	trainerbattle 7, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48
-	msgbox SootopolisCity_Gym_1F_Text_225A67, 6
-	end
-
-SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040
-	lock
-	faceplayer
-	checkflag FLAG_0x4F7
-	goto_eq SootopolisCity_Gym_1F_EventScript_225055
-	msgbox SootopolisCity_Gym_1F_Text_225093, 4
-	release
-	end
-
-SootopolisCity_Gym_1F_EventScript_225055:: @ 8225055
-	msgbox SootopolisCity_Gym_1F_Text_2251AF, 4
-	release
-	end
-
-SootopolisCity_Gym_1F_EventScript_22505F:: @ 822505F
-	lockall
-	checkflag FLAG_BADGE08_GET
-	goto_eq SootopolisCity_Gym_1F_EventScript_22507F
-	goto SootopolisCity_Gym_1F_EventScript_225089
-	end
-
-SootopolisCity_Gym_1F_EventScript_22506F:: @ 822506F
-	lockall
-	checkflag FLAG_BADGE08_GET
-	goto_eq SootopolisCity_Gym_1F_EventScript_22507F
-	goto SootopolisCity_Gym_1F_EventScript_225089
-	end
-
-SootopolisCity_Gym_1F_EventScript_22507F:: @ 822507F
-	msgbox SootopolisCity_Gym_1F_Text_225916, 4
-	releaseall
-	end
-
-SootopolisCity_Gym_1F_EventScript_225089:: @ 8225089
-	msgbox SootopolisCity_Gym_1F_Text_2258FA, 4
-	releaseall
-	end
-
-SootopolisCity_Gym_1F_Text_225093: @ 8225093
-	.string "Yo! How’s it going, CHAMPION-\n"
-	.string "bound {PLAYER}?\p"
-	.string "SOOTOPOLIS’s GYM LEADER JUAN is\n"
-	.string "a master of WATER-type POKéMON.\p"
-	.string "And, to get to JUAN, an icy floor\n"
-	.string "will hamper your progress…\p"
-	.string "Listen, I’m sorry, but that’s all the\n"
-	.string "advice that I have for you.\p"
-	.string "The rest of the way, you have to\n"
-	.string "go for it yourself!$"
-
-SootopolisCity_Gym_1F_Text_2251AF: @ 82251AF
-	.string "Yow! You’ve beaten even JUAN, who\n"
-	.string "was supposedly the best in all HOENN!\p"
-	.string "Okay! Check out your TRAINER CARD.\p"
-	.string "If you’ve gotten all the BADGES, you’re\n"
-	.string "set for the POKéMON LEAGUE challenge!$"
-
-SootopolisCity_Gym_1F_Text_225268: @ 8225268
-	.string "Let me ask you.\n"
-	.string "Did you know?\l"
-	.string "Ah, I should not be so coy.\p"
-	.string "It was I who taught WALLACE everything\n"
-	.string "there is to know about POKéMON.\p"
-	.string "Once, I had given up my position as\n"
-	.string "the GYM LEADER.\p"
-	.string "In my place, I had entrusted WALLACE\n"
-	.string "with the GYM.\p"
-	.string "However, a compelling reason arose for\n"
-	.string "me to make a comeback.\p"
-	.string "Ah, but enough chatter.\n"
-	.string "Let us begin our match, shall we?\p"
-	.string "Please, you shall bear witness to\n"
-	.string "our artistry.\p"
-	.string "A grand illusion of water sculpted\n"
-	.string "by POKéMON and myself!$"
-
-SootopolisCity_Gym_1F_Text_225432: @ 8225432
-	.string "Ahahaha, excellent!\n"
-	.string "Very well, you are the winner.\p"
-	.string "From you, I sense the brilliant shine\n"
-	.string "of skill that will overcome all.\p"
-	.string "However, compared with me or even\n"
-	.string "WALLACE, you are lacking in elegance.\p"
-	.string "Perhaps I should make you a loan\n"
-	.string "of my outfit?\p"
-	.string "… … … … … …\n"
-	.string "… … … … … …\p"
-	.string "Hahaha, I merely jest!\p"
-	.string "Rather than my clothes, I shall reward\n"
-	.string "you with this, the RAIN BADGE!$"
-
-SootopolisCity_Gym_1F_Text_225598: @ 8225598
-	.string "{PLAYER} received the RAIN BADGE\n"
-	.string "from JUAN.$"
-
-SootopolisCity_Gym_1F_Text_2255BE: @ 82255BE
-	.string "Having the RAIN BADGE shall assure you\n"
-	.string "the full obedience of all your POKéMON\l"
-	.string "to your every command.\p"
-	.string "The RAIN BADGE also allows the use\n"
-	.string "of the HM move WATERFALL to scale\l"
-	.string "walls of cascading water.\p"
-	.string "And, so that you never forget the\n"
-	.string "battle we shared, take this…$"
-
-SootopolisCity_Gym_1F_Text_2256C1: @ 82256C1
-	.string "The TECHNICAL MACHINE I handed you\n"
-	.string "contains WATER PULSE.\p"
-	.string "In use, it will occasionally confuse\n"
-	.string "the target with ultrasonic waves.\p"
-	.string "… … … … … …$"
-
-SootopolisCity_Gym_1F_Text_22574D: @ 822574D
-	.string "Registered GYM LEADER JUAN\n"
-	.string "in the POKéNAV.$"
-
-SootopolisCity_Gym_1F_Text_225778: @ 8225778
-	.string "The TRAINERS who have gathered all\n"
-	.string "the GYM BADGES of HOENN should make\l"
-	.string "way to the ultimate destination.\p"
-	.string "The POKéMON LEAGUE.\p"
-	.string "Travel to the easternmost reaches\n"
-	.string "of HOENN, to the island EVER GRANDE.\p"
-	.string "There, you shall find the POKéMON\n"
-	.string "LEAGUE.$"
-
-SootopolisCity_Gym_1F_Text_225865: @ 8225865
-	.string "There remains but one BADGE to\n"
-	.string "obtain in HOENN.\p"
-	.string "If you wish to challenge the POKéMON\n"
-	.string "LEAGUE, you must obtain the last\l"
-	.string "BADGE from the GYM in FORTREE.$"
-
-SootopolisCity_Gym_1F_Text_2258FA: @ 82258FA
-	.string "SOOTOPOLIS CITY POKéMON GYM$"
-
-SootopolisCity_Gym_1F_Text_225916: @ 8225916
-	.string "SOOTOPOLIS CITY POKéMON GYM\p"
-	.string "JUAN’S CERTIFIED TRAINERS:\n"
-	.string "{PLAYER}$"
-
-SootopolisCity_Gym_1F_Text_225950: @ 8225950
-	.string "JUAN: Ah, this GYM had returned to its\n"
-	.string "usual state of serenity…\p"
-	.string "But our young typhoon has returned\n"
-	.string "to put us to the test again!\p"
-	.string "Well, my friend, most certainly!\p"
-	.string "I shall be delighted to dance with you\n"
-	.string "as often as you wish!$"
-
-SootopolisCity_Gym_1F_Text_225A2E: @ 8225A2E
-	.string "Ahahaha, you are the winner!\n"
-	.string "You have defeated me again!$"
-
-SootopolisCity_Gym_1F_Text_225A67: @ 8225A67
-	.string "JUAN: If I told you to become my\n"
-	.string "apprentice, you will refuse, I am sure.\p"
-	.string "I would like to make a gift of my coat\n"
-	.string "to you.\p"
-	.string "But again, you will refuse.\n"
-	.string "I imagine that to be so.\p"
-	.string "And that, my friend, is a certain sign\n"
-	.string "of nobility!$"
-
-SootopolisCity_Gym_1F_Text_225B48: @ 8225B48
-	.string "JUAN: Ah, this GYM had returned to its\n"
-	.string "usual state of serenity…\p"
-	.string "But our young typhoon has returned\n"
-	.string "to put us to the test again!\p"
-	.string "Well, my friend, most certainly!\n"
-	.string "I shall be delighted to dance with you…\p"
-	.string "Ah, no, no, no.\n"
-	.string "You have with you but one POKéMON.\p"
-	.string "I wish that you would return with\n"
-	.string "two, perhaps more, POKéMON, please.$"
-
diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc
deleted file mode 100644
index 8d6b4631f..000000000
--- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc
+++ /dev/null
@@ -1,241 +0,0 @@
-SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953
-	map_script 3, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E
-	map_script 2, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D
-	.byte 0
-
-SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E
-	setvar VAR_0x8004, 16
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D
-	compare VAR_0x40C0, 0
-	call_if 5, SootopolisCity_MysteryEventsHouse_1F_EventScript_227991
-	end
-
-SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D
-	setvar VAR_TEMP_1, 1
-	setobjectxyperm 1, 3, 2
-	setobjectmovementtype 1, 8
-	setmaplayoutindex 441
-	return
-
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991
-	setobjectxyperm 1, 2, 2
-	setobjectmovementtype 1, 10
-	return
-
-SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D
-	map_script_2 VAR_0x40C0, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
-	map_script_2 VAR_0x40C0, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
-	map_script_2 VAR_0x40C0, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
-	.2byte 0
-
-SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7
-	lockall
-	applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F
-	waitmovement 0
-	applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21
-	waitmovement 0
-	moveobjectoffscreen 1
-	applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6
-	waitmovement 0
-	compare VAR_0x40C0, 1
-	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04
-	compare VAR_0x40C0, 2
-	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D
-	compare VAR_0x40C0, 3
-	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16
-	special LoadPlayerParty
-	setvar VAR_0x40C0, 0
-	releaseall
-	end
-
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04:: @ 8227A04
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227DB8, 4
-	return
-
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D:: @ 8227A0D
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227E03, 4
-	return
-
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16:: @ 8227A16
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D5B, 4
-	return
-
-SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F: @ 8227A1F
-	walk_down
-	step_end
-
-SootopolisCity_MysteryEventsHouse_1F_Movement_227A21: @ 8227A21
-	walk_right
-	walk_in_place_fastest_down
-	step_end
-
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24
-	lock
-	faceplayer
-	setvar VAR_0x8004, 16
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E
-	compare VAR_TEMP_1, 1
-	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4
-	release
-	end
-
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4
-	release
-	end
-
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
-	special SavePlayerParty
-	special sub_8139238
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5
-	compare VAR_RESULT, 0
-	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
-	call SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF
-	compare VAR_RESULT, 0
-	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, 5
-	compare VAR_RESULT, 0
-	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
-	special LoadPlayerParty
-	call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F
-	compare VAR_RESULT, 0
-	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
-	special SavePlayerParty
-	special sub_80F94E8
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4
-	closemessage
-	compare VAR_FACING, 2
-	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE
-	compare VAR_FACING, 4
-	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10
-	compare VAR_FACING, 3
-	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22
-	warp SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1
-	waitstate
-	release
-	end
-
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2
-	special LoadPlayerParty
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C44, 4
-	release
-	end
-
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, 4
-	fadescreen 1
-	special sub_80F9438
-	waitstate
-	return
-
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE:: @ 8227AFE
-	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40
-	applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B34
-	waitmovement 0
-	return
-
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10:: @ 8227B10
-	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B43
-	applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B38
-	waitmovement 0
-	return
-
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22:: @ 8227B22
-	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40
-	applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C
-	waitmovement 0
-	return
-
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B34: @ 8227B34
-	delay_16
-	walk_up
-	walk_up
-	step_end
-
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B38: @ 8227B38
-	delay_16
-	walk_right
-	walk_up
-	step_end
-
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C: @ 8227B3C
-	delay_16
-	walk_left
-	walk_up
-	step_end
-
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B40: @ 8227B40
-	walk_left
-	walk_in_place_fastest_right
-	step_end
-
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B43: @ 8227B43
-	walk_right
-	walk_in_place_fastest_left
-	step_end
-
-SootopolisCity_MysteryEventsHouse_1F_Text_227B46: @ 8227B46
-	.string "When I was young, I traveled the world\n"
-	.string "as a POKéMON TRAINER.\p"
-	.string "Now that I’ve become an old buzzard,\n"
-	.string "my only amusement is watching young\l"
-	.string "TRAINERS battle.$"
-
-SootopolisCity_MysteryEventsHouse_1F_Text_227BDD: @ 8227BDD
-	.string "The door appears to be locked.$"
-
-SootopolisCity_MysteryEventsHouse_1F_Text_227BFC: @ 8227BFC
-	.string "A TRAINER named {STR_VAR_1}\n"
-	.string "is visiting my home.\p"
-	.string "Would you like to challenge\n"
-	.string "{STR_VAR_1}?$"
-
-SootopolisCity_MysteryEventsHouse_1F_Text_227C44: @ 8227C44
-	.string "You won’t battle? I’m disappointed\n"
-	.string "that I can’t see you battle…$"
-
-SootopolisCity_MysteryEventsHouse_1F_Text_227C84: @ 8227C84
-	.string "Oh, good, good!\p"
-	.string "But my house isn’t all that sturdy.\p"
-	.string "Could I ask you to keep it down to\n"
-	.string "a 3-on-3 match?$"
-
-SootopolisCity_MysteryEventsHouse_1F_Text_227CEB: @ 8227CEB
-	.string "Before you two battle, you should\n"
-	.string "save your progress.$"
-
-SootopolisCity_MysteryEventsHouse_1F_Text_227D21: @ 8227D21
-	.string "I hope to see a good match!$"
-
-SootopolisCity_MysteryEventsHouse_1F_Text_227D3D: @ 8227D3D
-	.string "{STR_VAR_1}$"
-
-SootopolisCity_MysteryEventsHouse_B1F_Text_227D40: @ 8227D40
-	.string "The match ended up a draw.$"
-
-SootopolisCity_MysteryEventsHouse_1F_Text_227D5B: @ 8227D5B
-	.string "So, it became a standoff.\p"
-	.string "It was a brilliant match in which\n"
-	.string "neither side conceded a step!$"
-
-SootopolisCity_MysteryEventsHouse_1F_Text_227DB5: @ 8227DB5
-	.string "{STR_VAR_1}$"
-
-SootopolisCity_MysteryEventsHouse_1F_Text_227DB8: @ 8227DB8
-	.string "That was superlative!\p"
-	.string "Why, it was like seeing myself in\n"
-	.string "my youth again!$"
-
-SootopolisCity_MysteryEventsHouse_1F_Text_227E00: @ 8227E00
-	.string "{STR_VAR_1}$"
-
-SootopolisCity_MysteryEventsHouse_1F_Text_227E03: @ 8227E03
-	.string "Ah, too bad for you!\p"
-	.string "But it was a good match.\n"
-	.string "I hope you can win next time.$"
-
diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc
deleted file mode 100644
index 142a8e70e..000000000
--- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F
-	map_script 3, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A
-	map_script 2, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E
-	.byte 0
-
-SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A
-	special sub_8162794
-	end
-
-SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E: @ 8227E5E
-	map_script_2 VAR_TEMP_1, 0, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68
-	.2byte 0
-
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
-	lockall
-	applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3
-	waitmovement 0
-	special sub_8165360
-	msgbox 0x2021fc4, 4
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	special sub_8163AC4
-	waitstate
-	compare VAR_RESULT, 3
-	call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF
-	compare VAR_RESULT, 1
-	call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD
-	compare VAR_RESULT, 2
-	call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8
-	closemessage
-	special HealPlayerParty
-	applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9
-	waitmovement 0
-	special LoadPlayerParty
-	setvar VAR_TEMP_1, 1
-	warp SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 255, 3, 1
-	waitstate
-	releaseall
-	end
-
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF
-	setvar VAR_0x40C0, 3
-	msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, 4
-	return
-
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD
-	setvar VAR_0x40C0, 1
-	special ShowFieldMessageStringVar4
-	waitmessage
-	waitbuttonpress
-	return
-
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8
-	setvar VAR_0x40C0, 2
-	special ShowFieldMessageStringVar4
-	waitmessage
-	waitbuttonpress
-	return
-
-SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3: @ 8227EF3
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	step_end
-
-SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9: @ 8227EF9
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	delay_8
-	step_end
-
diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc
deleted file mode 100644
index bf57aa9ce..000000000
--- a/data/scripts/maps/SouthernIsland_Exterior.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-SouthernIsland_Exterior_MapScripts:: @ 82429C8
-	map_script 3, SouthernIsland_Exterior_MapScript1_2429CE
-	.byte 0
-
-SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE
-	setflag FLAG_LANDMARK_SOUTHERN_ISLAND
-	end
-
-SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2
-	lock
-	faceplayer
-	msgbox SouthernIsland_Exterior_Text_2A69F1, 5
-	compare VAR_RESULT, 0
-	goto_eq SouthernIsland_Exterior_EventScript_242A17
-	msgbox SouthernIsland_Exterior_Text_2A6A5D, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA
-	waitmovement 0
-	delay 30
-	hideobjectat 1, SOUTHERN_ISLAND_EXTERIOR
-	setvar VAR_0x8004, 2
-	call SouthernIsland_Exterior_EventScript_272250
-	warp LILYCOVE_CITY_HARBOR, 255, 8, 11
-	waitstate
-	release
-	end
-
-SouthernIsland_Exterior_EventScript_242A17:: @ 8242A17
-	msgbox SouthernIsland_Exterior_Text_2A6A82, 4
-	release
-	end
-
-BattleFrontier_OutsideWest_EventScript_242A21:: @ 8242A21
-	applymovement 255, BattleFrontier_OutsideWest_Movement_242A37
-	waitmovement 0
-	return
-
-BattleFrontier_OutsideWest_EventScript_242A2C:: @ 8242A2C
-	applymovement 255, BattleFrontier_OutsideWest_Movement_242A39
-	waitmovement 0
-	return
-
-BattleFrontier_OutsideWest_Movement_242A37: @ 8242A37
-	walk_down
-	step_end
-
-BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39
-	walk_left
-	walk_in_place_fastest_down
-	step_end
-
-SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C
-	msgbox SouthernIsland_Exterior_Text_2A6AD5, 3
-	end
-
diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/scripts/maps/TrainerHill_Elevator.inc
deleted file mode 100644
index 155c31877..000000000
--- a/data/scripts/maps/TrainerHill_Elevator.inc
+++ /dev/null
@@ -1,87 +0,0 @@
-TrainerHill_Elevator_MapScripts:: @ 826934F
-	map_script 2, TrainerHill_Elevator_MapScript2_269355
-	.byte 0
-
-TrainerHill_Elevator_MapScript2_269355: @ 8269355
-	map_script_2 VAR_TEMP_4, 0, TrainerHill_Elevator_EventScript_269375
-	.2byte 0
-
-TrainerHill_Elevator_EventScript_26935F:: @ 826935F
-	end
-
-TrainerHill_Elevator_EventScript_269360:: @ 8269360
-	applymovement 255, TrainerHill_Elevator_Movement_2693EB
-	waitmovement 0
-	releaseall
-	warp TRAINER_HILL_ROOF, 255, 15, 5
-	waitstate
-	end
-
-TrainerHill_Elevator_EventScript_269375:: @ 8269375
-	applymovement 255, TrainerHill_Elevator_Movement_2693E4
-	waitmovement 0
-	applymovement 1, TrainerHill_Elevator_Movement_2693EE
-	waitmovement 0
-	lockall
-	msgbox TrainerHill_Elevator_Text_268F3E, 5
-	compare VAR_RESULT, 0
-	goto_eq TrainerHill_Elevator_EventScript_269360
-	releaseall
-	applymovement 1, TrainerHill_Elevator_Movement_2693F0
-	waitmovement 0
-	applymovement 255, TrainerHill_Elevator_Movement_2693DF
-	waitmovement 0
-	call TrainerHill_Elevator_EventScript_2693D9
-	delay 25
-	applymovement 255, TrainerHill_Elevator_Movement_2693E7
-	waitmovement 0
-	warp TRAINER_HILL_ENTRANCE, 255, 17, 8
-	waitstate
-	end
-
-TrainerHill_Elevator_EventScript_2693CE:: @ 82693CE
-	goto TrainerHill_Elevator_EventScript_2693D4
-	end
-
-TrainerHill_Elevator_EventScript_2693D4:: @ 82693D4
-	special sub_8139C10
-	releaseall
-	end
-
-TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9
-	waitse
-	special sub_8139A78
-	waitstate
-	return
-
-TrainerHill_Elevator_Movement_2693DF: @ 82693DF
-	walk_up
-	walk_up
-	walk_right
-	face_down
-	step_end
-
-TrainerHill_Elevator_Movement_2693E4: @ 82693E4
-	delay_16
-	walk_left
-	step_end
-
-TrainerHill_Elevator_Movement_2693E7: @ 82693E7
-	delay_16
-	walk_down
-	walk_down
-	step_end
-
-TrainerHill_Elevator_Movement_2693EB: @ 82693EB
-	face_down
-	delay_16
-	step_end
-
-TrainerHill_Elevator_Movement_2693EE: @ 82693EE
-	face_right
-	step_end
-
-TrainerHill_Elevator_Movement_2693F0: @ 82693F0
-	face_down
-	step_end
-
diff --git a/data/scripts/maps/Underwater_MarineCave.inc b/data/scripts/maps/Underwater_MarineCave.inc
deleted file mode 100644
index c18534c61..000000000
--- a/data/scripts/maps/Underwater_MarineCave.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-Underwater_MarineCave_MapScripts:: @ 823AFB8
-	map_script 5, Underwater_MarineCave_MapScript1_23AFC7
-	map_script 3, Underwater_MarineCave_MapScript1_23AFC3
-	.byte 0
-
-Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3
-	setflag FLAG_0x8D9
-	end
-
-Underwater_MarineCave_MapScript1_23AFC7: @ 823AFC7
-	setdivewarp MARINE_CAVE_ENTRANCE, 255, 10, 17
-	end
-
diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/scripts/maps/Underwater_Route134.inc
deleted file mode 100644
index a06f87b48..000000000
--- a/data/scripts/maps/Underwater_Route134.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Underwater_Route134_MapScripts:: @ 82390B5
-	map_script 5, Underwater_Route134_MapScript1_2390BB
-	.byte 0
-
-Underwater_Route134_MapScript1_2390BB: @ 82390BB
-	setdivewarp ROUTE_134, 255, 60, 31
-	end
-
diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc
deleted file mode 100644
index d3f0aa5e5..000000000
--- a/data/scripts/maps/Underwater_SeafloorCavern.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-Underwater_SeafloorCavern_MapScripts:: @ 823433B
-	map_script 5, Underwater_SeafloorCavern_MapScript1_2343D3
-	map_script 3, Underwater_SeafloorCavern_MapScript1_23434B
-	map_script 1, Underwater_SeafloorCavern_MapScript1_23435C
-	.byte 0
-
-Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B
-	setflag FLAG_LANDMARK_SEAFLOOR_CAVERN
-	checkflag FLAG_0x081
-	goto_eq Underwater_SeafloorCavern_EventScript_234358
-	end
-
-Underwater_SeafloorCavern_EventScript_234358:: @ 8234358
-	setflag FLAG_0x3D4
-	end
-
-Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C
-	checkflag FLAG_0x081
-	call_if 1, Underwater_SeafloorCavern_EventScript_234366
-	end
-
-Underwater_SeafloorCavern_EventScript_234366:: @ 8234366
-	setmetatile 5, 3, 542, 1
-	setmetatile 6, 3, 542, 1
-	setmetatile 7, 3, 542, 1
-	setmetatile 8, 3, 542, 1
-	setmetatile 5, 4, 552, 0
-	setmetatile 6, 4, 552, 0
-	setmetatile 7, 4, 552, 0
-	setmetatile 8, 4, 552, 0
-	setmetatile 5, 5, 552, 0
-	setmetatile 6, 5, 552, 0
-	setmetatile 7, 5, 552, 0
-	setmetatile 8, 5, 552, 0
-	return
-
-Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3
-	setdivewarp SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17
-	end
-
-Underwater_SeafloorCavern_EventScript_2343DC:: @ 82343DC
-	msgbox Underwater_SeafloorCavern_Text_2343E5, 3
-	end
-
-Underwater_SeafloorCavern_Text_2343E5: @ 82343E5
-	.string "“SUBMARINE EXPLORER 1” is painted\n"
-	.string "on the hull.\p"
-	.string "This is the submarine TEAM AQUA\n"
-	.string "stole in SLATEPORT!\p"
-	.string "TEAM AQUA must have gone\n"
-	.string "ashore here.$"
-
diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc
deleted file mode 100644
index f8c7b02af..000000000
--- a/data/scripts/maps/Underwater_SealedChamber.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-Underwater_SealedChamber_MapScripts:: @ 82390C4
-	map_script 6, Underwater_SealedChamber_MapScript1_2390CA
-	.byte 0
-
-Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA
-	getplayerxy VAR_0x8004, VAR_0x8005
-	compare VAR_0x8004, 12
-	goto_if 5, Underwater_SealedChamber_EventScript_2390EA
-	compare VAR_0x8005, 44
-	goto_if 5, Underwater_SealedChamber_EventScript_2390EA
-	goto Underwater_SealedChamber_EventScript_2390F3
-
-Underwater_SealedChamber_EventScript_2390EA:: @ 82390EA
-	setdivewarp ROUTE_134, 255, 60, 31
-	end
-
-Underwater_SealedChamber_EventScript_2390F3:: @ 82390F3
-	setdivewarp SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19
-	end
-
-Underwater_SealedChamber_EventScript_2390FC:: @ 82390FC
-	lockall
-	braillemessage Underwater_SealedChamber_Braille_2A6B15
-	waitbuttonpress
-	hidebox2
-	releaseall
-	end
-
diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/scripts/maps/Underwater_SootopolisCity.inc
deleted file mode 100644
index 3337b72f1..000000000
--- a/data/scripts/maps/Underwater_SootopolisCity.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Underwater_SootopolisCity_MapScripts:: @ 822D94C
-	map_script 5, Underwater_SootopolisCity_MapScript1_22D952
-	.byte 0
-
-Underwater_SootopolisCity_MapScript1_22D952: @ 822D952
-	setdivewarp SOOTOPOLIS_CITY, 255, 29, 53
-	end
-
diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc
deleted file mode 100644
index e92087ebd..000000000
--- a/data/scripts/maps/UnknownMap_25_34.inc
+++ /dev/null
@@ -1,458 +0,0 @@
-UnknownMap_25_34_MapScripts:: @ 823B781
-	map_script 4, LinkContestRoom1_MapScript2_23B81F
-	map_script 2, LinkContestRoom1_MapScript2_23B815
-	map_script 3, LinkContestRoom1_MapScript1_23B79F
-	map_script 5, LinkContestRoom1_MapScript1_23B803
-	map_script 7, LinkContestRoom1_MapScript1_23B79B
-	.byte 0
-
-LinkContestRoom1_MapScript1_23B79B: @ 823B79B
-	special sub_80F8B94
-	end
-
-LinkContestRoom1_MapScript1_23B79F: @ 823B79F
-	call LinkContestRoom1_EventScript_23B7AF
-	setvar VAR_TEMP_0, 1
-	call LinkContestRoom1_EventScript_23B842
-	end
-
-LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF
-	call LinkContestRoom1_EventScript_27A133
-	special sub_80F8FA0
-	compare VAR_RESULT, 0
-	call_if 1, LinkContestRoom1_EventScript_23B7EF
-	compare VAR_RESULT, 1
-	call_if 1, LinkContestRoom1_EventScript_23B7F3
-	compare VAR_RESULT, 2
-	call_if 1, LinkContestRoom1_EventScript_23B7F7
-	compare VAR_RESULT, 3
-	call_if 1, LinkContestRoom1_EventScript_23B7FB
-	compare VAR_RESULT, 4
-	call_if 1, LinkContestRoom1_EventScript_23B7FF
-	return
-
-LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF
-	savebgm MUS_TEST1
-	return
-
-LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3
-	savebgm MUS_TEST2
-	return
-
-LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7
-	savebgm MUS_TEST3
-	return
-
-LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB
-	savebgm MUS_TEST4
-	return
-
-LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF
-	savebgm MUS_CONTEST0
-	return
-
-LinkContestRoom1_MapScript1_23B803: @ 823B803
-	compare VAR_TEMP_9, 1
-	call_if 1, LinkContestRoom1_EventScript_23B80F
-	end
-
-LinkContestRoom1_EventScript_23B80F:: @ 823B80F
-	call LinkContestRoom1_EventScript_23BB2B
-	return
-
-LinkContestRoom1_MapScript2_23B815: @ 823B815
-	map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829
-	.2byte 0
-
-LinkContestRoom1_MapScript2_23B81F: @ 823B81F
-	map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834
-	.2byte 0
-
-LinkContestRoom1_EventScript_23B829:: @ 823B829
-	call LinkContestRoom1_EventScript_279F97
-	call LinkContestRoom1_EventScript_23BE44
-	end
-
-LinkContestRoom1_EventScript_23B834:: @ 823B834
-	special sub_80F8B94
-	hideobjectat 255, LITTLEROOT_TOWN
-	call LinkContestRoom1_EventScript_23BB2B
-	end
-
-LinkContestRoom1_EventScript_23B842:: @ 823B842
-	call LinkContestRoom1_EventScript_23B8F8
-	call LinkContestRoom1_EventScript_23B858
-	compare VAR_TEMP_0, 8
-	goto_if 0, LinkContestRoom1_EventScript_23B842
-	return
-
-LinkContestRoom1_EventScript_23B858:: @ 823B858
-	switch VAR_TEMP_0
-	case 1, LinkContestRoom1_EventScript_23B8AB
-	case 2, LinkContestRoom1_EventScript_23B8B6
-	case 3, LinkContestRoom1_EventScript_23B8C1
-	case 4, LinkContestRoom1_EventScript_23B8CC
-	case 5, LinkContestRoom1_EventScript_23B8D7
-	case 6, LinkContestRoom1_EventScript_23B8E2
-	case 7, LinkContestRoom1_EventScript_23B8ED
-	end
-
-LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB
-	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6
-	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1
-	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC
-	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7
-	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2
-	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED
-	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8
-	setvar VAR_RESULT, 32
-	special sub_80F8FE8
-	addvar VAR_RESULT, 1
-	switch VAR_RESULT
-	case 1, LinkContestRoom1_EventScript_23BA6B
-	case 2, LinkContestRoom1_EventScript_23BA71
-	case 3, LinkContestRoom1_EventScript_23BA77
-	case 4, LinkContestRoom1_EventScript_23BA7D
-	case 5, LinkContestRoom1_EventScript_23BA83
-	case 6, LinkContestRoom1_EventScript_23BA89
-	case 7, LinkContestRoom1_EventScript_23BA8F
-	case 8, LinkContestRoom1_EventScript_23BA95
-	case 9, LinkContestRoom1_EventScript_23BA9B
-	case 10, LinkContestRoom1_EventScript_23BAA1
-	case 11, LinkContestRoom1_EventScript_23BAA7
-	case 12, LinkContestRoom1_EventScript_23BAAD
-	case 13, LinkContestRoom1_EventScript_23BAB3
-	case 14, LinkContestRoom1_EventScript_23BAB9
-	case 15, LinkContestRoom1_EventScript_23BABF
-	case 16, LinkContestRoom1_EventScript_23BAC5
-	case 17, LinkContestRoom1_EventScript_23BACB
-	case 18, LinkContestRoom1_EventScript_23BAD1
-	case 19, LinkContestRoom1_EventScript_23BAD7
-	case 20, LinkContestRoom1_EventScript_23BADD
-	case 21, LinkContestRoom1_EventScript_23BAE3
-	case 22, LinkContestRoom1_EventScript_23BAE9
-	case 23, LinkContestRoom1_EventScript_23BAEF
-	case 24, LinkContestRoom1_EventScript_23BAF5
-	case 25, LinkContestRoom1_EventScript_23BAFB
-	case 26, LinkContestRoom1_EventScript_23BB01
-	case 27, LinkContestRoom1_EventScript_23BB07
-	case 28, LinkContestRoom1_EventScript_23BB0D
-	case 29, LinkContestRoom1_EventScript_23BB13
-	case 30, LinkContestRoom1_EventScript_23BB19
-	case 31, LinkContestRoom1_EventScript_23BB1F
-	case 32, LinkContestRoom1_EventScript_23BB25
-	end
-
-LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B
-	setvar VAR_TEMP_1, 5
-	return
-
-LinkContestRoom1_EventScript_23BA71:: @ 823BA71
-	setvar VAR_TEMP_1, 6
-	return
-
-LinkContestRoom1_EventScript_23BA77:: @ 823BA77
-	setvar VAR_TEMP_1, 7
-	return
-
-LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D
-	setvar VAR_TEMP_1, 8
-	return
-
-LinkContestRoom1_EventScript_23BA83:: @ 823BA83
-	setvar VAR_TEMP_1, 10
-	return
-
-LinkContestRoom1_EventScript_23BA89:: @ 823BA89
-	setvar VAR_TEMP_1, 11
-	return
-
-LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F
-	setvar VAR_TEMP_1, 12
-	return
-
-LinkContestRoom1_EventScript_23BA95:: @ 823BA95
-	setvar VAR_TEMP_1, 13
-	return
-
-LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B
-	setvar VAR_TEMP_1, 14
-	return
-
-LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1
-	setvar VAR_TEMP_1, 15
-	return
-
-LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7
-	setvar VAR_TEMP_1, 17
-	return
-
-LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD
-	setvar VAR_TEMP_1, 18
-	return
-
-LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3
-	setvar VAR_TEMP_1, 19
-	return
-
-LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9
-	setvar VAR_TEMP_1, 20
-	return
-
-LinkContestRoom1_EventScript_23BABF:: @ 823BABF
-	setvar VAR_TEMP_1, 21
-	return
-
-LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5
-	setvar VAR_TEMP_1, 22
-	return
-
-LinkContestRoom1_EventScript_23BACB:: @ 823BACB
-	setvar VAR_TEMP_1, 25
-	return
-
-LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1
-	setvar VAR_TEMP_1, 26
-	return
-
-LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7
-	setvar VAR_TEMP_1, 27
-	return
-
-LinkContestRoom1_EventScript_23BADD:: @ 823BADD
-	setvar VAR_TEMP_1, 47
-	return
-
-LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3
-	setvar VAR_TEMP_1, 30
-	return
-
-LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9
-	setvar VAR_TEMP_1, 31
-	return
-
-LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF
-	setvar VAR_TEMP_1, 32
-	return
-
-LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5
-	setvar VAR_TEMP_1, 33
-	return
-
-LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB
-	setvar VAR_TEMP_1, 34
-	return
-
-LinkContestRoom1_EventScript_23BB01:: @ 823BB01
-	setvar VAR_TEMP_1, 35
-	return
-
-LinkContestRoom1_EventScript_23BB07:: @ 823BB07
-	setvar VAR_TEMP_1, 36
-	return
-
-LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D
-	setvar VAR_TEMP_1, 37
-	return
-
-LinkContestRoom1_EventScript_23BB13:: @ 823BB13
-	setvar VAR_TEMP_1, 38
-	return
-
-LinkContestRoom1_EventScript_23BB19:: @ 823BB19
-	setvar VAR_TEMP_1, 44
-	return
-
-LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F
-	setvar VAR_TEMP_1, 45
-	return
-
-LinkContestRoom1_EventScript_23BB25:: @ 823BB25
-	setvar VAR_TEMP_1, 46
-	return
-
-LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B
-	specialvar VAR_RESULT, sub_80F9160
-	compare VAR_RESULT, 1
-	goto_eq LinkContestRoom1_EventScript_23BD86
-	switch VAR_0x4088
-	case 1, LinkContestRoom1_EventScript_23BB78
-	case 2, LinkContestRoom1_EventScript_23BB8B
-	case 3, LinkContestRoom1_EventScript_23BBE6
-	case 4, LinkContestRoom1_EventScript_23BC92
-	case 5, LinkContestRoom1_EventScript_23BC92
-	return
-
-LinkContestRoom1_EventScript_23BB78:: @ 823BB78
-	createvobject 5, 20, 3, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	return
-
-LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 46, 3, 2, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 12, 13, 12, 8, 3, 3
-	createvobject 47, 20, 3, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	return
-
-LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 48, 3, 2, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 45, 13, 12, 8, 3, 3
-	createvobject 22, 20, 3, 2, 3, 1
-	createvobject 23, 20, 6, 2, 3, 1
-	createvobject 34, 20, 7, 2, 3, 1
-	createvobject 46, 24, 8, 2, 3, 1
-	createvobject 48, 24, 11, 2, 3, 1
-	createvobject 11, 25, 3, 9, 3, 2
-	createvobject 35, 26, 4, 9, 3, 2
-	createvobject 17, 27, 5, 9, 3, 2
-	createvobject 40, 28, 9, 9, 3, 2
-	createvobject 38, 29, 10, 9, 3, 2
-	createvobject 83, 30, 11, 9, 3, 2
-	return
-
-LinkContestRoom1_EventScript_23BC92:: @ 823BC92
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 12, 3, 2, 8, 3, 4
-	createvobject 39, 4, 1, 3, 3, 4
-	createvobject 34, 6, 1, 5, 3, 4
-	createvobject 26, 7, 1, 6, 3, 4
-	createvobject 48, 9, 1, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 45, 13, 12, 8, 3, 3
-	createvobject 50, 14, 13, 3, 3, 3
-	createvobject 52, 15, 13, 4, 3, 3
-	createvobject 65, 17, 13, 6, 3, 3
-	createvobject 83, 18, 13, 7, 3, 3
-	createvobject 116, 19, 13, 8, 3, 3
-	createvobject 25, 20, 3, 2, 3, 1
-	createvobject 31, 21, 6, 2, 3, 1
-	createvobject 33, 22, 7, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	createvobject 49, 25, 3, 9, 3, 2
-	createvobject 35, 26, 4, 9, 3, 2
-	createvobject 48, 27, 5, 9, 3, 2
-	createvobject 40, 28, 9, 9, 3, 2
-	createvobject 38, 29, 10, 9, 3, 2
-	createvobject 83, 30, 11, 9, 3, 2
-	return
-
-LinkContestRoom1_EventScript_23BD86:: @ 823BD86
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 12, 3, 2, 8, 3, 4
-	createvobject 39, 4, 1, 3, 3, 4
-	createvobject 34, 6, 1, 5, 3, 4
-	createvobject 26, 7, 1, 6, 3, 4
-	createvobject 48, 9, 1, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 45, 13, 12, 8, 3, 3
-	createvobject 50, 14, 13, 3, 3, 3
-	createvobject 52, 15, 13, 4, 3, 3
-	createvobject 65, 17, 13, 6, 3, 3
-	createvobject 83, 18, 13, 7, 3, 3
-	createvobject 116, 19, 13, 8, 3, 3
-	createvobject 25, 20, 3, 2, 3, 1
-	createvobject 31, 21, 6, 2, 3, 1
-	createvobject 33, 22, 7, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	return
-
-LinkContestRoom1_EventScript_23BE44:: @ 823BE44
-	special sub_80F9154
-	switch VAR_0x4088
-	case 1, LinkContestRoom1_EventScript_23BE84
-	case 2, LinkContestRoom1_EventScript_23BE8E
-	case 3, LinkContestRoom1_EventScript_23BE98
-	case 4, LinkContestRoom1_EventScript_23BEA2
-	case 5, LinkContestRoom1_EventScript_23BEAC
-	return
-
-LinkContestRoom1_EventScript_23BE84:: @ 823BE84
-	warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E
-	warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BE98:: @ 823BE98
-	warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2
-	warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC
-	warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4
-	waitstate
-	end
-
-LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_ContestLobby_EventScript_23BECE
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_ContestLobby_EventScript_23BED4
-	return
-
-LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE
-	setvar VAR_OBJ_GFX_ID_3, 100
-	return
-
-LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4
-	setvar VAR_OBJ_GFX_ID_3, 105
-	return
-
diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc
deleted file mode 100644
index d7233a3aa..000000000
--- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc
+++ /dev/null
@@ -1,200 +0,0 @@
-VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA
-	map_script 3, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A
-	map_script 2, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E
-	map_script 4, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541
-	.byte 0
-
-VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A
-	call VerdanturfTown_BattleTentBattleRoom_EventScript_202310
-	end
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202328
-	compare VAR_RESULT, 1
-	goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202333
-	return
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328
-	setvar VAR_OBJ_GFX_ID_1, 100
-	setvar VAR_OBJ_GFX_ID_0, 100
-	return
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_202333:: @ 8202333
-	setvar VAR_OBJ_GFX_ID_1, 105
-	setvar VAR_OBJ_GFX_ID_0, 105
-	return
-
-VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E
-	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_202348
-	.2byte 0
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348
-	showobjectat 1, VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM
-	applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_202575
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	compare VAR_RESULT, 0
-	goto_if 5, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F
-	setvar VAR_0x8004, 3
-	special sub_8161F74
-	addobject 2
-	applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_20257B
-	waitmovement 0
-	setvar VAR_0x8004, 4
-	special sub_81B99B4
-	msgbox 0x2021fc4, 4
-	waitmessage
-	call VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7
-	switch VAR_RESULT
-	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 4
-	special sub_81A1780
-	special LoadPlayerParty
-	warp VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
-	waitstate
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_RESULT
-	special sub_81A1780
-	switch VAR_RESULT
-	case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_202501
-	applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581
-	waitmovement 0
-	removeobject 2
-	applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725AA
-	applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6
-	waitmovement 0
-	msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, 4
-	special LoadPlayerParty
-	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special sub_81A1780
-	compare VAR_RESULT, 1
-	call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_202565
-	compare VAR_RESULT, 2
-	call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20256C
-	multichoice 20, 6, 104, 1
-	switch VAR_RESULT
-	case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA
-	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20248A
-	case 2, VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_20248A:: @ 820248A
-	msgbox VerdanturfTown_BattleTentBattleRoom_Text_250030, 5
-	switch VAR_RESULT
-	case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
-	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20251F
-	case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8
-	message VerdanturfTown_BattleTentBattleRoom_Text_25005A
-	waitmessage
-	multichoicedefault 20, 8, 94, 1, 0
-	switch VAR_RESULT
-	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
-	case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA
-	case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA
-	applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8
-	applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8
-	waitmovement 0
-	closemessage
-	goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 3
-	special sub_81A1780
-	special LoadPlayerParty
-	warp VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
-	waitstate
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F
-	message VerdanturfTown_BattleTentBattleRoom_Text_25007E
-	waitmessage
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 2
-	special sub_81B99B4
-	playse SE_SAVE
-	waitse
-	fadescreen 1
-	setvar VAR_0x8004, 4
-	special sub_81A1780
-	end
-
-VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541
-	map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20254B
-	.2byte 0
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_20254B:: @ 820254B
-	hideobjectat 1, VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM
-	call VerdanturfTown_BattleTentBattleRoom_EventScript_202310
-	setvar VAR_TEMP_1, 1
-	applymovement 255, VerdanturfTown_BattleTentBattleRoom_Movement_202573
-	removeobject 2
-	end
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_202565:: @ 8202565
-	message VerdanturfTown_BattleTentBattleRoom_Text_24FF28
-	waitmessage
-	return
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_20256C:: @ 820256C
-	message VerdanturfTown_BattleTentBattleRoom_Text_24FF54
-	waitmessage
-	return
-
-VerdanturfTown_BattleTentBattleRoom_Movement_202573: @ 8202573
-	set_invisible
-	step_end
-
-VerdanturfTown_BattleTentBattleRoom_Movement_202575: @ 8202575
-	set_visible
-	walk_up
-	walk_up
-	walk_up
-	face_right
-	step_end
-
-VerdanturfTown_BattleTentBattleRoom_Movement_20257B: @ 820257B
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	face_left
-	step_end
-
-VerdanturfTown_BattleTentBattleRoom_Movement_202581: @ 8202581
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
diff --git a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc
deleted file mode 100644
index 96bd1f114..000000000
--- a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc
+++ /dev/null
@@ -1,69 +0,0 @@
-VerdanturfTown_BattleTentCorridor_MapScripts:: @ 820208A
-	map_script 2, VerdanturfTown_BattleTentCorridor_MapScript2_202090
-	.byte 0
-
-VerdanturfTown_BattleTentCorridor_MapScript2_202090: @ 8202090
-	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentCorridor_EventScript_20209A
-	.2byte 0
-
-VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A
-	lockall
-	setvar VAR_TEMP_0, 1
-	applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020DE
-	applymovement 255, VerdanturfTown_BattleTentCorridor_Movement_2020DE
-	waitmovement 0
-	opendoor 2, 1
-	waitdooranim
-	applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020E4
-	applymovement 255, VerdanturfTown_BattleTentCorridor_Movement_2020E3
-	waitmovement 0
-	closedoor 2, 1
-	waitdooranim
-	setvar VAR_0x8006, 0
-	warp VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 6, 5
-	waitstate
-	releaseall
-	end
-
-VerdanturfTown_BattleTentCorridor_Movement_2020DE: @ 82020DE
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-VerdanturfTown_BattleTentCorridor_Movement_2020E3: @ 82020E3
-	walk_up
-
-VerdanturfTown_BattleTentCorridor_Movement_2020E4: @ 82020E4
-	walk_up
-	set_invisible
-	step_end
-
-VerdanturfTown_BattleTentCorridor_Text_2020E7: @ 82020E7
-	.string "Which CONTEST are you entering?\n"
-	.string "Want a piece of advice?\p"
-	.string "In any CONTEST, for example, a CUTE\n"
-	.string "CONTEST, I don’t think they judge you\l"
-	.string "only on cuteness in the first round.\p"
-	.string "You need to work out ways for raising\n"
-	.string "POKéMON better.$"
-
-VerdanturfTown_BattleTentCorridor_Text_2021C4: @ 82021C4
-	.string "I raised my POKéMON to be cute.\p"
-	.string "I found out you can put POKéMON in\n"
-	.string "a CONTEST for cuteness!\p"
-	.string "I’m so glad I raised my POKéMON with\n"
-	.string "loving care…$"
-
-VerdanturfTown_BattleTentCorridor_Text_202251: @ 8202251
-	.string "My POKéMON rules!\p"
-	.string "It’s cool, tough yet beautiful, cute,\n"
-	.string "and smart. It’s complete!\p"
-	.string "I may as well go for wins in every\n"
-	.string "single CONTEST.$"
-
-VerdanturfTown_BattleTentCorridor_Text_2022D6: @ 82022D6
-	.string "POKéMON CONTESTS\n"
-	.string "NORMAL RANK STAGE!$"
-
diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc
deleted file mode 100644
index 468a34991..000000000
--- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc
+++ /dev/null
@@ -1,439 +0,0 @@
-VerdanturfTown_BattleTentLobby_MapScripts:: @ 82016D0
-	map_script 2, VerdanturfTown_BattleTentLobby_MapScript2_2016EF
-	map_script 4, VerdanturfTown_BattleTentLobby_MapScript2_2016DB
-	.byte 0
-
-VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB
-	map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentLobby_EventScript_2016E5
-	.2byte 0
-
-VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF
-	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentLobby_EventScript_201719
-	map_script_2 VAR_TEMP_0, 1, VerdanturfTown_BattleTentLobby_EventScript_201722
-	map_script_2 VAR_TEMP_0, 2, VerdanturfTown_BattleTentLobby_EventScript_201837
-	map_script_2 VAR_TEMP_0, 3, VerdanturfTown_BattleTentLobby_EventScript_201757
-	map_script_2 VAR_TEMP_0, 4, VerdanturfTown_BattleTentLobby_EventScript_2017FD
-	.2byte 0
-
-VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719
-	setvar VAR_0x8004, 0
-	special sub_81A1780
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722
-	lockall
-	msgbox VerdanturfTown_BattleTentLobby_Text_24E636, 4
-	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	releaseall
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757
-	lockall
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4
-	message VerdanturfTown_BattleTentLobby_Text_2C5791
-	waitmessage
-	setvar VAR_0x8004, 6
-	special sub_81B99B4
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 0
-	special sub_81B99B4
-	playse SE_SAVE
-	waitse
-
-VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, 4
-	setvar VAR_0x8004, 7
-	special sub_81B99B4
-	switch VAR_RESULT
-	case 0, VerdanturfTown_BattleTentLobby_EventScript_2017DD
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	message VerdanturfTown_BattleTentLobby_Text_24A554
-	waitmessage
-	playfanfare MUS_FANFA4
-	waitfanfare
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD
-	msgbox VerdanturfTown_BattleTentLobby_Text_24E57B, 4
-	waitmessage
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_2017EE:: @ 82017EE
-	lockall
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4
-	goto VerdanturfTown_BattleTentLobby_EventScript_201791
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD
-	lockall
-	message VerdanturfTown_BattleTentLobby_Text_2C56B8
-	waitmessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 0
-	special sub_81B99B4
-	playse SE_SAVE
-	waitse
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4
-	closemessage
-	setvar VAR_TEMP_0, 255
-	releaseall
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837
-	lockall
-	msgbox VerdanturfTown_BattleTentLobby_Text_24E5D8, 4
-	message VerdanturfTown_BattleTentLobby_Text_24E5F6
-	waitmessage
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 1
-	special sub_81B99B4
-	playse SE_SAVE
-	waitse
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	setvar VAR_TEMP_0, 255
-	goto VerdanturfTown_BattleTentLobby_EventScript_2019AE
-
-VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873
-	lock
-	faceplayer
-	setvar VAR_0x8004, 1
-	special sub_81B99B4
-	compare VAR_RESULT, 0
-	goto_if 5, VerdanturfTown_BattleTentLobby_EventScript_2017EE
-	special SavePlayerParty
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, 4
-
-VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893
-	message VerdanturfTown_BattleTentLobby_Text_2C5129
-	waitmessage
-	multichoice 17, 6, 23, 0
-	switch VAR_RESULT
-	case 0, VerdanturfTown_BattleTentLobby_EventScript_2018CF
-	case 1, VerdanturfTown_BattleTentLobby_EventScript_2019DB
-	case 2, VerdanturfTown_BattleTentLobby_EventScript_201A37
-	case 127, VerdanturfTown_BattleTentLobby_EventScript_201A37
-
-VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF
-	setvar VAR_FRONTIER_FACILITY, 2
-	setvar VAR_0x40CE, 0
-	setvar VAR_RESULT, 2
-	setvar VAR_0x8004, 15
-	special sub_81A1780
-	compare VAR_0x8004, 1
-	goto_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 2
-	special sub_81A1780
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, 4
-	fadescreen 1
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 3
-	special sub_80F9490
-	waitstate
-	compare VAR_RESULT, 0
-	goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A34
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, 5
-	switch VAR_RESULT
-	case 0, VerdanturfTown_BattleTentLobby_EventScript_201A34
-	case 1, VerdanturfTown_BattleTentLobby_EventScript_201954
-	case 127, VerdanturfTown_BattleTentLobby_EventScript_201A34
-
-VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
-	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	special sub_81A1780
-	setvar VAR_0x8004, 0
-	special sub_81B99B4
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 1
-	special sub_81A1780
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	special LoadPlayerParty
-	closemessage
-	delay 2
-	call VerdanturfTown_BattleTentLobby_EventScript_27134F
-	setvar VAR_TEMP_0, 255
-	compare VAR_RESULT, 0
-	goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D
-
-VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE
-	special SavePlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special sub_81A1780
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4
-	closemessage
-	call VerdanturfTown_BattleTentLobby_EventScript_201A41
-	warp VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7
-	setvar VAR_TEMP_0, 0
-	waitstate
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_2019DB:: @ 82019DB
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C5163, 4
-	goto VerdanturfTown_BattleTentLobby_EventScript_201893
-
-VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8
-	switch VAR_RESULT
-	case 0, VerdanturfTown_BattleTentLobby_EventScript_201A03
-	case 1, VerdanturfTown_BattleTentLobby_EventScript_201A10
-
-VerdanturfTown_BattleTentLobby_EventScript_201A03:: @ 8201A03
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, 4
-	goto VerdanturfTown_BattleTentLobby_EventScript_201A3F
-
-VerdanturfTown_BattleTentLobby_EventScript_201A10:: @ 8201A10
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C5538, 4
-	goto VerdanturfTown_BattleTentLobby_EventScript_201A3F
-
-VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special sub_81A1780
-	goto VerdanturfTown_BattleTentLobby_EventScript_201A37
-
-VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34
-	special LoadPlayerParty
-
-VerdanturfTown_BattleTentLobby_EventScript_201A37:: @ 8201A37
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4
-
-VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F
-	release
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201A41:: @ 8201A41
-	applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A70
-	applymovement 255, VerdanturfTown_BattleTentLobby_Movement_201A70
-	waitmovement 0
-	opendoor 6, 1
-	waitdooranim
-	applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A74
-	applymovement 255, VerdanturfTown_BattleTentLobby_Movement_201A77
-	waitmovement 0
-	closedoor 6, 1
-	waitdooranim
-	return
-
-VerdanturfTown_BattleTentLobby_Movement_201A70: @ 8201A70
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-VerdanturfTown_BattleTentLobby_Movement_201A74: @ 8201A74
-	walk_up
-	set_invisible
-	step_end
-
-VerdanturfTown_BattleTentLobby_Movement_201A77: @ 8201A77
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B
-	lock
-	faceplayer
-	checkflag FLAG_0x0EB
-	goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AB2
-	msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, 4
-	giveitem_std ITEM_TM45
-	compare VAR_RESULT, 0
-	goto_eq VerdanturfTown_BattleTentLobby_EventScript_272054
-	setflag FLAG_0x0EB
-	msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4
-	release
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201AB2:: @ 8201AB2
-	msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4
-	release
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201ABC:: @ 8201ABC
-	msgbox VerdanturfTown_BattleTentLobby_Text_201EB1, 2
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201AC5:: @ 8201AC5
-	lock
-	msgbox VerdanturfTown_BattleTentLobby_Text_201BD4, 4
-	release
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0
-	lock
-	faceplayer
-	checkflag FLAG_0x1CC
-	goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AED
-	msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, 4
-	addvar VAR_0x40D1, 1
-	setflag FLAG_0x1CC
-	release
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201AED:: @ 8201AED
-	msgbox VerdanturfTown_BattleTentLobby_Text_202025, 4
-	release
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201AF7:: @ 8201AF7
-	lock
-	msgbox VerdanturfTown_BattleTentLobby_Text_201D11, 4
-	release
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201B02:: @ 8201B02
-	lockall
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C6878, 4
-	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201B11:: @ 8201B11
-	message VerdanturfTown_BattleTentLobby_Text_24EF88
-	waitmessage
-	setvar VAR_0x8004, 12
-	special sub_813A128
-	waitstate
-	switch VAR_RESULT
-	case 0, VerdanturfTown_BattleTentLobby_EventScript_201B7E
-	case 1, VerdanturfTown_BattleTentLobby_EventScript_201B8C
-	case 2, VerdanturfTown_BattleTentLobby_EventScript_201B9A
-	case 3, VerdanturfTown_BattleTentLobby_EventScript_201BA8
-	case 4, VerdanturfTown_BattleTentLobby_EventScript_201BB6
-	case 5, VerdanturfTown_BattleTentLobby_EventScript_201BC4
-	case 6, VerdanturfTown_BattleTentLobby_EventScript_201BD2
-	case 127, VerdanturfTown_BattleTentLobby_EventScript_201BD2
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201B7E:: @ 8201B7E
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C67CD, 4
-	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201B8C:: @ 8201B8C
-	msgbox VerdanturfTown_BattleTentLobby_Text_24EFAB, 4
-	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201B9A:: @ 8201B9A
-	msgbox VerdanturfTown_BattleTentLobby_Text_24F049, 4
-	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201BA8:: @ 8201BA8
-	msgbox VerdanturfTown_BattleTentLobby_Text_24F190, 4
-	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201BB6:: @ 8201BB6
-	msgbox VerdanturfTown_BattleTentLobby_Text_24F2E8, 4
-	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201BC4:: @ 8201BC4
-	msgbox VerdanturfTown_BattleTentLobby_Text_24F3F4, 4
-	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
-	end
-
-VerdanturfTown_BattleTentLobby_EventScript_201BD2:: @ 8201BD2
-	releaseall
-	end
-
-VerdanturfTown_BattleTentLobby_Text_201BD4: @ 8201BD4
-	.string "If it doesn’t like a certain move,\n"
-	.string "a POKéMON will be reluctant to use it.\p"
-	.string "It doesn’t matter how strong it is,\n"
-	.string "either.\p"
-	.string "For example, a POKéMON with a GENTLE\n"
-	.string "nature probably won’t enjoy hurting\l"
-	.string "its opponents.\p"
-	.string "If it can’t seem to live up to its\n"
-	.string "potential, it’s probably failing at\l"
-	.string "using a disliked move against its will.$"
-
-VerdanturfTown_BattleTentLobby_Text_201D11: @ 8201D11
-	.string "My big sister is gentle usually.\n"
-	.string "But when she gets angry,\l"
-	.string "she’s really, really scary!\p"
-	.string "I bet a gentle POKéMON will be scary\n"
-	.string "if it gets angry!$"
-
-VerdanturfTown_BattleTentLobby_Text_201D9E: @ 8201D9E
-	.string "My feelings toward my POKéMON…\n"
-	.string "The attraction runs deep…\p"
-	.string "Oh, hi, you didn’t see that, did you?\n"
-	.string "Well, it doesn’t matter.\p"
-	.string "How would you like this TM for\n"
-	.string "your POKéMON?$"
-
-VerdanturfTown_BattleTentLobby_Text_201E43: @ 8201E43
-	.string "My feelings toward my POKéMON…\n"
-	.string "I’m sure the attraction is mutual!\p"
-	.string "They battle exactly the way I want\n"
-	.string "them to!$"
-
-VerdanturfTown_BattleTentLobby_Text_201EB1: @ 8201EB1
-	.string "What kind of moves have you taught\n"
-	.string "your POKéMON?\p"
-	.string "I think you would give yourself\n"
-	.string "an advantage if they knew how to\l"
-	.string "heal or protect themselves.$"
-
-VerdanturfTown_BattleTentLobby_Text_201F3F: @ 8201F3F
-	.string "SCOTT: Hey there, {PLAYER}{KUN}!\n"
-	.string "I thought I might see you here.\p"
-	.string "A BATTLE TENT’s a place where\n"
-	.string "you can meet tough TRAINERS.\p"
-	.string "It doesn’t matter what the rules are,\n"
-	.string "or how battles are waged, either.\p"
-	.string "{PLAYER}{KUN}, I expect you to do\n"
-	.string "the best you can!$"
-
-VerdanturfTown_BattleTentLobby_Text_202025: @ 8202025
-	.string "SCOTT: I visit here regularly in hopes\n"
-	.string "of seeing tough TRAINERS in action\l"
-	.string "in whatever the situation.$"
-
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index c2d217f93..e4b1fce41 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -1,13 +1,13 @@
 EventScript_2A4B4C:: @ 82A4B4C
 	setvar VAR_0x40A4, 1
 	special ExitSafariMode
-	setwarp ROUTE_121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
+	setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	end
 
 EventScript_2A4B5D:: @ 82A4B5D
 	setvar VAR_0x40A4, 1
 	special ExitSafariMode
-	warp ROUTE_121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
+	warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	waitstate
 	end